From e298b330ce19e07819d08eef92126ace021ba198 Mon Sep 17 00:00:00 2001
From: Viktor Malik <vmalik@redhat.com>
Date: Thu, 27 Jun 2024 15:00:44 +0200
Subject: [PATCH] Rebase bpftrace to 0.21.1

The version comes with LLVM 18 support.

Resolves: RHEL-28685

Signed-off-by: Viktor Malik <vmalik@redhat.com>
---
 .gitignore                                               | 1 +
 ...21.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch | 4 ++--
 bpftrace.spec                                            | 9 +++++++--
 sources                                                  | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)
 rename bpftrace-0.20.4-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch => bpftrace-0.21.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch (96%)

diff --git a/.gitignore b/.gitignore
index 50874e3..bd28497 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /bpftrace-0.19.1.tar.gz
 /bpftrace-0.20.3.tar.gz
 /bpftrace-0.20.4.tar.gz
+/bpftrace-0.21.1.tar.gz
diff --git a/bpftrace-0.20.4-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch b/bpftrace-0.21.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
similarity index 96%
rename from bpftrace-0.20.4-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
rename to bpftrace-0.21.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
index 9425645..17a3e2a 100644
--- a/bpftrace-0.20.4-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
+++ b/bpftrace-0.21.1-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
@@ -1,4 +1,4 @@
-From 8066a715dbd54e6cbfa66176544944a2df7952a6 Mon Sep 17 00:00:00 2001
+From cae27a1842c038bb59fb8e3ee48018d0e69f2a3c Mon Sep 17 00:00:00 2001
 From: Jerome Marchand <jmarchan@redhat.com>
 Date: Thu, 11 Jun 2020 14:56:36 +0200
 Subject: [PATCH] RHEL: aarch64: fixes statsnoop and opensnoop
@@ -62,5 +62,5 @@ index a76b2bcc..89c2c8ea 100755
  {
  	$ret = args.ret;
 -- 
-2.41.0
+2.45.0
 
diff --git a/bpftrace.spec b/bpftrace.spec
index 5a43594..c6e91b6 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,6 +1,6 @@
 Name:           bpftrace
-Version:        0.20.4
-Release:        3%{?dist}
+Version:        0.21.1
+Release:        1%{?dist}
 Summary:        High-level tracing language for Linux eBPF
 License:        ASL 2.0
 
@@ -31,6 +31,7 @@ BuildRequires:  bcc-devel >= 0.19.0-8
 BuildRequires:  libbpf-devel
 BuildRequires:  libbpf-static
 BuildRequires:  binutils-devel
+BuildRequires:  lldb-devel
 
 
 %description
@@ -93,6 +94,10 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
 %exclude %{_datadir}/%{name}/tools/old
 
 %changelog
+* Thu Jun 27 2024 Viktor Malik <vmalik@redhat.com> - 0.21.1-1
+- Rebase on bpftrace 0.21.1
+- Add LLVM 18 support (RHEL-28685)
+
 * Thu May 30 2024 Viktor Malik <vmalik@redhat.com> - 0.20.4-3
 - Fix latest build (not built in side tag)
 
diff --git a/sources b/sources
index 30e556e..43b58b0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bpftrace-0.20.4.tar.gz) = a8d5b5bd7d35f9bb308cd7d0ae4eaee899312d3e6540164d3b29eac61159983ea01350311f53b7b6c5023844bde9a2cd3a2d50459116261a536c0e6e52963462
+SHA512 (bpftrace-0.21.1.tar.gz) = db6f5faf65fc2ac55ffbd1799b70941b8a6e4036c7fc2f56fe134f932dcf8a14fdd11a5a8b1d4b20261932d2d1ac18636cc1d7d4b87b31e366a9e53514a84ad3
 SHA512 (cereal-1.3.2.tar.gz) = 98d306d6292789129675f1c5c5aedcb90cfcc1029c4482893a8f9b23f3c9755e5ed4762d7a528f215345cae6392e87cd8d89467115b6f031b41c8673d6b4b109