gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 190 insertions, 0 deletions

diff --git a/dev-debug/sysdig/Manifest b/dev-debug/sysdig/Manifest
index 3562e4357e1c..720258be2364 100644
--- a/dev-debug/sysdig/Manifest
+++ b/dev-debug/sysdig/Manifest
@@ -1,7 +1,12 @@
 AUX 0.29.3-libs-gcc13.patch 1757 BLAKE2B 5094b765aa5009024edea3a333e1a70a6b7380a24312eeb628e53138fd348583c515287c1b0ceed8fac151f5cb4b439ae9b04aaa092ae58661ed373599f1e90d SHA512 344b01c574cefae03d217f7defd3fb58dd1e99cee3ae9ade4347b665d83ed865078067dc6733bbaa1199d562ba21781e8322437a35775ae13cfdf95c752a350f
 AUX 0.29.3-libs-no-libanl.patch 495 BLAKE2B 5e77a8712f04ba7a1386bd2d40ee34093dc39798d451f92117667b3787becf578bc2e2d8a2e5b4ace7d69d71f6faf4cc68a6ae91e7431725ffaa46b5a7f338eb SHA512 34436744c960c9eaa58e0281d829f929d334e30dc811180a3c2e2614a981ab2e4620c3815d430d8e1f739482d42920cfdfcbb4de41a8f73e5dc5ca2cb46f9e9b
+AUX 0.38.1-libs-no-libanl.patch 676 BLAKE2B 81bec8c1e6472833dfa9b038561194bc5be41bec9e8412dd9c6d8f316bffde968175cf45617a444c96b55f7bba7308c7b1234b6632abfa717d958155b3af7b73 SHA512 7f6d439bd881a7eeb6633f68f221c826113c87d4a2d749e7eb27dfca792145cad980cc403a32d87c9c903172565f75f6e15ed09abba411a9588360ea569c0895
+AUX 0.38.1-scap-loader.patch 1341 BLAKE2B 9184949725cf369ad1bc43abc3f8093425457fe2831ffcd61326b6f182635b20abff957c9602a35001c14895053003ddc94c0e11419d7273868557261bc11c45 SHA512 bc7fb0bc0a744293598333e528b060b4cc4763347615b86a2a18ed43d04b59dd60f86b7da21b1a9d098d58c6641c36005a16de77fd60621c961115de4fcb3403
+DIST falcosecurity-libs-0.17.2.tar.gz 4424458 BLAKE2B cbe3a689d3d93a6896b94fd54b35665b11263c07690a36d40617651f97806b0177af657824f62259df95a984d598a34c17ff942c73e3abd774569607dc22380f SHA512 8bb449d91c12225c08d678ea9a8e97a5b5e8828788b56d5b83ec3b3c6ad5e25d4f56120dba523ac9c593d02ee155026e2d4d47587be6f73f373f06fe7ddc2a0c
 DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
 DIST sysdig-0.29.3.tar.gz 306984 BLAKE2B 51e9a0a085fa91d65963fd33e00b139d97d22b551de8ca85e48b4af73991897378970dfde54754a970e79300f06a54bad1d9c8fdfdb44f24150d0b21077e423f SHA512 1dbe1195f245921c671ed2343325aee79fd0cde34681b9cab445135662d3ed7c84884e46b2270c0e868b5de1a3f2800b84e8bf9fcf0dfe581dd17e2e633f46d8
+DIST sysdig-0.38.1.tar.gz 67528905 BLAKE2B 9b0e0f337bf64df200b44f7e23c64d00477d6ebfb2bc995dcb04951c8e25fb9274431022b8fa54f54851436f063b79d1268045ba686e97fb0195922bc8dfcf28 SHA512 17275c029368b203ec590cf448a33275bd6c20b81be77edcd393f1a3c04e6c4714c7286b6268823bb0c629d52a88cd97f7b3ef588bd10a000b65de23eb5b5a45
 EBUILD sysdig-0.29.3-r1.ebuild 2173 BLAKE2B 898a43a024a5acff4464462d630249faf539d3715dfcb5900bb3262ff793c8c277ce0e30796c2d09cb19e400430a976d3b9f6dd301fe5269bdc15e6698cf0f6a SHA512 46f162c0aa04094b80566bc988553d50a23671f1d6e34b241491d2d632b3f9a72b229416358e261adb154bf94ce8714c1e1ee8d094799ff941f238e1d5df61aa
 EBUILD sysdig-0.29.3-r2.ebuild 2554 BLAKE2B b7e9f236d3f51c3c56b9fc0840296e24fb4fec65b4aa0d70c4e5c8eba97c440811e34be3a5f34fd7be28aacfb8fb2d7c81e85971716a6faefdd7434c49cb93bf SHA512 a1ddd6d3479438f26b60654282b7700d98a4eb8304686b6d01128e8ba7ed3dce6ffb19487cbd25e2d71f00aab3fe65e0ab4fff94cfadc8179c1223ea37432b77
