Re: [PR PATCH] [Updated] bpftrace: update to 0.16.0.

[leahneukirchen <leahneukirchen@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 729 bytes --]

There is an updated pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages bpftrace016
https://github.com/void-linux/void-packages/pull/39002

bpftrace: update to 0.16.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

This uses libbpf now, so package it.

~~To compile bpftrace properly, we need kernel-headers of Linux 6.0, this parking this PR for now.
(Then remove the `linux/btf.h` from libbpf-devel.)~~ libbpf 1.1.0 avoids needing this.

#### Testing the changes
- I tested the changes in this PR: **YES** (on 5.18)


A patch file from https://github.com/void-linux/void-packages/pull/39002.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bpftrace016-39002.patch --]
[-- Type: text/x-diff, Size: 3468 bytes --]

From 425d127574994aa962995c10ee1b13b54ba9b2ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:10:11 +0200
Subject: [PATCH 1/2] New package: libbpf-1.1.0

---
 common/shlibs           |  1 +
 srcpkgs/libbpf-devel    |  1 +
 srcpkgs/libbpf/template | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libbpf-devel
 create mode 100644 srcpkgs/libbpf/template

diff --git a/common/shlibs b/common/shlibs
index f0917a476aa5..4cbbf89b152f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4223,3 +4223,4 @@ libfst.so.25 openfst-1.8.2_1
 libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
+libbpf.so.1 libbpf-1.0.0_1
diff --git a/srcpkgs/libbpf-devel b/srcpkgs/libbpf-devel
new file mode 120000
index 000000000000..ad979046de86
--- /dev/null
+++ b/srcpkgs/libbpf-devel
@@ -0,0 +1 @@
+libbpf
\ No newline at end of file
diff --git a/srcpkgs/libbpf/template b/srcpkgs/libbpf/template
new file mode 100644
index 000000000000..64b6091d800b
--- /dev/null
+++ b/srcpkgs/libbpf/template
@@ -0,0 +1,33 @@
+# Template file for 'libbpf'
+pkgname=libbpf
+version=1.1.0
+revision=1
+build_wrksrc="src"
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="elfutils-devel"
+short_desc="Library for working with (e)BPF"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only, BSD-2-Clause"
+homepage="https://github.com/libbpf/libbpf"
+distfiles="https://github.com/libbpf/libbpf/archive/refs/tags/v${version}.tar.gz"
+checksum=5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8
+
+post_install() {
+	vlicense ../LICENSE
+	vlicense ../LICENSE.BSD-2-Clause
+
+	# XXX use version in kernel-libc-headers>=6.0
+	vinstall ../include/uapi/linux/btf.h 0644 usr/include/linux
+}
+
+libbpf-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
+	}
+}

From eb33dd3d5671ed14731eb0a963694a399798d95f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:59:54 +0200
Subject: [PATCH 2/2] bpftrace: update to 0.16.0.

---
 srcpkgs/bpftrace/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 190cebb8e3bc..2f746a230247 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,18 +1,18 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
-version=0.15.0
+version=0.16.0
 revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
 hostmakedepends="flex pkg-config ruby-asciidoctor"
-makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel llvm"
+makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm"
 short_desc="High-level tracing language for Linux enhanced Berkeley Packet Filter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=64f67e615998d8150f5ee28614bea9ed303f20f6887bc4cdffa5f9c9477ef52a
+checksum=89456dee3a20ec6c21ece345d4bf9a16a06af0f63cc5dffa9f5c7eea7916e21d
 nostrip=yes  # needs to read own symbol table
 
 post_install() {