diff --git a/.gitignore b/.gitignore index f6dcceb..8965531 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ /bpftrace-0.23.5.tar.gz /bpftrace-0.24.1.tar.gz /bpftrace-0.24.2.tar.gz +/bpftrace-0.26.0.tar.gz +/bpftrace-0.26.1.tar.gz diff --git a/bpftrace-0.24.2-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch b/bpftrace-0.26.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch similarity index 79% rename from bpftrace-0.24.2-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch rename to bpftrace-0.26.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch index debbac0..86e0518 100644 --- a/bpftrace-0.24.2-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch +++ b/bpftrace-0.26.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch @@ -1,4 +1,4 @@ -From 3209f57cdcbe597ff5464cae32b08017a25a2762 Mon Sep 17 00:00:00 2001 +From e82c55909ba114c7dd31b3e1a55f55cbb821714a Mon Sep 17 00:00:00 2001 From: Jerome Marchand Date: Thu, 11 Jun 2020 14:56:36 +0200 Subject: [PATCH] RHEL: aarch64: fixes statsnoop and opensnoop @@ -21,18 +21,19 @@ Signed-off-by: Viktor Malik 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/opensnoop.bt b/tools/opensnoop.bt -index aafacd10..1e51197e 100755 +index b0cfc647..3faf202c 100644 --- a/tools/opensnoop.bt +++ b/tools/opensnoop.bt -@@ -49,14 +49,12 @@ BEGIN - printf("%-6s %-16s %4s %3s %s\n", "PID", "COMM", "FD", "ERR", "PATH"); +@@ -62,7 +62,6 @@ BEGIN + printf(" %s\n", "PATH"); } -tracepoint:syscalls:sys_enter_open, tracepoint:syscalls:sys_enter_openat, tracepoint:syscalls:sys_enter_openat2 { - @filename[tid] = args.filename; +@@ -145,7 +144,6 @@ macro sys_exit(ret, @filename, @paths) + delete(@filename, tid); } -tracepoint:syscalls:sys_exit_open, @@ -40,11 +41,11 @@ index aafacd10..1e51197e 100755 tracepoint:syscalls:sys_exit_openat2 /@filename[tid]/ diff --git a/tools/statsnoop.bt b/tools/statsnoop.bt -index ebab9744..48367151 100755 +index 8499cf70..d53f0b19 100644 --- a/tools/statsnoop.bt +++ b/tools/statsnoop.bt -@@ -77,17 +77,13 @@ tracepoint:syscalls:sys_enter_statfs - @filename[tid] = args.pathname; +@@ -79,17 +79,13 @@ tracepoint:syscalls:sys_enter_statfs + @filename[tid] = args.pathname; } -tracepoint:syscalls:sys_enter_statx, @@ -52,7 +53,7 @@ index ebab9744..48367151 100755 -tracepoint:syscalls:sys_enter_newlstat +tracepoint:syscalls:sys_enter_statx { - @filename[tid] = args.filename; + @filename[tid] = args.filename; } tracepoint:syscalls:sys_exit_statfs, @@ -62,7 +63,7 @@ index ebab9744..48367151 100755 +tracepoint:syscalls:sys_exit_statx /@filename[tid]/ { - $ret = args.ret; + $ret = args.ret; -- -2.50.1 +2.52.0 diff --git a/bpftrace.spec b/bpftrace.spec index f332758..b57e6c7 100644 --- a/bpftrace.spec +++ b/bpftrace.spec @@ -1,5 +1,5 @@ Name: bpftrace -Version: 0.24.2 +Version: 0.26.1 Release: 1%{?dist} Summary: High-level tracing language for Linux eBPF License: Apache-2.0 @@ -49,6 +49,7 @@ and predecessor tracers such as DTrace and SystemTap %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DBUILD_TESTING:BOOL=OFF \ -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DUSE_SYSTEM_LIBBPF:BOOL=ON \ %cmake_build @@ -61,7 +62,7 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \ %files -%doc README.md CONTRIBUTING-TOOLS.md +%doc README.md CONTRIBUTING.md %doc man/adoc/bpftrace.adoc docs/tutorial_one_liners.md %license LICENSE %dir %{_datadir}/%{name} @@ -79,6 +80,10 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \ %changelog +* Tue May 26 2026 Gregory Bell - 0.26.0-1 +- Rebuild with LLVM 22 +- Rebase to upstream version 0.26.1 + * Tue Jan 13 2026 Viktor Malik - 0.24.2-1 - Rebuild with LLVM 21 (RHEL-108334) - Rebase to upstream version 0.24.2 diff --git a/sources b/sources index 85df286..ef21e20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bpftrace-0.24.2.tar.gz) = d9ff773ce39b578877d5e73a48434d3654b46985bb4b9ad458fbf622718049da5075b3a2d2e6d1ae0a9effbdb74658822b4c4535bca384fbd6e539fdec393f4b +SHA512 (bpftrace-0.26.1.tar.gz) = 2b2f052b742317b991b2e267881167ec58f0b7fa24574950f090d237665930a7ddfaa26e9a9f03eb3db01ab111a99ecb8f4b41f1c944b6f1df0218f109bfe72d