From 16ca238ea813a6c0ca7e5514ba85839e845d326c Mon Sep 17 00:00:00 2001
From: Viktor Malik <vmalik@redhat.com>
Date: Thu, 22 May 2025 08:32:41 +0200
Subject: [PATCH] Rebase to upstream version 0.23.3

The version also comes with LLVM 20 support.

Resolves: RHEL-78919
Resolves: RHEL-81774

Signed-off-by: Viktor Malik <vmalik@redhat.com>
---
 .gitignore                                               | 2 ++
 ...23.3-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch | 0
 bpftrace.spec                                            | 9 +++++++--
 sources                                                  | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)
 rename bpftrace-0.22.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch => bpftrace-0.23.3-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch (100%)

diff --git a/.gitignore b/.gitignore
index 7f9e4de..a2e88f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@
 /bpftrace-0.20.1.tar.gz
 /bpftrace-0.21.1.tar.gz
 /bpftrace-0.22.1.tar.gz
+/bpftrace-0.23.2.tar.gz
+/bpftrace-0.23.3.tar.gz
diff --git a/bpftrace-0.22.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch b/bpftrace-0.23.3-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
similarity index 100%
rename from bpftrace-0.22.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
rename to bpftrace-0.23.3-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
diff --git a/bpftrace.spec b/bpftrace.spec
index 697c2a0..ef5424f 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,6 +1,6 @@
 Name:           bpftrace
-Version:        0.22.1
-Release:        2%{?dist}
+Version:        0.23.3
+Release:        1%{?dist}
 Summary:        High-level tracing language for Linux eBPF
 License:        Apache-2.0
 
@@ -76,6 +76,7 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
 %{_bindir}/%{name}
 %{_bindir}/%{name}-aotrt
 %{_mandir}/man8/*
+%{bash_completions_dir}/%{name}
 %attr(0755,-,-) %{_datadir}/%{name}/tools/*.bt
 %{_datadir}/%{name}/tools/doc/*.txt
 # Do not include old versions of tools, they do not work on RHEL 10
@@ -83,6 +84,10 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
 
 
 %changelog
+* Thu May 22 2025 Viktor Malik <vmalik@redhat.com> - 0.23.2-1
+- Rebase to upstream version 0.23.2 (RHEL-78919)
+- Rebuild for LLVM 20 (RHEL-81774)
+
 * Thu Feb 13 2025 David Abdurachmanov <davidlt@rivosinc.com> - 0.22.1-2
 - Enable riscv64
 
diff --git a/sources b/sources
index 1e1dffe..0a613e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bpftrace-0.22.1.tar.gz) = 3bf00f97750092e66bd94b20b3889f29e932f45ae7f75966f1f364013fb9aeaad837617c0a28402fd9323d62773dd3dab0e9749d8dcb9da9c77093f17fce4d91
+SHA512 (bpftrace-0.23.3.tar.gz) = fa4fc7d843d4a7c34b4f06e23945eb87b8cdce975a2a58744e5010839fbebd7464fdfdc31a804d35fa7a38b019412c6079016e7f6b1cb322840942dab1abee91