commit: f6241ba71689a23c61594e8813901602405cdba8 Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com> AuthorDate: Fri Oct 3 16:25:07 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 21:19:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6241ba7
dev-debug/bpftrace: add 0.24.1 Minor update with contributed gcc-16 and UBSAN fixes. Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com> Part-of: https://github.com/gentoo/gentoo/pull/44024#issue-comment-box Signed-off-by: Sam James <sam <AT> gentoo.org> dev-debug/bpftrace/Manifest | 2 + dev-debug/bpftrace/bpftrace-0.24.1.ebuild | 141 +++++++++++++++++++++ .../files/bpftrace-0.24.1-enable-ubsan.patch | 88 +++++++++++++ 3 files changed, 231 insertions(+) diff --git a/dev-debug/bpftrace/Manifest b/dev-debug/bpftrace/Manifest index 993d207edabc..32a85a6f8011 100644 --- a/dev-debug/bpftrace/Manifest +++ b/dev-debug/bpftrace/Manifest @@ -8,3 +8,5 @@ DIST bpftrace-0.23.5-man.tar.xz 76020 BLAKE2B aa6023a1c9f3e2b3f42b8d7ac78f3bc891 DIST bpftrace-0.23.5.tar.gz 1172407 BLAKE2B b5e9cff1dee01cc33f150cccf28ee4b1d671cf16b92854a7debac97e0378cef28f31e5093f840978667a1da6f5686e7ca10feb1e152b053155b68ec44c3d58c3 SHA512 1e040bce7636da4e2ebeffc1c8fc3944feb26ef2c371ff287b323123ef89b839fbaa492a61e8164efedc7579e73aebc489f168ecad903f3cac6144d8bbc4b6f1 DIST bpftrace-0.24.0-man.tar.xz 43780 BLAKE2B a0c3119c2c2887dc3444d9645d17c84cd260790e42a2e975ac6083b9520348150a5edb927f1ecc04fcb84dc1d326d565bdb06ddbda4fe43b892b1e3fdb43e170 SHA512 9dd4c3077463a22fe986862f27d3ddcfc5b49d21d69d8e0f85f31b308bcf0355935fc4d858f2a76b5ffe88729439008f1b98f999cea176c5b6213913dafbddbc DIST bpftrace-0.24.0.tar.gz 1521939 BLAKE2B f263db078e46cb107aca123522da4b615e529c4eabdaee593b790d1990805bf27fbd08151dae9da61ebf3fbf5357867b41113be6b97c62e674ef6d351c43ab3c SHA512 67490f73e402282ebf5810604649a7dd14cc9b1fa0df06c28053bd9600cfc0a69bec8ff17ad5e6e096fc013e05af11fc26d611999e6c7126ca2dbe1ba9de96c0 +DIST bpftrace-0.24.1-man.tar.xz 43808 BLAKE2B f5d49b29e300e37444d134b8e9530c17294dfd47aaf7810bfaaf411cc9795a57450a64de6e8d4803e71d236523b81dff285868aa3b63b30d883507a12c1ec93c SHA512 a9618aa2cb3013448cb0af20a807238dc3e0cd0e6fa3f867bc7156ecb274782b81d87c14315430d939c9eac8ec65f8d6a3f9671cd49bf52b37c576cd56c11064 +DIST bpftrace-0.24.1.tar.gz 1522448 BLAKE2B 840220497bb4312391231e5471c1f8fa36151a4b5993e6cd67287967054c0b03f882e8da1e64e628f58f04d795c1f70b4877ef5cb1ff12819253303ffb2459b9 SHA512 97ce3d909c6d6fe021afc6db4ea67dd70fa85502358ee89314d8cf58cb8727ce091bbbdf23f73d9eaadae59d8244d76530dda89993b499deebe7f90edd21cda7 diff --git a/dev-debug/bpftrace/bpftrace-0.24.1.ebuild b/dev-debug/bpftrace/bpftrace-0.24.1.ebuild new file mode 100644 index 000000000000..ed264862c6de --- /dev/null +++ b/dev-debug/bpftrace/bpftrace-0.24.1.ebuild @@ -0,0 +1,141 @@ +# Copyright 2019-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {17..21} ) +RUST_MIN_VER=1.85.1 +RUST_OPTIONAL=1 + +inherit cmake flag-o-matic linux-info llvm-r1 rust + +DESCRIPTION="High-level tracing language for eBPF" +HOMEPAGE="https://github.com/bpftrace/bpftrace"; +MY_PV="${PV//_/}" +# the man page version may trail the release +#MAN_V="0.24.0" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/bpftrace/bpftrace"; + EGIT_BRANCH="release/0.24.x" + inherit git-r3 +else + SRC_URI="https://github.com/bpftrace/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" +fi + +SRC_URI+=" https://github.com/bpftrace/${PN}/releases/download/v${MAN_V:-${PV}}/man.tar.xz -> ${PN}-${MAN_V:-${PV}}-man.tar.xz" + +S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" + +LICENSE="Apache-2.0" +SLOT="0" + +IUSE="pcap test systemd" + +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/blazesym_c-0.1.1 + >=dev-libs/libbpf-1.5:= + >=dev-util/bcc-0.25.0:= + $(llvm_gen_dep ' + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}=[llvm_targets_BPF(+)] + ') + sys-process/procps + sys-libs/binutils-libs:= + virtual/libelf:= + systemd? ( sys-apps/systemd:= ) + pcap? ( net-libs/libpcap:= ) +" +DEPEND=" + ${RDEPEND} + dev-libs/cereal:= + test? ( dev-cpp/gtest ) +" +BDEPEND=" + app-arch/xz-utils + app-alternatives/lex + app-alternatives/yacc + app-editors/vim-core + dev-libs/cereal + dev-util/bpftool + test? ( + ${RUST_DEPEND} + dev-lang/go + dev-util/pahole + ) + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" + "${FILESDIR}/bpftrace-0.21.0-dont-compress-man.patch" + "${FILESDIR}/bpftrace-0.24.1-enable-ubsan.patch" +) + +pkg_pretend() { + local CONFIG_CHECK=" + ~BPF + ~BPF_EVENTS + ~BPF_JIT + ~BPF_SYSCALL + ~FTRACE_SYSCALLS + ~HAVE_EBPF_JIT + " + + check_extra_config +} + +pkg_setup() { + llvm-r1_pkg_setup + use test && rust_pkg_setup +} + +src_prepare() { + # create a usable version from git + if [[ ${PV} == *9999* ]] ; then + local rev=$(git branch --show-current | sed -e 's/* //g' -e 's/release\///g')-$(git rev-parse --short HEAD) + sed -i "/configure_file/i set (BPFTRACE_VERSION \"v${rev}\")" cmake/Version.cmake || die + fi + + # unpack prepackaged man tarball for bpftrace.8 + pushd "${WORKDIR}" && unpack ${PN}-${MAN_V:-${PV}}-man.tar.xz && popd + + cmake_src_prepare +} + +src_configure() { + # suppress one remaining and benign ODR violation warning due to + # a generated libbpf header used by the tests, see: + # https://github.com/bpftrace/bpftrace/issues/4591 + use test && append-flags -Wno-odr + + local mycmakeargs=( + # DO dynamically link the bpftrace executable + -DSTATIC_LINKING=OFF + # DO NOT build the internal libs as shared + -DBUILD_SHARED_LIBS=OFF + -DBUILD_TESTING=$(usex test) + # we use the pregenerated man page + -DENABLE_MAN=OFF + -DENABLE_SKB_OUTPUT=$(usex pcap) + -DENABLE_SYSTEMD=$(usex systemd) + ) + + # enable UBSAN only when enabled in the toolchain + if is-flagq -fsanitize=undefined; then + filter-flags -fsanitize=undefined + mycmakeargs+=( -DBUILD_UBSAN=ON ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + doman man/man8/*.? + gunzip "${WORKDIR}/man/man8/bpftrace.8.gz" || die + doman "${WORKDIR}/man/man8/bpftrace.8" +} diff --git a/dev-debug/bpftrace/files/bpftrace-0.24.1-enable-ubsan.patch b/dev-debug/bpftrace/files/bpftrace-0.24.1-enable-ubsan.patch new file mode 100644 index 000000000000..8e6cc1bb3053 --- /dev/null +++ b/dev-debug/bpftrace/files/bpftrace-0.24.1-enable-ubsan.patch @@ -0,0 +1,88 @@ +From: https://github.com/bpftrace/bpftrace/pull/4655 + +From: =?UTF-8?q?Viktor=20Mal=C3=ADk?= <[email protected]> +Date: Thu, 25 Sep 2025 13:34:17 +0200 +Subject: [PATCH] CMake: Enable UBSan builds (#4655) + +Add new CMake option `BUILD_UBSAN` which will add `-fsanitize=undefined` +to the build. This helps to identify undefined behavior. + +Signed-off-by: Viktor Malik <[email protected]> +--- + CMakeLists.txt | 1 + + src/CMakeLists.txt | 13 +++++++++++++ + src/aot/CMakeLists.txt | 4 ++++ + tests/CMakeLists.txt | 5 +++++ + 4 files changed, 23 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 898ec2f85560..5bb09a2e56be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,6 +15,7 @@ set(HARDENED_STDLIB OFF CACHE BOOL "Enable hardened definitions for standard lib + set(STATIC_LINKING OFF CACHE BOOL "Build bpftrace as a statically linked executable") + + set(BUILD_ASAN OFF CACHE BOOL "Build bpftrace with -fsanitize=address") ++set(BUILD_UBSAN OFF CACHE BOOL "Build bpftrace with -fsanitize=undefined") + set(ENABLE_MAN ON CACHE BOOL "Build man pages") + set(BUILD_TESTING ON CACHE BOOL "Build test suite") + set(ENABLE_TEST_VALIDATE_CODEGEN ON CACHE BOOL "Run LLVM IR validation tests") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0432e6106e6d..d5432c0995d3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -2,6 +2,12 @@ if(HAVE_BFD_DISASM) + set(BFD_DISASM_SRC bfd-disasm.cpp) + endif() + ++if (BUILD_UBSAN) ++ # This adds -fsanitize=undefined to all below compiler invocations, including ++ # subdirectories. ++ add_compile_options("-fsanitize=undefined") ++endif() ++ + add_library(required_resources required_resources.cpp) + add_dependencies(required_resources parser) + +@@ -201,6 +207,13 @@ if (BUILD_ASAN) + target_link_options(bpftrace PUBLIC "-fsanitize=address") + endif() + ++if (BUILD_UBSAN) ++ # We do not use add_link_options here since it doesn't work for some reason. ++ # Instead, just pass -fsanitize=undefined to the linker when linking the ++ # bpftrace target. ++ target_link_options(bpftrace PUBLIC "-fsanitize=undefined") ++endif() ++ + if (STATIC_LINKING) + if(ANDROID) + target_link_libraries(libbpftrace "-Wl,-Bdynamic" "-ldl" "-lm" "-lz") +diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt +index 1323bdacb6df..5267e4a1c19e 100644 +--- a/src/aot/CMakeLists.txt ++++ b/src/aot/CMakeLists.txt +@@ -34,3 +34,7 @@ if(BUILD_ASAN) + target_compile_options(bpftrace-aotrt PUBLIC "-fsanitize=address") + target_link_options(bpftrace-aotrt PUBLIC "-fsanitize=address") + endif() ++ ++if(BUILD_UBSAN) ++ target_link_options(bpftrace-aotrt PUBLIC "-fsanitize=undefined") ++endif() +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index b6002e8075ff..141b44d5a30e 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -94,6 +94,11 @@ if(BUILD_ASAN) + target_link_options(bpftrace_test PUBLIC "-fsanitize=address") + endif() + ++if(BUILD_UBSAN) ++ target_compile_options(bpftrace_test PUBLIC "-fsanitize=undefined") ++ target_link_options(bpftrace_test PUBLIC "-fsanitize=undefined") ++endif() ++ + # bpftrace tests require (at minimum) version 1.11. + # There's no great way to enforce a minimum version from cmake -- the cmake + # modules don't respect minimum requested version.
