Rebased to version 0.17.0

Resolves: bz#2165785

Signed-off-by: Augusto Caringi <acaringi@redhat.com>

.gitignore

@@ -13,3 +13,7 @@
 /bpftrace-0.12.1.tar.gz
 /bpftrace-0.13.0.tar.gz
 /bpftrace-0.14.0.tar.gz
+/bpftrace-0.14.1.tar.gz
+/bpftrace-0.15.0.tar.gz
+/bpftrace-0.16.0.tar.gz
+/bpftrace-0.17.0.tar.gz

0001-Workaround-OpaquePointers-for-LLVM-15.patch

@@ -0,0 +1,29 @@
+From 07fa48a94ef6d6bb1f335de345de18fe9776ca57 Mon Sep 17 00:00:00 2001
+From: kenneth topp <toppk@bllue.org>
+Date: Mon, 26 Sep 2022 00:33:29 -0400
+Subject: [PATCH] Workaround OpaquePointers for LLVM 15
+
+This workaround allows bpftrace to be compiled against
+LLVM-15.  This will have to be address properly before LLVM-16
+More details from LLVM here: https://llvm.org/docs/OpaquePointers.html
+---
+ src/ast/irbuilderbpf.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
+index d49883f7..00f0f172 100644
+--- a/src/ast/irbuilderbpf.cpp
++++ b/src/ast/irbuilderbpf.cpp
+@@ -123,6 +123,9 @@ IRBuilderBPF::IRBuilderBPF(LLVMContext &context,
+     module_(module),
+     bpftrace_(bpftrace)
+ {
++#if LLVM_VERSION_MAJOR == 15
++  context.setOpaquePointers(false);
++#endif
+   // Declare external LLVM function
+   FunctionType *pseudo_func_type = FunctionType::get(
+       getInt64Ty(),
+-- 
+2.37.3
+

bpftrace.spec

@@ -1,11 +1,12 @@
 Name:           bpftrace
-Version:        0.14.0
+Version:        0.17.0
 Release:        1%{?dist}
 Summary:        High-level tracing language for Linux eBPF
 License:        ASL 2.0
 
 URL:            https://github.com/iovisor/bpftrace
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch1:         0001-Workaround-OpaquePointers-for-LLVM-15.patch
 
 # Arches will be included as upstream support is added and dependencies are
 # satisfied in the respective arches
@@ -43,10 +44,10 @@ and predecessor tracers such as DTrace and SystemTap
 
 
 %build
-%cmake . \
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-        -DBUILD_TESTING:BOOL=OFF \
-        -DBUILD_SHARED_LIBS:BOOL=OFF
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+       -DBUILD_TESTING:BOOL=OFF \
+       -DBUILD_SHARED_LIBS:BOOL=OFF \
+       -DUSE_SYSTEM_BPF_BCC:BOOL=ON
 %cmake_build
 
 
@@ -71,14 +72,51 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/tools
 %dir %{_datadir}/%{name}/tools/doc
+%dir %{_datadir}/%{name}/tools/old
 %{_bindir}/%{name}
 %{_bindir}/%{name}-aotrt
 %{_mandir}/man8/*
 %attr(0755,-,-) %{_datadir}/%{name}/tools/*.bt
+%attr(0755,-,-) %{_datadir}/%{name}/tools/old/*.bt
 %{_datadir}/%{name}/tools/doc/*.txt
 
 
 %changelog
+* Tue Jan 31 2023 Augusto Caringi <acaringi@redhat.com> - 0.17.0-1
+- Rebased to version 0.17.0
+
+* Fri Jan 27 2023 Augusto Caringi <acaringi@redhat.com> - 0.16.0-6
+- Fix compile with GCC 13
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Nov 07 2022 Jerome Marchand <jmarchan@redhat.com> - 0.16.0-4
+- Rebuild for libbpf 1.0
+
+* Mon Sep 26 2022 Kenneth Topp <toppk@bllue.org> - 0.16.0-3
+- Enable workaround for non OpaquePointers on LLVM-15
+
+* Mon Sep 19 2022 Pete Walter <pwalter@fedoraproject.org> - 0.16.0-2
+- Rebuild for llvm 15
+
+* Fri Sep 02 2022 Augusto Caringi <acaringi@redhat.com> - 0.16.0-1
+- Rebased to version 0.16.0
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jul 05 2022 Augusto Caringi <acaringi@redhat.com> - 0.15.0-1
+- Rebased to version 0.15.0
+
+* Tue Apr 19 2022 Jerome Marchand <jmarchan@redhat.com> - 0.14.1-1
+- Rebased to version 0.14.1
+- Fix cmake build
+- Rebuild with bcc 0.24
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Sun Oct 24 2021 Rafael Santos <rdossant@redhat.com> - 0.14.0-1
 - Rebased to version 0.14.0
 

sources

@@ -1 +1 @@
-SHA512 (bpftrace-0.14.0.tar.gz) = 78f2d9a4d54c0dda1947b924a828777b402befc3a05031b609da4d256907df1e64f946454a9be7317449f49706f02a881febc4e63d2ef2f4e76924ea19e36ddb
+SHA512 (bpftrace-0.17.0.tar.gz) = c3f17778ce4c42c2b6bc63245cd157e9fbc0b3f010b9f5b1284b691fbac47fbb532f3bd61d7e6fe525291e0034d62b3e8c1be6b8bf12cf26d5a39b5ab00a0d13