+EBUILD sysdig-0.38.1.ebuild 3367 BLAKE2B 332b950ac748b841ebc98af98db83d4a61f0b07bfea86b9344fb4cba8031eee91f43ab89221a2b2814b66ec88fe0d7d3324f08843ad321470c176de3148188bd SHA512 dca333e1cc2e4d8502b9ac790dc1d991805628042fab28d26aaac5b70b44e11d0a32ed040b9f38293b3136c0a11906dae8c3d5ec7374136ce917e8018612929d
 MISC metadata.xml 671 BLAKE2B 553dbbe2ea2a56f5a88bb0276b3f97c5d4d8d798291eaef42d5aadd842cf5cbbb770515729c9779890f9227f7cc96fc8e35457009f066cfb43993b02c7406d7a SHA512 4d0b92b271bd4ceb86db363a29cd465124ab71ec6941848cafec4ebba0232a52bf62a4128d8cbaf5a7a6c9350aef29e4a797b6a659d5d5896c077b0b5df9f73d
diff --git a/dev-debug/sysdig/files/0.38.1-libs-no-libanl.patch b/dev-debug/sysdig/files/0.38.1-libs-no-libanl.patch
new file mode 100644
index 000000000000..f1b10b3f07cd
--- /dev/null
+++ b/dev-debug/sysdig/files/0.38.1-libs-no-libanl.patch
@@ -0,0 +1,21 @@
+
+Do not attempt to link against libanl on musl.
+
+Bug: https://bugs.gentoo.org/929907
+Bug: https://github.com/falcosecurity/libs/issues/1948
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+--- libs-0.17.2/userspace/libsinsp/CMakeLists.txt~	2024-06-14 11:38:50.000000000 +0200
++++ libs-0.17.2/userspace/libsinsp/CMakeLists.txt	2024-07-05 00:18:03.326406540 +0200
+@@ -258,8 +258,8 @@ if(NOT WIN32)
+ 			)
+ 
+ 			if(NOT MUSL_OPTIMIZED_BUILD)
+-				target_link_libraries(sinsp INTERFACE rt anl)
+-				list(APPEND SINSP_PKGCONFIG_LIBRARIES rt anl)
++				target_link_libraries(sinsp INTERFACE rt)
++				list(APPEND SINSP_PKGCONFIG_LIBRARIES rt)
+ 			endif()
+ 
+ 		else()
diff --git a/dev-debug/sysdig/files/0.38.1-scap-loader.patch b/dev-debug/sysdig/files/0.38.1-scap-loader.patch
new file mode 100644
index 000000000000..1f350948b37a
--- /dev/null
+++ b/dev-debug/sysdig/files/0.38.1-scap-loader.patch
@@ -0,0 +1,32 @@
+
+Sanitize the scap loader script to not attempt driver downloads or compilation
+by default, which would not work anyway as sysdig does not host prebuilt modules
+for Gentoo.
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+--- sysdig-0.38.0/scripts/scap-driver-loader.in~ 2024-06-17 11:14:55.000000000 +0200
++++ sysdig-0.38.0/scripts/scap-driver-loader.in	2024-06-17 11:14:55.000000000 +0200
+@@ -662,8 +662,8 @@ print_usage() {
+ 	echo "Options:"
+ 	echo "  --help         show brief help"
+ 	echo "  --clean        try to remove an already present driver installation"
+-	echo "  --compile      try to compile the driver locally (default true)"
+-	echo "  --download     try to download a prebuilt driver (default true)"
++	echo "  --compile      try to compile the driver locally (default false)"
++	echo "  --download     try to download a prebuilt driver (default false)"
+ 	echo "  --source-only  skip execution and allow sourcing in another script"
+ 	echo ""
+ 	echo "Environment variables:"
+@@ -770,11 +770,6 @@ while test $# -gt 0; do
+ 	esac
+ done
+ 
+-if [ -z "$has_opts" ]; then
+-	ENABLE_COMPILE="yes"
+-	ENABLE_DOWNLOAD="yes"
+-fi
+-
+ if [ -z "$source_only" ]; then
+ 	echo "* Running scap-driver-loader for: driver version=${DRIVER_VERSION}, arch=${ARCH}, kernel release=${KERNEL_RELEASE}, kernel version=${KERNEL_VERSION}"
+ 
diff --git a/dev-debug/sysdig/sysdig-0.38.1.ebuild b/dev-debug/sysdig/sysdig-0.38.1.ebuild
new file mode 100644
index 000000000000..937c2a94f1eb
--- /dev/null
+++ b/dev-debug/sysdig/sysdig-0.38.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+
+inherit bash-completion-r1 cmake lua-single
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://sysdig.com/"
+
+# The version of falcosecurity-libs required by sysdig as source tree
+LIBS_VERSION="0.17.2"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/falcosecurity/libs/archive/${LIBS_VERSION}.tar.gz -> falcosecurity-libs-${LIBS_VERSION}.tar.gz"
+
+# The driver version as found in cmake/modules/driver.cmake
+DRIVER_VERSION="7.2.0+driver"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+modules"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	dev-cpp/tbb:=
+	dev-cpp/yaml-cpp:=
+	dev-libs/jsoncpp:=
+	dev-libs/libb64:=
+	dev-libs/openssl:=
+	dev-libs/protobuf:=
+	dev-libs/re2:=
+	dev-libs/uthash
+	net-dns/c-ares:=
+	net-libs/grpc:=
+	net-misc/curl
+	sys-libs/ncurses:=
+	sys-libs/zlib:=
+	virtual/libelf:="
+
+DEPEND="${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-cpp/valijson
+	virtual/os-headers"
+
+# pin the driver to the falcosecurity-libs version
+PDEPEND="modules? ( =dev-debug/scap-driver-${LIBS_VERSION}* )"
+
+PATCHES=( "${FILESDIR}/${PV}-scap-loader.patch" )
+
+src_prepare() {
+	# manually apply patches to falcosecurity-libs dependency
+	pushd "${WORKDIR}"
+		# musl has no libanl (#929227)
+		if [ ${ELIBC} == "musl" ] ; then
+			eapply -p0 "${FILESDIR}/${PV}-libs-no-libanl.patch" || die
+		fi
+	popd
+
+	# do not build with debugging info
+	sed -i -e 's/-ggdb//g' CMakeLists.txt "${WORKDIR}"/libs-${LIBS_VERSION}/cmake/modules/CompilerFlags.cmake || die
+
+	# fix the driver version
+	sed -i -e 's/0.0.0-local/${DRIVER_VERSION}/g' cmake/modules/driver.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# known problems with strict aliasing:
+	# https://github.com/falcosecurity/libs/issues/1964
+	append-flags -fno-strict-aliasing
+
+	# multiple issues with LTO (known/in progress)
+	# https://github.com/falcosecurity/libs/issues/1963
+	filter-lto
+
+	local mycmakeargs=(
+		# do not build the kernel driver
+		-DBUILD_DRIVER=OFF
+
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# do not build internal libs as shared
+		-DBUILD_SHARED_LIBS=OFF
+
+		# do not build eBPF driver for now
+		-DBUILD_SYSDIG_MODERN_BPF=OFF
+
+		# set driver version to prevent downloading (don't ask..)
+		-DDRIVER_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_VERSION}/driver
+		-DDRIVER_VERSION=${DRIVER_VERSION}
+
+		# point sysdig to the libs tree
+		-DFALCOSECURITY_LIBS_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_VERSION}
+
+		# explicitly set sysdig version - required for some reason
+		-DSYSDIG_VERSION=${PV}
+
+		# do not use bundled dependencies for sysdig
+		-DUSE_BUNDLED_DEPS=OFF
+
+		# do not use bundled dependencies for falcosecurity-libs
+		-DUSE_BUNDLED_B64=OFF
+		-DUSE_BUNDLED_JSONCPP=OFF
+		-DUSE_BUNDLED_RE2=OFF
+		-DUSE_BUNDLED_TBB=OFF
+		-DUSE_BUNDLED_VALIJSON=OFF
+
+		# set valijson include path to prevent downloading
+		-DVALIJSON_INCLUDE="${ESYSROOT}"/usr/include
+
+		# enable chisels
+		-DWITH_CHISEL=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove driver headers
+	rm -r "${ED}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED}"/usr/etc || die
+}