From 3b20633aa6d99231e243412424e1336b12630817 Mon Sep 17 00:00:00 2001
From: Augusto Caringi <acaringi@redhat.com>
Date: Tue, 31 Jan 2023 11:56:16 -0300
Subject: [PATCH] Rebased to version 0.17.0

Resolves: bz#2165785

Signed-off-by: Augusto Caringi <acaringi@redhat.com>
---
 .gitignore                         |  1 +
 0001-Fix-compile-with-GCC-13.patch | 59 ------------------------------
 bpftrace.spec                      | 12 +++---
 sources                            |  2 +-
 4 files changed, 9 insertions(+), 65 deletions(-)
 delete mode 100644 0001-Fix-compile-with-GCC-13.patch

diff --git a/.gitignore b/.gitignore
index 0bddd1f..04c245e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /bpftrace-0.14.1.tar.gz
 /bpftrace-0.15.0.tar.gz
 /bpftrace-0.16.0.tar.gz
+/bpftrace-0.17.0.tar.gz
diff --git a/0001-Fix-compile-with-GCC-13.patch b/0001-Fix-compile-with-GCC-13.patch
deleted file mode 100644
index 09d7330..0000000
--- a/0001-Fix-compile-with-GCC-13.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From c8926fa6c163e3e42cef2f0bfba7cbaa3f504a42 Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Mon, 23 Jan 2023 20:42:47 -0500
-Subject: [PATCH] Fix compile with GCC 13
-
-Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
----
- src/ast/int_parser.h | 1 +
- src/pcap_writer.h    | 1 +
- src/usdt.h           | 1 +
- src/utils.h          | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/src/ast/int_parser.h b/src/ast/int_parser.h
-index 3dc2f7c2..d12481f9 100644
---- a/src/ast/int_parser.h
-+++ b/src/ast/int_parser.h
-@@ -1,3 +1,4 @@
-+#include <cstdint>
- #include <string>
- 
- namespace bpftrace {
-diff --git a/src/pcap_writer.h b/src/pcap_writer.h
-index 870a6617..5f01c666 100644
---- a/src/pcap_writer.h
-+++ b/src/pcap_writer.h
-@@ -1,5 +1,6 @@
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- 
- struct pcap;
-diff --git a/src/usdt.h b/src/usdt.h
-index c30fef2d..9e2d7bc4 100644
---- a/src/usdt.h
-+++ b/src/usdt.h
-@@ -1,5 +1,6 @@
- #pragma once
- 
-+#include <cstdint>
- #include <optional>
- #include <string>
- #include <vector>
-diff --git a/src/utils.h b/src/utils.h
-index 8cc0bfd4..7c10ebdd 100644
---- a/src/utils.h
-+++ b/src/utils.h
-@@ -1,6 +1,7 @@
- #pragma once
- 
- #include <cstring>
-+#include <cstdint>
- #include <exception>
- #include <iostream>
- #include <optional>
--- 
-2.39.1
-
diff --git a/bpftrace.spec b/bpftrace.spec
index 1ae9bcf..2f8d56c 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,14 +1,12 @@
 Name:           bpftrace
-Version:        0.16.0
-Release:        6%{?dist}
+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
-# https://github.com/iovisor/bpftrace/pull/2484
-Patch2:         0001-Fix-compile-with-GCC-13.patch
 
 # Arches will be included as upstream support is added and dependencies are
 # satisfied in the respective arches
@@ -48,7 +46,8 @@ and predecessor tracers such as DTrace and SystemTap
 %build
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DBUILD_TESTING:BOOL=OFF \
-       -DBUILD_SHARED_LIBS:BOOL=OFF
+       -DBUILD_SHARED_LIBS:BOOL=OFF \
+       -DUSE_SYSTEM_BPF_BCC:BOOL=ON
 %cmake_build
 
 
@@ -83,6 +82,9 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
 
 
 %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
 
diff --git a/sources b/sources
index 1409d37..e0e578d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bpftrace-0.16.0.tar.gz) = 52ca4fea4e2f8d2cbf0f9f1bc69af0ee3408201f019006dd2e838b9458cfc01761eba3df24c39e05cf93220d85d0cecc69bb44ec72f9f44cec0eb94479bff734
+SHA512 (bpftrace-0.17.0.tar.gz) = c3f17778ce4c42c2b6bc63245cd157e9fbc0b3f010b9f5b1284b691fbac47fbb532f3bd61d7e6fe525291e0034d62b3e8c1be6b8bf12cf26d5a39b5ab00a0d13