gentoo auto-resync : 02:11:2024 - 03:04:23

12 files changed, 4 insertions, 429 deletions

diff --git a/dev-debug/scap-driver/Manifest b/dev-debug/scap-driver/Manifest
index 83cc6ff219d8..cc73dd117c90 100644
--- a/dev-debug/scap-driver/Manifest
+++ b/dev-debug/scap-driver/Manifest
@@ -1,16 +1,5 @@
-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-0.17.3.tar.gz 4425090 BLAKE2B 3d6300bba2303715581d9b35f63e453f85a3889fa93233d3b1ca69f6ba92b33e0a7d90bbd160b765487b44771a1d94f5a1fb380cf4e5130506a885471dddb7e7 SHA512 05707c404bdd45c2e944b903dbbc1e5e0e5991a3d4cbe9ea357efb35b5ad0c4ede7cdd7b056a7dde2543cc2c0b8d5d3b42606202128b7287a80a1da686de169e
-DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
-EBUILD scap-driver-0.17.2.ebuild 1202 BLAKE2B 13c03fcd44e643962f985ca02554b5645461fa8e1eb85625b575aba7719bc11e6913c4911ebcbdf142ca97b4f81a7e84fa6f7249e510c0b9da1edc40c3841b88 SHA512 d750817ee20a1ca1defb7a7dcc765600943b69d6e0fb5e5b4ca51c70a0f818ade7efa9e4dd7fb1530f7d9b4e41fd0baf0ff0009359531f4239bc6c3b68eeea47
+DIST falcosecurity-libs-0.18.1.tar.gz 4473396 BLAKE2B 9e875430032adfc79db086e92e6bb356a9c87a529da27a613f49b18e7e32ebeb28e1859bdba8b35c826e9a0d9c77454d4b804e35d5bf13c2f077fed915355045 SHA512 eb9e4d770888d70cbcc9468a4044f50bbb16729f545660c9f1aa91da862410ee7cfa2702dba7eef161bf3a3e0b9090b64dd8e1694fdb83c55a6d2418d281042a
 EBUILD scap-driver-0.17.3.ebuild 1136 BLAKE2B c074f354dc68350588f707991f3fe171ada78d0f8241a67baf49f0957cfc5d4c02f6c75a9aec3acc893933c4ebd639a88329e88cb15b109d2e155a3b66de7f7c SHA512 ffe00321af9b2a05855460b2ff9ed0b45cad0e2474e30a0df7c37efa0258c7513ab3d833ee397d1878e07efb5c3abe6be258c7743ed45778fed7983ee5b2c241
