gentoo auto-resync : 29:04:2023 - 11:14:33

3 files changed, 121 insertions, 0 deletions

diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 9e4c9d10be53..5433eae8e3c3 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,4 +1,6 @@
+AUX 0.29.3-libs-gcc13.patch 1152 BLAKE2B 85ee0737eee65a83e26b47ada730062fa881e1198fd6aded89d61f11dd3b69dac45dc3b23867ed669a0af29ae4ff8b9ff42df29de1e0a6dc76e5b97abf3c2c07 SHA512 23476d3dfbcfee1e4a3a99068aecb57cbe46b7b89234ae1e89c072ef7f9400701ac09ca400685bf4d2c4003e7837a323476d2b2fe197b8e27cbb91142933eb5f
 DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
 DIST sysdig-0.29.3.tar.gz 306984 BLAKE2B 51e9a0a085fa91d65963fd33e00b139d97d22b551de8ca85e48b4af73991897378970dfde54754a970e79300f06a54bad1d9c8fdfdb44f24150d0b21077e423f SHA512 1dbe1195f245921c671ed2343325aee79fd0cde34681b9cab445135662d3ed7c84884e46b2270c0e868b5de1a3f2800b84e8bf9fcf0dfe581dd17e2e633f46d8
+EBUILD sysdig-0.29.3-r1.ebuild 2174 BLAKE2B b2a01599cf6f0e0ab224029a83d2307105326d32a283c5311bac11909a147b4a04335b00d6c0ebbbe4ff66da00a60b259b7018322e02913e3232500b247f43b5 SHA512 3f7f8e5111e1a327493cf72c5b846496891007325a6fc4214bd81a8f344d581c37d3af5b28d44bcc0be95c18e4960e773a3eb17dbeae36b292a2ab47744264b9
 EBUILD sysdig-0.29.3.ebuild 2035 BLAKE2B 21e6b40e15261ba7d428b127343942c68973bae8617c26c83eb4a2e7350e364869894a76628132db04e96c4c636e07de4e36d73f2f5c0680c70f2298dcdb537c SHA512 82e848ac5fd1048b6cd7f342cb14a9eef45247c1ac022039f93564f68a2efb28ee72324aec3f1f2e7f1fa969e1f22c69ab736fd6053b4f5299504a2da78a87bf
 MISC metadata.xml 671 BLAKE2B 553dbbe2ea2a56f5a88bb0276b3f97c5d4d8d798291eaef42d5aadd842cf5cbbb770515729c9779890f9227f7cc96fc8e35457009f066cfb43993b02c7406d7a SHA512 4d0b92b271bd4ceb86db363a29cd465124ab71ec6941848cafec4ebba0232a52bf62a4128d8cbaf5a7a6c9350aef29e4a797b6a659d5d5896c077b0b5df9f73d
diff --git a/dev-util/sysdig/files/0.29.3-libs-gcc13.patch b/dev-util/sysdig/files/0.29.3-libs-gcc13.patch
new file mode 100644
index 000000000000..ce1a686cc65c
--- /dev/null
+++ b/dev-util/sysdig/files/0.29.3-libs-gcc13.patch
@@ -0,0 +1,28 @@
+
+Manual backport of the upstream fix at:
+https://github.com/falcosecurity/libs/commit/1406858fa5223d980e66e2a5fb2c1b014c9db5c8
+
+diff --git libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/filter_value.h libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/filter_value.h
+index 47f5367..6cc8b83 100644
+--- libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/filter_value.h
++++ libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/filter_value.h
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string.h>
+ #include <utility>
+ 
+diff --git libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/sinsp.h libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/sinsp.h
+index c15c13c..f9f9f45 100644
+--- libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/sinsp.h
++++ libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/sinsp.h
+@@ -56,6 +56,7 @@ limitations under the License.
+ 
+ #define __STDC_FORMAT_MACROS
+ 
++#include <cstdint>
+ #include <string>
+ #include <unordered_map>
+ #include <map>
diff --git a/dev-util/sysdig/sysdig-0.29.3-r1.ebuild b/dev-util/sysdig/sysdig-0.29.3-r1.ebuild
new file mode 100644
index 000000000000..7e9e4f5a0c66
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.29.3-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 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/"
+
+# For now we need to bump this version of falcosecurity/libs manually;
+# check the used git revision in <src>/cmake/modules/falcosecurity-libs.cmake
+LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a"
+
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+modules"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	app-misc/jq
+	dev-cpp/tbb:=
+	dev-cpp/yaml-cpp:=
+	dev-libs/libb64:=
+	dev-libs/openssl:=
+	dev-libs/protobuf:=
+	net-dns/c-ares:=
+	net-libs/grpc:=
+	net-misc/curl
+	sys-libs/ncurses:=
+	sys-libs/zlib:="
+
+DEPEND="${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-cpp/valijson
+	virtual/os-headers"
+
+# for now pin the driver to the same ebuild version
+PDEPEND="modules? ( =dev-util/scap-driver-${PV}* )"
+
+src_prepare() {
+	# manually apply patch to falcosecurity-libs dependency
+	pushd "${WORKDIR}" && eapply -p0 "${FILESDIR}/${PV}-libs-gcc13.patch" && popd
+
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# don't build driver
+		-DBUILD_DRIVER=OFF
+
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# point to the falcosecurity-libs tree
+		-DFALCOSECURITY_LIBS_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_COMMIT}
+
+		# explicitly set version
+		-DSYSDIG_VERSION=${PV}
+
+		# unbundle the deps
+		-DUSE_BUNDLED_DEPS=OFF
+
+		# add 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
+}