gentoo resync : 28.04.2021

5 files changed, 270 insertions, 1 deletions

diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 874c9c43a08f..923f276a3b8d 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,8 +1,12 @@
 AUX bpftrace-0.10.0-dont-compress-man.patch 722 BLAKE2B 583969e9f4457a49f17f33d984ab2585ec2e6f6976846af4d39084ce41bf334892b0971d1a1571e9495d4a05eea680412899d1fb23a8eb25a9b9cab84c3b101b SHA512 1f588dd589933c2fbb0ca79a5782c542cb137e748a442b9904153f76d142ae117755e1c24acfc50947e6040afbad78f31ef0c181082695f63ebb61b3acbe4b6a
 AUX bpftrace-0.11.0-install-libs.patch 6063 BLAKE2B c05146ef6d6ffd7fb5e1f97a9ea3dbdbab1b875bcf1707b07ff8c2b93e0e8cd36093330edc32b1d25796a5b72370b114301c1c0db78bc59c48740158e31a8e95 SHA512 e022425af1d19e1ff586f23d7de384b912bf8b67e501b86d31e3450e118ea3266cb81413caa06b3e674a31df2585ad447234e3897c716f055c7423a5f7333a66
 AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4b5ae28626f6905c45f6510f84b7c6f28aa3b5174f1f48a30763990b2a3cc50c6336249fe1dc4cf31656871a8adce43c8d7 SHA512 332e6cc4d1c21e917451c9aa6028b082f53dde8221419ba45ad7ae6321e444b3f67ec8366cbd56638d8f8b68a3be06af892eba765c810744951af1de9b994113
+AUX bpftrace-0.12.0-fuzzing-build.patch 491 BLAKE2B 6fcc78660f69742247bedded028a4c18f933f32c424bb5d11976ff5ddbe16587948e6c75303e75daad440f2cd578fb1a4c3682ca34657a3d2b83a0f67843f994 SHA512 ab9f0b8115ac17130841e7d9b1ad59e5f2a6836acd48ab1d5c3fec45ce75a7833d033a37cb1ddcdd72cd794c202cdaeb287689f67bbb2a9baccb8628c3ff2a59
+AUX bpftrace-0.12.0-install-libs.patch 6364 BLAKE2B e4b59b882c04f58c711f61653f2cb5f28a99f06891d979372e854bae1f125dba43bb64a65a14bd8e85ac97ae8b3e933ab1cc61a2ff9253113428394fbbebe599 SHA512 d9efc5bc544cb97eda647c84ee917851d3c63ff9648b2d026a8e699d5b0d3755f06983984c793cbf2efe865f15588d7d1e414e7b16026067aa5bc5dafb05c456
 DIST bpftrace-0.11.4.tar.gz 868016 BLAKE2B 50af7b4094e2875905d1ca36c003cde84e51adb11360f7933b82cd004dd7b9a8c2146d11c1422411ec0bb1935a693b17ab6d405aa5569ecabccfc21cdd1ca548 SHA512 611a7e61dbd1f4cc52b7e51a1a143296ff7b2df115b3a28034c674d8eefb5d482cac551ab82d6b7cc2f6fc0668b07d2d9e283dff371fd9a3f649c80113fdca82
+DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B 3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993 SHA512 a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345
 EBUILD bpftrace-0.11.4-r1.ebuild 1670 BLAKE2B 2ba970bb00da938ca92a88731498bcc4a8182578746b35e7d4341112c8f5abab0ec64921cbae14330b61f1c0e57b42f0c783db331da2bd9ce622a46450ccdc67 SHA512 9379627dc1e41f9134fddb8f2b6131afef0fd7d49c10f1ab746149e413ca61404e1fde9ec33200bd1148cc4f63832c921b19ac8c61ee4b5e6af34b09105f57ed
 EBUILD bpftrace-0.11.4.ebuild 1617 BLAKE2B c7cc64ec9f9d2cb7254222edc3aec8622fa85dde47e316018f91af00ceecaca4837683b06763c8a30e4123097748afae38593853366f544544d7b217f47b6f92 SHA512 039d202fbf9dda331b71b89e06f47b7dbaf787a7f9d9ef39d5f2ea63fb7b9fb3734f7d145acb3f6d46d4acfa7ed594b305f99a57ef62fcfaafd88776fba1f493