-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
+EBUILD scap-driver-0.18.1.ebuild 1124 BLAKE2B 131a5f292c0dcd068a21d68d0339f7847002f81f8ab40f213d86a4b3d69bbfdfefc06087df2e78481b0d2d6aef53e9dea5f11687c81da107917e0eb3ac4ba1fd SHA512 13f60f87c7e1d22b2895c4d3d376c07f8655467491d415e8198e01760efd275c33081ab85f2a2f00762619f22ed01dc834a8617486c5ab64ad02da068ca5f186
 MISC metadata.xml 494 BLAKE2B d0bc754d3af2488b9dc7672fc63e962f4c885d88a819e4332bd1c25f84c967e2e1cd8489122490a864cbfd930225b3dc28c8bfad4426750c030dce6ef5a08b4e SHA512 b77b7c103cfb606333814af210a0fae1f7956ddd9d3c3a044b0bebf42553f5ffe99d04549fb9c5e40fce33e9d23761830b4944b2cd83bd8ca2193f9b7da60fc0
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
deleted file mode 100644
index 11b3f41e7519..000000000000
--- a/dev-debug/scap-driver/files/0.17.2-fix-kmod-build-on-6.10+.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-
-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/files/0.29.3-fix-kmod-build-on-5.18+.patch b/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-5.18+.patch
deleted file mode 100644
index 974b561df47f..000000000000
--- a/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-5.18+.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-
-Bug: https://bugs.gentoo.org/866113
-Source: https://github.com/falcosecurity/libs/pull/411/commits/36e945af4feb31c8b875f7d4624592b0c1ff929d
-
-From 36e945af4feb31c8b875f7d4624592b0c1ff929d Mon Sep 17 00:00:00 2001
-From: Federico Di Pierro <nierro92@gmail.com>
-Date: Mon, 20 Jun 2022 14:26:39 +0200
-Subject: [PATCH] fix(driver): fixed kmod build on linux kernels >= 5.18.
-
-Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
----
- driver/main.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/driver/main.c b/driver/main.c
-index 6b5ae461a..e606cc2f8 100644
---- a/driver/main.c
-+++ b/driver/main.c
-@@ -70,8 +70,9 @@ MODULE_AUTHOR("the Falco authors");
-     #define TRACEPOINT_PROBE(probe, args...) static void probe(void *__data, args)
- #endif
- 
--#ifndef pgprot_encrypted
--#define pgprot_encrypted(x) (x)
-+// Allow build even on arch where PAGE_ENC is not implemented
-+#ifndef _PAGE_ENC
-+#define _PAGE_ENC 0
- #endif
- 
- struct ppm_device {
-@@ -1217,8 +1218,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma)
- 
- 			pfn = vmalloc_to_pfn(vmalloc_area_ptr);
- 
-+			pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC;
- 			ret = remap_pfn_range(vma, useraddr, pfn,
--					      PAGE_SIZE, pgprot_encrypted(PAGE_SHARED));
-+					      PAGE_SIZE, vma->vm_page_prot);
- 			if (ret < 0) {
- 				pr_err("remap_pfn_range failed (1)\n");
- 				goto cleanup_mmap;
-@@ -1255,8 +1257,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma)
- 			while (mlength > 0) {
- 				pfn = vmalloc_to_pfn(vmalloc_area_ptr);
- 
-+				pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC;
- 				ret = remap_pfn_range(vma, useraddr, pfn,
--						      PAGE_SIZE, pgprot_encrypted(PAGE_SHARED));
-+						      PAGE_SIZE, vma->vm_page_prot);
- 				if (ret < 0) {
- 					pr_err("remap_pfn_range failed (1)\n");
- 					goto cleanup_mmap;
-@@ -1277,8 +1280,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma)
- 			while (mlength > 0) {
- 				pfn = vmalloc_to_pfn(vmalloc_area_ptr);
- 
-+				pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC;
- 				ret = remap_pfn_range(vma, useraddr, pfn,
--						      PAGE_SIZE, pgprot_encrypted(PAGE_SHARED));
-+						      PAGE_SIZE, vma->vm_page_prot);
- 				if (ret < 0) {
- 					pr_err("remap_pfn_range failed (1)\n");
- 					goto cleanup_mmap;
diff --git a/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.2+.patch b/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.2+.patch
deleted file mode 100644
index 39476feef051..000000000000
--- a/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.2+.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-Bug: https://bugs.gentoo.org/895868
-Source: https://github.com/falcosecurity/libs/commit/b8ec3e8637c850066d01543616fe413e8deb9e1f
-
-From b8ec3e8637c850066d01543616fe413e8deb9e1f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Tue, 21 Feb 2023 22:08:23 +0100
-Subject: [PATCH] fix(driver): fix build on linux-6.2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Attributes in "struct device*" are now const, so add a matching prototype
-for ppm_devnode().
-
-Fixes #918
-
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
----
- driver/main.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/driver/main.c b/driver/main.c
-index 197933b9ce..6dc3374fc1 100644
---- a/driver/main.c
-+++ b/driver/main.c
-@@ -2662,11 +2662,15 @@ static int get_tracepoint_handles(void)
- #endif
- 
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 20)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0)
-+static char *ppm_devnode(const struct device *dev, umode_t *mode)
-+#else
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
- static char *ppm_devnode(struct device *dev, umode_t *mode)
- #else
- static char *ppm_devnode(struct device *dev, mode_t *mode)
--#endif
-+#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0) */
-+#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(6, 2, 0) */
- {
- 	if (mode) {
- 		*mode = 0400;
diff --git a/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.3+.patch b/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.3+.patch
deleted file mode 100644
index 6926df857179..000000000000
--- a/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.3+.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Bug: https://github.com/falcosecurity/libs/issues/1063
-Subset of patch taken from: https://github.com/falcosecurity/libs/pull/1071
-
-diff --git a/driver/ppm_fillers.c b/driver/ppm_fillers.c
-index 0441923c6d..cfa967f134 100644
---- a/driver/ppm_fillers.c
-+++ b/driver/ppm_fillers.c
-@@ -1329,7 +1329,10 @@ int f_proc_startupdate(struct event_filler_arguments *args)
- 
- 		if (exe_file != NULL) {
- 			if (file_inode(exe_file) != NULL) {
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
-+				exe_writable |= (file_permission(exe_file, MAY_WRITE) == 0);
-+				exe_writable |= inode_owner_or_capable(file_mnt_idmap(exe_file), file_inode(exe_file));
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0)
- 				exe_writable |= (inode_permission(current_user_ns(), file_inode(exe_file), MAY_WRITE) == 0);
- 				exe_writable |= inode_owner_or_capable(current_user_ns(), file_inode(exe_file));
- #else
diff --git a/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.4+.patch b/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.4+.patch
deleted file mode 100644
index ac0a4aeca285..000000000000
--- a/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.4+.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-
-From: https://github.com/falcosecurity/libs/pull/1110
-Bug: https://github.com/falcosecurity/libs/issues/1109
-
-From 394c9d84e64ad9828cdce6cdad5a76c352e252d2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Fri, 19 May 2023 03:54:40 +0200
-Subject: [PATCH] fix(driver): fixed 6.4 kernel build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
----
- driver/main.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/driver/main.c b/driver/main.c
-index 380f85c27c..668e45429a 100644
---- a/driver/main.c
-+++ b/driver/main.c
-@@ -2912,7 +2912,11 @@ int scap_init(void)
- 		goto init_module_err;
- 	}
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
- 	g_ppm_class = class_create(THIS_MODULE, DRIVER_DEVICE_NAME);
-+#else
-+	g_ppm_class = class_create(DRIVER_DEVICE_NAME);
-+#endif
- 	if (IS_ERR(g_ppm_class)) {
- 		pr_err("can't allocate device class\n");
- 		ret = -EFAULT;
diff --git a/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.7+.patch b/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.7+.patch
deleted file mode 100644
index a6db9e2d751c..000000000000
--- a/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.7+.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Bug: https://bugs.gentoo.org/921163
-Subset of patch taken from: https://github.com/falcosecurity/libs/commit/bf0afa0cacb775582fde134500fe66af38f1eb59
-
---- a/driver/ppm_fillers.c	2024-01-01 15:05:13.000000000 +0100
-+++ b/driver/ppm_fillers.c	2024-01-01 15:15:59.893048651 +0100
-@@ -430,7 +430,13 @@ struct file *ppm_get_mm_exe_file(struct
- {
- 	struct file *exe_file;
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)
-+	// Since linux 6.7.0, `get_file_rcu` is no more a define and takes a double pointer parameter.
-+	// See https://github.com/torvalds/linux/commit/0ede61d8589cc2d93aa78230d74ac58b5b8d0244.
-+	rcu_read_lock();
-+	exe_file = get_file_rcu(&mm->exe_file);
-+	rcu_read_unlock();
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
- 	rcu_read_lock();
- 	exe_file = rcu_dereference(mm->exe_file);
- 	if (exe_file && !get_file_rcu(exe_file))
diff --git a/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.8+.patch b/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.8+.patch
deleted file mode 100644
index b33ba164b97a..000000000000
--- a/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.8+.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-
-Bug: https://bugs.gentoo.org/926768
-Minimal subset of changes from: https://github.com/falcosecurity/libs/pull/1632
-
---- a/driver/ppm_events.c	2024-03-11 15:19:23.000000000 +0100
-+++ b/driver/ppm_events.c	2024-03-11 15:22:48.230598879 +0100
-@@ -624,12 +624,16 @@ int val_to_ring(struct event_filler_argu
- 				if (unlikely(len < 0))
- 					return PPM_FAILURE_INVALID_USER_MEMORY;
- 			} else {
--				len = (int)strlcpy(args->buffer + args->arg_data_offset,
-+				len = (int)strscpy(args->buffer + args->arg_data_offset,
- 								(const char *)(syscall_arg_t)val,
- 								max_arg_size);
- 
--				if (++len > (int)max_arg_size)
-+				if (len == -E2BIG) {
- 					len = max_arg_size;
-+				} else {
-+					len++;
-+				}
-+					
- 			}
- 
- 			/*
-@@ -640,12 +644,15 @@ int val_to_ring(struct event_filler_argu
- 			/*
- 			 * Handle NULL pointers
- 			 */
--			len = (int)strlcpy(args->buffer + args->arg_data_offset,
-+			len = (int)strscpy(args->buffer + args->arg_data_offset,
- 				"(NULL)",
- 				max_arg_size);
- 
--			if (++len > (int)max_arg_size)
--				len = max_arg_size;
-+			if (len == -E2BIG) {
-+				len = max_arg_size;
-+			} else {
-+				len++;
-+			}
- 		}
- 
- 		break;
diff --git a/dev-debug/scap-driver/scap-driver-0.17.2.ebuild b/dev-debug/scap-driver/scap-driver-0.18.1.ebuild
index ccc6d37ec84d..a867a67ec476 100644
--- a/dev-debug/scap-driver/scap-driver-0.17.2.ebuild
+++ b/dev-debug/scap-driver/scap-driver-0.18.1.ebuild
@@ -19,12 +19,8 @@ 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
-)
+# This version can be found as git tag on the same commit as the libs version.
+DRIVER_VERSION="7.3.0+driver"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-debug/scap-driver/scap-driver-0.29.3-r4.ebuild b/dev-debug/scap-driver/scap-driver-0.29.3-r4.ebuild
deleted file mode 100644
index 186e01a6e6b2..000000000000
--- a/dev-debug/scap-driver/scap-driver-0.29.3-r4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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/"
-
-# The driver is part of falcosecurity/libs, but for versioning reasons we cannot (yet)
-# use semver-released packages; instead we pull in a commit that is used and known
-# to work with sysdig, see sysdig/cmake/modules/falcosecurity-libs.cmake for details.
-# For now the commit here and the one referenced in sysdig should be in sync.
-LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a"
-SRC_URI="https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz"
-S="${WORKDIR}/libs-${LIBS_COMMIT}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="!<dev-debug/sysdig-${PV}[modules]"
-
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.2+.patch
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.3+.patch
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.4+.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=${LIBS_COMMIT}
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	local modlist=( scap=:"${BUILD_DIR}"/driver/src )
-	local modargs=( KERNELDIR="${KV_OUT_DIR}" )
-
-	linux-mod-r1_src_compile
-}
diff --git a/dev-debug/scap-driver/scap-driver-0.29.3-r5.ebuild b/dev-debug/scap-driver/scap-driver-0.29.3-r5.ebuild
deleted file mode 100644
index 329ea0109b6f..000000000000
--- a/dev-debug/scap-driver/scap-driver-0.29.3-r5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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/"
-
-# The driver is part of falcosecurity/libs, but for versioning reasons we cannot (yet)
-# use semver-released packages; instead we pull in a commit that is used and known
-# to work with sysdig, see sysdig/cmake/modules/falcosecurity-libs.cmake for details.
-# For now the commit here and the one referenced in sysdig should be in sync.
-LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a"
-SRC_URI="https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz"
-S="${WORKDIR}/libs-${LIBS_COMMIT}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="!<dev-debug/sysdig-${PV}[modules]"
-
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.2+.patch
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.3+.patch
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.4+.patch
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.7+.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=${LIBS_COMMIT}
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	local modlist=( scap=:"${BUILD_DIR}"/driver/src )
-	local modargs=( KERNELDIR="${KV_OUT_DIR}" )
-
-	linux-mod-r1_src_compile
-}
diff --git a/dev-debug/scap-driver/scap-driver-0.29.3-r6.ebuild b/dev-debug/scap-driver/scap-driver-0.29.3-r6.ebuild
deleted file mode 100644
index 6874973ae601..000000000000
--- a/dev-debug/scap-driver/scap-driver-0.29.3-r6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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/"
-
-# The driver is part of falcosecurity/libs, but for versioning reasons we cannot (yet)
-# use semver-released packages; instead we pull in a commit that is used and known
-# to work with sysdig, see sysdig/cmake/modules/falcosecurity-libs.cmake for details.
-# For now the commit here and the one referenced in sysdig should be in sync.
-LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a"
-SRC_URI="https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz"
-S="${WORKDIR}/libs-${LIBS_COMMIT}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="!<dev-debug/sysdig-${PV}[modules]"
-
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.2+.patch
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.3+.patch
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.4+.patch
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.7+.patch
-	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.8+.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=${LIBS_COMMIT}
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	local modlist=( scap=:"${BUILD_DIR}"/driver/src )
-	local modargs=( KERNELDIR="${KV_OUT_DIR}" )
-
-	linux-mod-r1_src_compile
-}