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

3 files changed, 78 insertions, 0 deletions

diff --git a/dev-debug/scap-driver/Manifest b/dev-debug/scap-driver/Manifest
index aa026e8acae6..b994adb45c37 100644
--- a/dev-debug/scap-driver/Manifest
+++ b/dev-debug/scap-driver/Manifest
@@ -1,10 +1,13 @@
+AUX 0.17.2-fix-kmod-build-on-6.10+.patch 948 BLAKE2B cf6b4ecfe1925b9ae98c47342a95402e0a4e3085af4b76d1ee6d97351ae03187e16acaf4468a18490d2cbb1079e0a208fc2984db620a5e25a898c30a81adb6d5 SHA512 566adbf9a3de4847aabd27a1ecdd1c6b420dfe7207eab75545948a68d6f43f21691cd4431856d22e6ce523e24a066914023a147fcdfc2d2d4423501fcd0c11a7
 AUX 0.29.3-fix-kmod-build-on-5.18+.patch 2363 BLAKE2B 8e5a89b68fb67076d01a7dc295157d2f2542a2db84460a35ed3162b77ff860097f1761317b93dec6aa0d6294b4414e445fd2c94df700bb5d738210982174f595 SHA512 f7c1e57cb05de1a97a3332055f6d6f74a637f38281a4e98b202cf84c9dd02b90e0b4fee3dbc44653760231ce55ad396aec3018b3b239249b6a37b018f672fba4
 AUX 0.29.3-fix-kmod-build-on-6.2+.patch 1420 BLAKE2B 45f312bce9ce3dbaa0ddd300ccfd7dfcc3fb6d537cd0b716642d25b4c5a3747798ca23d237d67c92d32da500edb5e0458bfdff4a940d2f6fdb84144c5687028d SHA512 4b84a2559cb6a72d294b5cac6ec2d6f2de8ae90e298e27afcdff6bc046366afca6468ac923c4197623f14bbe0a4d0bd3757f34740a367e6b7c4e76472b102379
 AUX 0.29.3-fix-kmod-build-on-6.3+.patch 939 BLAKE2B c626a6c9e41510d9720a8d161f4b6fa2efc729437cffdeea97ab346b0dca9a18af82339e403b63c7ac297304893f686a20f5c612df417229b82701367530098d SHA512 c2b020de87c92724f93a0937e2ece2f1e88f8b0dbb5b1d85bffccd51fddc1fc2024fe0ae222f2f01adeb5dc34964b1e86f27f0bdfee347bf1bb927388c1b6c5c
 AUX 0.29.3-fix-kmod-build-on-6.4+.patch 1029 BLAKE2B 6025b3f598cb96c01085ef0ca807aa54894217c1929a1c1377c2f1399ff5bcbd56ce8c31c50d310f4f63df55587593e133ce00914c49edeb6a73d1d088d69083 SHA512 f2dfab8dd67d9694da592bcd10231b5132c459b71f6751d1baaa09e29a704f3185706618ab8d28b17d4c7a7e4b9c5e14fb4f53680bd502cfc98aa9693d2a5537
 AUX 0.29.3-fix-kmod-build-on-6.7+.patch 901 BLAKE2B c8ffe70d8b7872f7f56b69e6472357259cb435b39444a18fca60a42b22c85a158d482e5a629581e572d74cebdfb9f1521205bad810f2daea1ca4e3083f1bb775 SHA512 5d098bd1612e0d5f2c70f845a8f2832688e37420960eca450eb9bbfee229921d512beb614ee7fcfed36571b72ae3a124e925ff419165b4703dc3f119d42c0bb1
 AUX 0.29.3-fix-kmod-build-on-6.8+.patch 1152 BLAKE2B 8d07476c12727e3762ee7ada2c32b159d82ccf297b131aaf86e5c15cadfeceff99b9e78e51f9eb6ab5aa31b39715cd5a04d5a15daa0bcfaba28d495915dc7d14 SHA512 051d695a63be339f87e95075e6d027f45ba93f0674c872fc2886873033f46b00d13a1155079f7ea497d88f379d4cec39a0b14c764a84d1538aac8477ac6ecfc5
+DIST falcosecurity-libs-0.17.2.tar.gz 4424458 BLAKE2B cbe3a689d3d93a6896b94fd54b35665b11263c07690a36d40617651f97806b0177af657824f62259df95a984d598a34c17ff942c73e3abd774569607dc22380f SHA512 8bb449d91c12225c08d678ea9a8e97a5b5e8828788b56d5b83ec3b3c6ad5e25d4f56120dba523ac9c593d02ee155026e2d4d47587be6f73f373f06fe7ddc2a0c
 DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
