gentoo auto-resync : 02:03:2024 - 11:41:42

4 files changed, 139 insertions, 0 deletions

diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index bba93ae7d205..d9cf05eca085 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
diff --git a/dev-debug/bpftrace/Manifest b/dev-debug/bpftrace/Manifest
index f9db3d786a60..cd0f97709bae 100644
--- a/dev-debug/bpftrace/Manifest
+++ b/dev-debug/bpftrace/Manifest
@@ -2,10 +2,12 @@ AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4
 AUX bpftrace-0.15.0-dont-compress-man.patch 1885 BLAKE2B 89a327cef68fa838d5c04b37e7bf72e6b03b54c244889706ba3c5156e2355d00cf395d14a6e8a7fe622e002acf9bab06dbc1427f6b637f0c59db86af08f05d51 SHA512 b591a73b0bbdd0105e6b87fb264ca4345e200ab58754d09a87dec79e60044eab165f2b34fe5ddc904cd877a460d5f41eef8b4d59eac255ea4f4e0fae37cf3511
 AUX bpftrace-0.19.0-install-libs.patch 14102 BLAKE2B 626bcebeba565dec1e1ffb389731ab5a408262de4c52c58408d93a097a5fe955c0460c6bf710aa65e832d6f1e1023ecc68999125fd386e62e0dd24d13920e913 SHA512 02e064a7332bf7eeddfed3169d31eee7faa32048c01e8c0363e0a5632c4a65bb371e967bab8706ca97b59bea2d10eb46dd1b0bd2b998cc63163d90c25570ceba
 AUX bpftrace-0.20.0-install-libs.patch 13542 BLAKE2B 20919556ae2653228282ae099f9043e85f2c22bc16472021ef20f794eadf61a5fc765058294ec19e95cf73711c5f38353d28b1cc3c36ed4dee9324da4d15bc91 SHA512 12806b7b02cb9fb24df41e3cbfd19ae18ede5bbf55c9c29fc7897bdbcec6dd4ae771f9dc4e18335f4fa44bed014dbb59f5b090e1ac20ca78ba90e85b8ec7f864
+AUX bpftrace-0.20.1-fuzzer.patch 1699 BLAKE2B c41270a45536732920fc39c186ec21889ef398a54e7a1a25323e0c455ab799b3369297b2a65e5b84e36c5fbde64d0c43ebcc98f50770c2b759cc944341a29be7 SHA512 71c41cc5b52174ed5700064a1b9ecff8956f5689761da870d544cc89ce3af2d6d836ab089e24c0a05cf9c909ca785c044f26f5e8bb6a5b365ed4d100af3cc843
 DIST bpftrace-0.19.1.gh.tar.gz 1157777 BLAKE2B 9db6285c7a82110106bd05759a09f16d85c82f2516f0b6ea34044e7389b2d38ed418d0fe5da44c2c9f9e67f72404f104f419ce3316c07ea54e65d4f039188039 SHA512 2f56b8fb7abfa58631ebc93c7a98cc066446808cbc0116902e43ebefa5f9625232da5ee3ede1d14a236296660a2f4c0907fa1ef24d383b4e32c70dcc3988c765
 DIST bpftrace-0.20.0.gh.tar.gz 1233420 BLAKE2B f69a65f33a7c1bd518bccf06e7bb975086deef6b43304285f1ac9e6dc54d92c6d887b194f63f46351d5506a1d40eb3d8a70e79e3f3f00b4bbdd692789caee149 SHA512 4554ba3099af086c7a149b809f4855d913361153b5f0b9552dbfabd360300d4ef841fe743734950d10b93c497e062476766cd0f6569ba2ff01951a4cc3a6cdb8
 DIST bpftrace-0.20.1.gh.tar.gz 1233431 BLAKE2B fe9221a94d58b43e0311f8c841df8421c3fe226a3fe61f2ec5cce5de309acdb69a68834e92a2e622a1750975869cbdaa95a90f9afb83989aa61b56b551fa96e3 SHA512 fdcc2b0d091d4ab428207877626b0fb37f3e0778730e6a6db26be869a086264e1f24186857c47597813aacde98621a66301bcf6c8004f77bdf9ebf180f198ba0
 EBUILD bpftrace-0.19.1.ebuild 1847 BLAKE2B 61cb93b19a920ef805e648344a32599173fcf6d0e5b38023b8bca9a344391f9f1b5caf58eda98c4e15ab15a7937223d99aa4503e484e77fd5b1a0183c752d565 SHA512 5e075217992fa0027877f4bd0f0b21540967e93083d8d4cd1dc3a725db5ada7d3f3250d3f8b3eacf64977d09e1a0684d033f3433ef787b09699d61e2df8ff532
 EBUILD bpftrace-0.20.0.ebuild 1816 BLAKE2B 876255cd89f7b75722a074e73713a3adbc6be43484cebe79d988e91910ec13d6528520aa23738992afe1e2da44d6d4cf21ef977776c3e1422d4163fe4cc89fe9 SHA512 a4aa91ef868b3c36561ddb05d067b870082e9654df8c0a38ab8dd4b1fbe3af2641b11389613172ce62474e773bd4e215c2165fd5989a23c0d9d9422bd4de2420