+EBUILD bpftrace-0.12.1-r1.ebuild 1717 BLAKE2B b2e89c2456ab0dbdc38ce8fead1297cc4241a1f454fcc8d93fda913468b01f8f398155918089c5b2f7a91b8fde1d06e3c96ca126e4694d433b5624a62655aaef SHA512 9a28f395f250d80c001f34935e75667d39d2a80f07e4c4c37d9acb61707c5856bca560c70e1f5130a0c23aa2242b1ea3a6d2d8cf2f59418271bdccbcc69227ed
 EBUILD bpftrace-9999.ebuild 1573 BLAKE2B 69c5ba3fc6278cd1b6098d174d8057c0ee758832a63716ff8864229deb35028d7ee5b738658cbb9787464391d250c35bf1933e0caf23fdbfc8d7f32422f86726 SHA512 aa783e719ee50be25065c696d291a1524b25949a43c78e9d7309cfbf5016ab413314a8575ac869bd45bb35fb9e251b0ea272f195b38cf1f20afb3b0783baacd7
-MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
+MISC metadata.xml 384 BLAKE2B f15afc660256a07333c80974b7860af277b8e8d56a33c3d60e121399fe3e99f8260353bbcf44f53179829cdf8aeff1373c7ae6c8cbcfc1d4699046c6814ed10b SHA512 803c1e1c3f7e3a3a0e0e3510049385f81685fdcd4c5b6fcdf4244f476bd42861727389759a3de66493ad4d3f1c902b04a23406f119794995394858ff16983fa8
diff --git a/dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild b/dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild
new file mode 100644
index 000000000000..c36af3ddcf98
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace"
+
+if [[ ${PV} =~ 9{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
+	BDEPEND=""
+else
+	MY_PV="${PV//_/}"
+	SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="fuzzing test"
+
+COMMON_DEPEND="
+	dev-libs/libbpf:=
+	>=dev-util/bcc-0.13.0:=
+	dev-util/systemtap
+	>=sys-devel/llvm-6:=[llvm_targets_BPF(+)]
+	<=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
+	<=sys-devel/clang-13:=
+	sys-libs/binutils-libs:=
+	virtual/libelf
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="
+	>=dev-util/cmake-3.8
+	sys-devel/flex
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.12.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+	"${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+	local CONFIG_CHECK="
+		~BPF
+		~BPF_EVENTS
+		~BPF_JIT
+		~BPF_SYSCALL
+		~FTRACE_SYSCALLS
+		~HAVE_EBPF_JIT
+	"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=12 llvm_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSTATIC_LINKING:BOOL=OFF
+		-DBUILD_TESTING:BOOL=OFF
+		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch b/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch
new file mode 100644
index 000000000000..30f03eb8ff28
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch
@@ -0,0 +1,13 @@
+diff --git a/src/fuzz_main.cpp b/src/fuzz_main.cpp
+index a08d0b03..82127be0 100644
+--- a/src/fuzz_main.cpp
++++ b/src/fuzz_main.cpp
+@@ -135,7 +135,7 @@ int fuzz_main(const char* data, size_t sz)
+     struct utsname utsname;
+     uname(&utsname);
+     std::string ksrc, kobj;
+-    auto kdirs = get_kernel_dirs(utsname, !bpftrace.features_->has_btf());
++    auto kdirs = get_kernel_dirs(utsname, !bpftrace.feature_->has_btf());
+     ksrc = std::get<0>(kdirs);
+     kobj = std::get<1>(kdirs);
+ 
diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
new file mode 100644
index 000000000000..04c08b3efa8b
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
@@ -0,0 +1,161 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e4544559..272ea18d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,9 +92,10 @@ find_package(FLEX REQUIRED)
+ bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc VERBOSE)
+ flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
+ add_flex_bison_dependency(flex_lexer bison_parser)
+-add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
+-target_compile_options(parser PRIVATE "-w")
+-target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
++add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
++target_compile_options(bpftraceparser PRIVATE "-w")
++target_include_directories(bpftraceparser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
++install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ include(CheckSymbolExists)
+ set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
+diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
+index a95c60a1..f5c4d676 100644
+--- a/resources/CMakeLists.txt
++++ b/resources/CMakeLists.txt
+@@ -1,6 +1,7 @@
+-add_library(resources headers.cpp)
++add_library(bpftraceresources headers.cpp)
+ 
+-target_include_directories(resources PUBLIC ../src)
++target_include_directories(bpftraceresources PUBLIC ../src)
++install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ function(embed_headers output)
+   file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 37ee2204..8b2e1909 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -145,7 +145,8 @@ if (ALLOW_UNSAFE_PROBE)
+   target_compile_definitions(libbpftrace PRIVATE HAVE_UNSAFE_PROBE)
+ endif(ALLOW_UNSAFE_PROBE)
+ 
+-target_link_libraries(libbpftrace arch ast parser resources)
++target_link_libraries(libbpftrace bpftracearch bpftraceast bpftraceparser bpftraceresources)
++install(TARGETS bpftracearch bpftraceast bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ target_link_libraries(libbpftrace ${LIBBCC_LIBRARIES})
+ if(STATIC_LINKING)
+@@ -194,6 +195,7 @@ if (USE_LIBFUZZER)
+ endif()
+ 
+ install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(TARGETS libbpftrace LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory")
+ if (KERNEL_HEADERS_DIR)
+diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
+index 76bb217e..6d243a7e 100644
+--- a/src/arch/CMakeLists.txt
++++ b/src/arch/CMakeLists.txt
+@@ -1,15 +1,15 @@
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+-    add_library(arch aarch64.cpp)
++    add_library(bpftracearch aarch64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR
+        CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
+-    add_library(arch ppc64.cpp)
++    add_library(bpftracearch ppc64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR
+        CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x")
+-    add_library(arch s390.cpp)
++    add_library(bpftracearch s390.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+-    add_library(arch x86_64.cpp)
++    add_library(bpftracearch x86_64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64")
+-    add_library(arch mips64.cpp)
++    add_library(bpftracearch mips64.cpp)
+ else()
+   message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
+ endif()
+diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
+index 3d444fb4..c2cf84ed 100644
+--- a/src/ast/CMakeLists.txt
++++ b/src/ast/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(ast
++add_library(bpftraceast
+   ast.cpp
+   attachpoint_parser.cpp
+   callback_visitor.cpp
+@@ -11,17 +11,18 @@ add_library(ast
+   signal.cpp
+   visitors.cpp
+ )
++install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+-target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src)
+-target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
+-target_include_directories(ast PUBLIC ${CMAKE_BINARY_DIR})
+-target_link_libraries(ast arch)
++target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src)
++target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
++target_include_directories(bpftraceast PUBLIC ${CMAKE_BINARY_DIR})
++target_link_libraries(bpftraceast bpftracearch)
+ 
+ if (HAVE_BCC_KFUNC)
+-  target_compile_definitions(ast PRIVATE HAVE_BCC_KFUNC)
++  target_compile_definitions(bpftraceast PRIVATE HAVE_BCC_KFUNC)
+ endif(HAVE_BCC_KFUNC)
+ 
+-add_dependencies(ast parser)
++add_dependencies(bpftraceast bpftraceparser)
+ 
+ if (STATIC_LINKING)
+   set(clang_libs
+@@ -45,17 +46,17 @@ if (STATIC_LINKING)
+     if(EMBED_LIBCLANG_ONLY)
+       unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM")
+     endif()
+-    target_link_libraries(ast ${CLANG_EMBEDDED_CMAKE_TARGETS})
++    target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
+   else()
+     list(INSERT clang_libs 0 libclang.a)
+   endif()
+ 
+   if(EMBED_LLVM)
+-    target_link_libraries(ast ${LLVM_EMBEDDED_CMAKE_TARGETS})
++    target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
+   else()
+     llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit option orcjit ${LLVM_TARGETS_TO_BUILD})
+-    target_link_libraries(ast ${clang_libs})
+-    target_link_libraries(ast ${llvm_libs})
++    target_link_libraries(bpftraceast ${clang_libs})
++    target_link_libraries(bpftraceast ${llvm_libs})
+   endif()
+ 
+   if(STATIC_LIBC)
+@@ -64,11 +65,11 @@ if (STATIC_LINKING)
+ else()
+   find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
+   if(found_LLVM)
+-    target_link_libraries(ast LLVM)
++    target_link_libraries(bpftraceast LLVM)
+   else()
+     llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
+     llvm_expand_dependencies(llvm_libs ${_llvm_libs})
+-    target_link_libraries(ast ${llvm_libs})
++    target_link_libraries(bpftraceast ${llvm_libs})
+   endif()
+-  target_link_libraries(ast libclang)
++  target_link_libraries(bpftraceast libclang)
+ endif()
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 8d546f9a..105dcd11 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_compile_options("-Wno-undef")
++gdd_compile_options("-Wno-undef")
+ add_compile_options("-Wno-switch-default")
+ add_compile_options("-Wno-switch-enum")
+ 
diff --git a/dev-util/bpftrace/metadata.xml b/dev-util/bpftrace/metadata.xml
index 777f99f832ca..0c5207748650 100644
--- a/dev-util/bpftrace/metadata.xml
+++ b/dev-util/bpftrace/metadata.xml
@@ -4,6 +4,9 @@
   <maintainer type="person">
     <email>chutzpah@gentoo.org</email>
   </maintainer>
+  <use>
+    <flag name="fuzzing">Build bpftrace for fuzzing</flag>
+  </use>
   <upstream>
     <remote-id type="github">iovisor/bpftrace</remote-id>
   </upstream>