+EBUILD scap-driver-0.17.2.ebuild 1202 BLAKE2B 13c03fcd44e643962f985ca02554b5645461fa8e1eb85625b575aba7719bc11e6913c4911ebcbdf142ca97b4f81a7e84fa6f7249e510c0b9da1edc40c3841b88 SHA512 d750817ee20a1ca1defb7a7dcc765600943b69d6e0fb5e5b4ca51c70a0f818ade7efa9e4dd7fb1530f7d9b4e41fd0baf0ff0009359531f4239bc6c3b68eeea47
 EBUILD scap-driver-0.29.3-r4.ebuild 1547 BLAKE2B e94241e736a205f8a6185c27b7e253c410ca4c59d7c0cccb007c22ad44db961fac8b3a29464f6f7c4da23b5da38c1c6b8accb12edf7284f92d7b09c51d4a099e SHA512 237bf49a30264c3d57e3a1c06a6b1ee398e55a13f0c86ce476f8cbe8f266c5ca68f3b688fd8f46960611de21bed18556c1edaa05fdc6fd6471fb92a91c6ea827
 EBUILD scap-driver-0.29.3-r5.ebuild 1599 BLAKE2B 90ba3830d1b3d34bde6e37661408cd9d88d820878bd29b8d6d4ebf3ed872e7d88986b098c6350eae94300b3eedfb3eb5e20ef49d50abc45a7e25e7d154485c93 SHA512 b0de25c15d77ff42710226345310980d883c6972a35a48bba2d2d9b85de22e310bc557b5646ac2f371240580ca44cf2909f7ac7572a82f106b505922f9b057da
 EBUILD scap-driver-0.29.3-r6.ebuild 1649 BLAKE2B 365fa68ea601ac209a8d9fa5927bddc9474f2f634e880920d597124c57fb8d06f80494d47b07c6cbc3998661e5d25f966e8205c9bbdc478f295884cdb1046c50 SHA512 5e4d8c64d938dd5131a0b394c81e2427e9a568f244dba4fa69b2e458cf3fdb8b44770f80649c84c4f608a39341739d5d67c316608a0a4dea18ae50938882e626
diff --git a/dev-debug/scap-driver/files/0.17.2-fix-kmod-build-on-6.10+.patch b/dev-debug/scap-driver/files/0.17.2-fix-kmod-build-on-6.10+.patch
new file mode 100644
index 000000000000..11b3f41e7519
--- /dev/null
+++ b/dev-debug/scap-driver/files/0.17.2-fix-kmod-build-on-6.10+.patch
@@ -0,0 +1,29 @@
+
+Patch taken from: https://github.com/falcosecurity/libs/pull/1884
+
+From b52aec86c96f26e14afcdece6a6ccb6ce2f0a7ec Mon Sep 17 00:00:00 2001
+From: Federico Di Pierro <nierro92@gmail.com>
+Date: Thu, 30 May 2024 11:36:32 +0200
+Subject: [PATCH] fix(driver): fix build of kmod on linux 6.10.
+
+Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
+---
+ driver/main.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/driver/main.c b/driver/main.c
+index 1bcd600675..af1470b8d7 100644
+--- a/driver/main.c
++++ b/driver/main.c
+@@ -1649,8 +1649,10 @@ static inline int drop_nostate_event(ppm_event_code event_type,
+ 		if (close_fd < 0 || close_fd >= fdt->max_fds ||
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0))
+ 		    !FD_ISSET(close_fd, fdt->open_fds)
+-#else
++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0))
+ 		    !fd_is_open(close_fd, fdt)
++#else
++		    !test_bit(close_fd, fdt->open_fds)
+ #endif
+ 			) {
+ 			drop = true;
diff --git a/dev-debug/scap-driver/scap-driver-0.17.2.ebuild b/dev-debug/scap-driver/scap-driver-0.17.2.ebuild
new file mode 100644
index 000000000000..ccc6d37ec84d
--- /dev/null
+++ b/dev-debug/scap-driver/scap-driver-0.17.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake linux-mod-r1
+
+DESCRIPTION="Kernel module for dev-debug/sysdig"
+HOMEPAGE="https://sysdig.com/"
+SRC_URI="https://github.com/falcosecurity/libs/archive/${PV}.tar.gz -> falcosecurity-libs-${PV}.tar.gz"
+S="${WORKDIR}/libs-${PV}"
+
+LICENSE="Apache-2.0 GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="!<dev-debug/sysdig-${PV}[modules]"
+
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+# We need to specify the driver version manually since we do not use a git tree.
+# This version can be found in the corresponding *sysdig* tree in cmake/modules/driver.cmake
+DRIVER_VERSION="7.2.0+driver"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.10+.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod, so just pretend to use bundled deps
+		# in order to make it through the cmake setup.
+		-DUSE_BUNDLED_DEPS=ON
+		-DCREATE_TEST_TARGETS=OFF
+		-DDRIVER_VERSION="${DRIVER_VERSION}"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	local modlist=( scap=:"${BUILD_DIR}"/driver/src )
+	local modargs=( KERNELDIR="${KV_OUT_DIR}" )
+
+	linux-mod-r1_src_compile
+}