+EBUILD bpftrace-0.20.1-r1.ebuild 1858 BLAKE2B 63b9805276e4235521d7b00432f84b0676aebf646cb2309153290819ee39f1f560ddefa2122f810086a5186563cdf9539318faeb3c17e28c50b6d8a4cbe6baf4 SHA512 e3426acf2f170408f9887741f4dda56d48ebfaff83087f65aa3a46db9ce3e31042a6c2fc448659a18c70ebf9fb56522f4f7f92748460005150314ae7a31f2f26
 EBUILD bpftrace-0.20.1.ebuild 1816 BLAKE2B 876255cd89f7b75722a074e73713a3adbc6be43484cebe79d988e91910ec13d6528520aa23738992afe1e2da44d6d4cf21ef977776c3e1422d4163fe4cc89fe9 SHA512 a4aa91ef868b3c36561ddb05d067b870082e9654df8c0a38ab8dd4b1fbe3af2641b11389613172ce62474e773bd4e215c2165fd5989a23c0d9d9422bd4de2420
 MISC metadata.xml 385 BLAKE2B 625639d1899cc754d8622934822d467802c908ec386311103b8683c2bec45f1ac28b42704203ee97caacd08c6a96fcc84edde3dcc7b6f3f10f918cf67a656754 SHA512 7e15d98bff6109e41edd085924d9ac6a8bece5ff534e840576ca8c9d338f80e80a77b0ce7f822a8c10a41cb7d58a02a09ae54917136c450a98338124b7b24f9e
diff --git a/dev-debug/bpftrace/bpftrace-0.20.1-r1.ebuild b/dev-debug/bpftrace/bpftrace-0.20.1-r1.ebuild
new file mode 100644
index 000000000000..d4856d58d474
--- /dev/null
+++ b/dev-debug/bpftrace/bpftrace-0.20.1-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=17
+
+inherit llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace"
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# remove keywords until build works:
+# https://github.com/iovisor/bpftrace/issues/2349
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fuzzing test"
+
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libbpf-1.1:=
+	>=dev-util/bcc-0.25.0:=
+	>=sys-devel/llvm-10[llvm_targets_BPF(+)]
+	>=sys-devel/clang-10
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
+	sys-libs/binutils-libs:=
+	virtual/libelf:=
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/cereal:=
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-arch/xz-utils
+	app-alternatives/lex
+	app-alternatives/yacc
+	virtual/pkgconfig
+"
+
+QA_DT_NEEDED="
+	usr/lib.*/libbpftraceresources.so
+	usr/lib.*/libcxxdemangler_llvm.so
+"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.20.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+	"${FILESDIR}/bpftrace-0.20.1-fuzzer.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="
+		~BPF
+		~BPF_EVENTS
+		~BPF_JIT
+		~BPF_SYSCALL
+		~FTRACE_SYSCALLS
+		~HAVE_EBPF_JIT
+	"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSTATIC_LINKING:BOOL=OFF
+		# bug 809362, 754648
+		-DBUILD_TESTING:BOOL=$(usex test)
+		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
+		-DENABLE_MAN:BOOL=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# bug 809362
+	dostrip -x /usr/bin/bpftrace
+	doman man/man8/*.?
+}
diff --git a/dev-debug/bpftrace/files/bpftrace-0.20.1-fuzzer.patch b/dev-debug/bpftrace/files/bpftrace-0.20.1-fuzzer.patch
new file mode 100644
index 000000000000..a0f54e4962f3
--- /dev/null
+++ b/dev-debug/bpftrace/files/bpftrace-0.20.1-fuzzer.patch
@@ -0,0 +1,42 @@
+https://github.com/bpftrace/bpftrace/commit/fe6362b4e2c1b9d0833c7d3f308c1d4006b54723
+
+From fe6362b4e2c1b9d0833c7d3f308c1d4006b54723 Mon Sep 17 00:00:00 2001
+From: gkamathe <73747618+gkamathe@users.noreply.github.com>
+Date: Fri, 16 Feb 2024 18:19:14 +0530
+Subject: [PATCH] =?UTF-8?q?fix=20bpftrace=5Ffuzz=20error=20for=20call=20to?=
+ =?UTF-8?q?=20'get=5Fkernel=E2=80=A6=5Fcflags'=20(#3007)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* fix bpftrace_fuzz error: no matching function for call to 'get_kernel_cflags'
+
+When compiling bpftace_fuzz we run into the following issue where 1
+argument is missing, adding the required argument
+
+src/fuzz_main.cpp:140:21: error: no matching function for call to 'get_kernel_cflags'
+      extra_flags = get_kernel_cflags(utsname.machine, ksrc, kobj);
+                    ^~~~~~~~~~~~~~~~~
+src/utils.h:180:26: note: candidate function not viable: requires 4 arguments, but 3 were provided
+std::vector<std::string> get_kernel_cflags(const char *uname_machine,
+                         ^
+Seems fourth argument was added via 4bcee640636e268de4b938a1007fb29a8836f049
+
+Signed-off-by: Gaurav Kamathe <kamathe.gaurav@gmail.com>
+
+---------
+
+Signed-off-by: Gaurav Kamathe <kamathe.gaurav@gmail.com>
+--- a/src/fuzz_main.cpp
++++ b/src/fuzz_main.cpp
+@@ -137,7 +137,8 @@ int fuzz_main(const char* data, size_t sz)
+     kobj = std::get<1>(kdirs);
+ 
+     if (ksrc != "")
+-      extra_flags = get_kernel_cflags(utsname.machine, ksrc, kobj);
++      extra_flags = get_kernel_cflags(
++          utsname.machine, ksrc, kobj, bpftrace.kconfig);
+   }
+   extra_flags.push_back("-include");
+   extra_flags.push_back(CLANG_WORKAROUNDS_H);
+