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

22 files changed, 73 insertions, 715 deletions

diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index b95be780fcc3..09b6ad39137e 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
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
-}
diff --git a/dev-debug/sysdig/Manifest b/dev-debug/sysdig/Manifest
index bace326b17f8..75ab9442820e 100644
--- a/dev-debug/sysdig/Manifest
+++ b/dev-debug/sysdig/Manifest
@@ -1,14 +1,9 @@
-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-0.17.3.tar.gz 4425090 BLAKE2B 3d6300bba2303715581d9b35f63e453f85a3889fa93233d3b1ca69f6ba92b33e0a7d90bbd160b765487b44771a1d94f5a1fb380cf4e5130506a885471dddb7e7 SHA512 05707c404bdd45c2e944b903dbbc1e5e0e5991a3d4cbe9ea357efb35b5ad0c4ede7cdd7b056a7dde2543cc2c0b8d5d3b42606202128b7287a80a1da686de169e
-DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
-DIST sysdig-0.29.3.tar.gz 306984 BLAKE2B 51e9a0a085fa91d65963fd33e00b139d97d22b551de8ca85e48b4af73991897378970dfde54754a970e79300f06a54bad1d9c8fdfdb44f24150d0b21077e423f SHA512 1dbe1195f245921c671ed2343325aee79fd0cde34681b9cab445135662d3ed7c84884e46b2270c0e868b5de1a3f2800b84e8bf9fcf0dfe581dd17e2e633f46d8
+DIST falcosecurity-libs-0.18.1.tar.gz 4473396 BLAKE2B 9e875430032adfc79db086e92e6bb356a9c87a529da27a613f49b18e7e32ebeb28e1859bdba8b35c826e9a0d9c77454d4b804e35d5bf13c2f077fed915355045 SHA512 eb9e4d770888d70cbcc9468a4044f50bbb16729f545660c9f1aa91da862410ee7cfa2702dba7eef161bf3a3e0b9090b64dd8e1694fdb83c55a6d2418d281042a
 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
+DIST sysdig-0.39.0.tar.gz 85742724 BLAKE2B 7e6414b3b87bd4cc43ede8c28f99ebd385a63b0efd711d6648b832d64d518bbfe7ddb2bff469232933413a2807d4df66775c8d57072d9e80aeffb5b2dd5690fd SHA512 d43c816d4c29cc283d3247ac0ac3591b8adea7a08194a80b4e530f0c45730a824d16eda7b07bb70e4658cbae0f851fbb67ec880eedf33477bf5bfc911d8a7936
 EBUILD sysdig-0.38.1-r1.ebuild 3404 BLAKE2B 8d0a578a92aee5af76f46d4cf7863f6bfbad952863379f7fb000fca7352d48f69da1ad0628533148e1f1aa3edee47f8b9544ab024391d93eb47f48e4d9deb5e4 SHA512 fd746ff2ec03f46d035c0229cbb33ba33de8b8e53855a3aa499ac9e1e500b49a778a96076903e12602725dc3893e81009da61468ad8bc65aaea94d96e2c4706e
-EBUILD sysdig-0.38.1.ebuild 3380 BLAKE2B 7b5d47ce41ba2511b6a3f4096c7e2f3730ce6fea2b38c87b405e8aa07039dfc66fa1a0293fb94cc0b6e456a2a45b97fc916072c9ebe22a6f658c6f7dbb1627bd SHA512 daa3b175cc1dc2a298512f3b1a5e7158683e2d69e05a33fe3dd1b44a46412594ab50b2606d7aaaa8ae8e7c33692eacba3a3f9354bccaad967e0c1d739d9542f3
-MISC metadata.xml 671 BLAKE2B 553dbbe2ea2a56f5a88bb0276b3f97c5d4d8d798291eaef42d5aadd842cf5cbbb770515729c9779890f9227f7cc96fc8e35457009f066cfb43993b02c7406d7a SHA512 4d0b92b271bd4ceb86db363a29cd465124ab71ec6941848cafec4ebba0232a52bf62a4128d8cbaf5a7a6c9350aef29e4a797b6a659d5d5896c077b0b5df9f73d
+EBUILD sysdig-0.39.0.ebuild 4034 BLAKE2B 1e8c9a51c2f90578f8adf2679dd3310a4b293b6fd4e4a9260b5138fb31571a8fb5f2273e3b6531d8e15650137246245f4fc12a7bd92d295231af42ff40898e0a SHA512 9546e308e90dc7db6f874eac2c0e26b64c64644e8432f8b3083f377be24070478bd409be7de74798dc7ab110c9193a14a45d417e0a400ad89034a1a42ff0504b
+MISC metadata.xml 786 BLAKE2B a450cef4fda00c66e71a847a69dce989a7a8b743d6e277e8d3c3035067d9d245c3612d7f7631dd41ded3963dc668d3d7f61c6b2cace5b82664887e7c035f16cb SHA512 926a07f842676753a6d308ec6010c02301e295fccf1e34500e98d6b91c9eb34cc5b02c64704996fdf0d33466d526961036b777dcac18efe83b27c60a3d75849c
diff --git a/dev-debug/sysdig/files/0.29.3-libs-gcc13.patch b/dev-debug/sysdig/files/0.29.3-libs-gcc13.patch
deleted file mode 100644
index 4fb4d52c1db4..000000000000
--- a/dev-debug/sysdig/files/0.29.3-libs-gcc13.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-
-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 libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/scap_open_exception.h libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/scap_open_exception.h
-index 6877456..b6fa6be 100644
---- libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/scap_open_exception.h
-+++ libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/scap_open_exception.h
-@@ -17,6 +17,7 @@ limitations under the License.
- #pragma once
- 
- #include "sinsp_exception.h"
-+#include <cstdint>
- 
- /*!
-   \brief Instances of this exception are thrown when calls to scap_open()
diff --git a/dev-debug/sysdig/files/0.29.3-libs-no-libanl.patch b/dev-debug/sysdig/files/0.29.3-libs-no-libanl.patch
deleted file mode 100644
index 16563aee8ca0..000000000000
--- a/dev-debug/sysdig/files/0.29.3-libs-no-libanl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-Remove libanl from list of linked libraries as it is not needed at all
-and does not exist on musl.
-
---- libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/CMakeLists.txt~	2022-03-25 09:50:03.000000000 +0000
-+++ libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/CMakeLists.txt	2024-04-13 13:40:53.222240196 +0000
-@@ -230,8 +230,7 @@ if(NOT WIN32)
- 
- 			if(NOT MUSL_OPTIMIZED_BUILD)
- 				list(APPEND SINSP_LIBRARIES
--				rt
--				anl)
-+				rt)
- 			endif()
- 
- 		else()
diff --git a/dev-debug/sysdig/metadata.xml b/dev-debug/sysdig/metadata.xml
index c16f8ef41665..05dad048fe79 100644
--- a/dev-debug/sysdig/metadata.xml
+++ b/dev-debug/sysdig/metadata.xml
@@ -10,6 +10,8 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="bpf">Enable the BPF probe as alternative event source
+			to <pkg>dev-debug/scap-driver</pkg>.</flag>
 		<flag name="modules">Build kernel modules needed for tracing local
 			events. Disable this only if you intend to use sysdig purely
 			to work with dumpfiles.</flag>
diff --git a/dev-debug/sysdig/sysdig-0.29.3-r1.ebuild b/dev-debug/sysdig/sysdig-0.29.3-r1.ebuild
deleted file mode 100644
index 619c30f3a3a3..000000000000
--- a/dev-debug/sysdig/sysdig-0.29.3-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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/"
-
-# 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-debug/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
-}
diff --git a/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild b/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild
deleted file mode 100644
index 64902719ed6b..000000000000
--- a/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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/"
-
-# 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:=
-	virtual/libelf:="
-
-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-debug/scap-driver-${PV}* )"
-
-src_prepare() {
-	# manually apply patches to falcosecurity-libs dependency
-	pushd "${WORKDIR}"
-		# gcc13 needs explicit <cstdint>
-		eapply -p0 "${FILESDIR}/${PV}-libs-gcc13.patch" || die
-
-		# musl has no libanl (#929227)
-		if [ ${ELIBC} == "musl" ] ; then
-			eapply -p0 "${FILESDIR}/${PV}-libs-no-libanl.patch" || die
-		fi
-	popd
-
-	# force C++14 standard for libs & main
-	sed -i -e 's:-std=c++0x:-std=c++14:' "${WORKDIR}"/libs-${LIBS_COMMIT}/cmake/modules/CompilerFlags.cmake || die
-	sed -i -e 's:-std=c++0x:-std=c++14:' -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
-}
diff --git a/dev-debug/sysdig/sysdig-0.38.1.ebuild b/dev-debug/sysdig/sysdig-0.39.0.ebuild
index be7cf88d7db3..2a9539574c2c 100644
--- a/dev-debug/sysdig/sysdig-0.38.1.ebuild
+++ b/dev-debug/sysdig/sysdig-0.39.0.ebuild
@@ -3,37 +3,43 @@
 
 EAPI=8
 
+LLVM_COMPAT=( {15..19} )
+LLVM_OPTIONAL=1
+
 LUA_COMPAT=( luajit )
 
-inherit bash-completion-r1 cmake flag-o-matic lua-single
+inherit bash-completion-r1 cmake flag-o-matic linux-info llvm-r1 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"
+LIBS_VERSION="0.18.1"
+LIBS="falcosecurity-libs-${LIBS_VERSION}"
+
 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"
+	https://github.com/falcosecurity/libs/archive/${LIBS_VERSION}.tar.gz -> ${LIBS}.tar.gz"
 
-# The driver version as found in cmake/modules/driver.cmake
-DRIVER_VERSION="7.2.0+driver"
+# The driver version as found in cmake/modules/driver.cmake or alternatively
+# as git tag on the $LIBS_VERSION of falcosecurity-libs.
+DRIVER_VERSION="7.3.0+driver"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+modules"
+IUSE="bpf +modules"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="${LUA_DEPS}
+	dev-cpp/abseil-cpp:=
 	dev-cpp/tbb:=
 	dev-cpp/yaml-cpp:=
 	dev-libs/jsoncpp:=
 	dev-libs/libb64:=
-	dev-libs/openssl:=
+	bpf? ( >=dev-libs/libbpf-1.1:= )
 	dev-libs/protobuf:=
 	dev-libs/re2:=
 	dev-libs/uthash
-	net-dns/c-ares:=
 	net-libs/grpc:=
 	net-misc/curl
 	sys-libs/ncurses:=
@@ -43,22 +49,41 @@ RDEPEND="${LUA_DEPS}
 DEPEND="${RDEPEND}
 	dev-cpp/nlohmann_json
 	dev-cpp/valijson
+	bpf? ( $(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}=
+			sys-devel/llvm:${LLVM_SLOT}=[llvm_targets_BPF(+)]
+		')
+	)
 	virtual/os-headers"
 
+BDEPEND="bpf? ( dev-util/bpftool )"
+
 # pin the driver to the falcosecurity-libs version
 PDEPEND="modules? ( =dev-debug/scap-driver-${LIBS_VERSION}* )"
 
-PATCHES=( "${FILESDIR}/${PV}-scap-loader.patch" )
+PATCHES=(
+	"${FILESDIR}/0.38.1-scap-loader.patch"
+)
+
+pkg_pretend() {
+	if use bpf; then
+		local CONFIG_CHECK="
+			~BPF
+			~BPF_EVENTS
+			~BPF_JIT
+			~BPF_SYSCALL
+			~FTRACE_SYSCALLS
+			~HAVE_EBPF_JIT
+		"
+		check_extra_config
+	fi
+}
 
-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
+pkg_setup() {
+    use bpf && llvm-r1_pkg_setup
+}
 
+src_prepare() {
 	# do not build with debugging info
 	sed -i -e 's/-ggdb//g' CMakeLists.txt "${WORKDIR}"/libs-${LIBS_VERSION}/cmake/modules/CompilerFlags.cmake || die
 
@@ -73,10 +98,6 @@ src_configure() {
 	# 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
@@ -87,8 +108,8 @@ src_configure() {
 		# do not build internal libs as shared
 		-DBUILD_SHARED_LIBS=OFF
 
-		# do not build eBPF driver for now
-		-DBUILD_SYSDIG_MODERN_BPF=OFF
+		# build BPF probe depending on USE
+		-DBUILD_SYSDIG_MODERN_BPF:BOOL=$(usex bpf)
 
 		# set driver version to prevent downloading (don't ask..)
 		-DDRIVER_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_VERSION}/driver
@@ -126,7 +147,23 @@ src_install() {
 	# remove driver headers
 	rm -r "${ED}"/usr/src || die
 
+	# remove libscap/libsinsp headers & libs (see #938187)
+	rm -r "${ED}"/usr/include/sysdig || die
+	rm -r "${ED}"/usr/$(get_libdir) || die
+
 	# move bashcomp to the proper location
 	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
 	rm -r "${ED}"/usr/etc || die
 }
+
+pkg_postinst() {
+	if use bpf; then
+		elog
+		elog "You have enabled the 'modern BPF' probe."
+		elog "This eBPF-based event source is an alternative to the traditional"
+		elog "scap kernel module."
+		elog
+		elog "To use it, start sysdig/csysdig with '--modern-bpf'."
+		elog
+	fi
+}
diff --git a/dev-debug/valgrind/Manifest b/dev-debug/valgrind/Manifest
index 4d50d1b0f167..54e3ae4c4d14 100644
--- a/dev-debug/valgrind/Manifest
+++ b/dev-debug/valgrind/Manifest
@@ -14,12 +14,12 @@ DIST valgrind-3.23.0-patches-2.tar.xz 15024 BLAKE2B ca7085a6dd38cda9df9437697109
 DIST valgrind-3.23.0-patches-3.tar.xz 23084 BLAKE2B 4794143bd80f984d5dc07f792837faa139a4bf8cc6220c7c1e79b85f2c0e6ee579eb5e4220decc264a4e21424683554794d015e10aee20b9e34c16724d64eb58 SHA512 0144142d62552158d90a118591a50412d077d3e79fce333fb6da40aff8acd6c924d15c85f69293d1a189b2ecde66c184cf82c8ba3a134f95c439d50e147e331c
 DIST valgrind-3.23.0.tar.bz2 16550038 BLAKE2B 9312761b0531006725f13270984b26c48f71ebe66e355b04410d7c01773c9b78ec21db3259cab398e58b3b68f93f5f074db06efe1f359bd7cf423515576191a4 SHA512 27d038faaaf6154cace2df18c3573291393548ba0738dbb6aba58eab6324c5beaa95fc5f3c0271663ca071baf829b15d806f7e81074f7cf087bef20ea0ed3117
 DIST valgrind-3.23.0.tar.bz2.asc 488 BLAKE2B b06781577e3e84e506e56bd4acc7341aecacb6b5898d8f0daab627d24bc70c9c60edad11dc7e3723ac77aa9c7978f1e13af7734e7a37763c720e77ea4ff103a4 SHA512 e10b38c72ed1fb8d79a3fa84ab70c475ec7a15927a578ee6715aa74f9600453f0fb72551053b6c31583321c37dab100bafbf6e689c02a3bc06021f6092b4bc80
-DIST valgrind-3.24.0.RC1.tar.bz2 16676048 BLAKE2B 18455d3eaa05acb6fed0dcbb43f0d196171298533797149c0d440d06fb97f091320595f9d4a71e0ebefcfe04ec59ddd8cc653b034bc35af76ae5ad0a72227ba8 SHA512 d92bcc4acb3c283780cd8553be29f282593e7681b3de6ae374e47bc9c0c98e5603725388972344f1c5a25e66ca278b4baff0e53d5767eccb66cd419ab5be0bee
-DIST valgrind-3.24.0.RC1.tar.bz2.asc 488 BLAKE2B 31f85b98a384ac830fcb7584b108b96979dd0542e3c39063b9849b5dc88ab712eb39b17051662d816cc91f26c41804bc292d14bbb6be27f19a59ff5116e1932d SHA512 02e858642e2fd253d9e323c11dbdecaa55be2213a6a3e5dab8a361ede32e54905114804dbb576ac241f4d1b6bd56d58147b8d1879ec187e201182ae5b8a3d3de
+DIST valgrind-3.24.0.tar.bz2 16632387 BLAKE2B e11ad08f0062bd39788cd71d7ce058dec7a7207fbbe25f0dbfc7fb5735667809681cec2c843659553fbd49bcc6c71bdb93d87ffda3589247e4ee87c98fe51332 SHA512 6c131ff93d1f432d8362a47285cc377cba224ebca4f18e922c6156f7736d43020ece14d8fd16913498ab00fd18c85e2042a7d5351c3901e80413c584ebb406f3
+DIST valgrind-3.24.0.tar.bz2.asc 488 BLAKE2B f6307d10ee3ca26d837bf00471d179655ddbb0137920e175767a9d875aae355cea6727112deb788300a5196d94500bf9b341f8c70d46a1f83c40ae579ad45431 SHA512 37e9188756940960dcfe771d10275de7759ae652c94e710618948a8b366f66f3453f77b7751df0010b58304b203d7b3b56ac7a671d142d620916689ce5c84ae0
 EBUILD valgrind-3.21.0-r2.ebuild 4443 BLAKE2B 2c54610d70864adfa726ee6f9c02e5a79e00625b57547e7f80f2c334f9eae3465834b70068af2413bb9ebd5e1723024f62a1e67cccee7613eb0179cc1051b88f SHA512 c259e9a5871a8d0f72c3c385293df8561d755695837faa0f15ea11f89f088ec214525fcf450f908666e1d71e0e584dd7069abf905e0b001df12d37cb30f25fad
 EBUILD valgrind-3.22.0-r2.ebuild 5362 BLAKE2B 5e7d14f2bb4a72e75d3b117d50c7410c37ef5336b1f2955a211258b5f88fb3b1868e8387e1e1ac524f9ac73c044668a94f17f93e8723a6783629de7f153663b7 SHA512 3614b51413fceecafe42a58c1ae79b984f999c19d4140b15ac88830e46917a70c85e9fc8e4c7beb5e47f1923ce8e0197df6f0bbac440ae46fe96778c28ce0150
 EBUILD valgrind-3.23.0_p2.ebuild 5904 BLAKE2B 2f76b9cc027abd62174c67b0d31e8dee04f60404f3c6c5cdb122e7de65ccc4e99dd27a9d029d6312ea9232adc66dafe9cf9500dda21c185821789cc703533285 SHA512 3038a00d1bbb52a982e7e333b55f787b7860fa4350d4f1e9172c04c38674424cbdfa0c5a4a1be54e737b768377f37f0de3b7ffdb74491f175e6105680ab5d4f9
 EBUILD valgrind-3.23.0_p3.ebuild 5907 BLAKE2B d5be2a89cc503ee153a372639b890c43575071c2eb9b65d5cd4dd2f05044205a96b59d0bb1048d4676004da35675fe914401ddedd43a2a1fd98365cdf8a6b04a SHA512 4513973e0e255d70492ff20ac25b19598964bcddddfea76e73434e1894303c3b6d1e0441f76bfb57befa6dd02b7c54c49635fb4be80a44a4d82407c382b3f234
-EBUILD valgrind-3.24.0_rc1.ebuild 5913 BLAKE2B c04dfa9e55e0d78f7084137b87e68bd40dd4e28e39dcedbe8a11fbc6c4f129e6936de58a00b1a6be40db517f7e243880e13f9eafa6618a7f93cfc44ef0c88e98 SHA512 a2f8ee9c79bc0755b652499e9e35cc70286d232d2b01ac99d05088010c16906498d41990a988cbe45195146e0358026e6a1a17a5430ec48d1317d4a46a84e291
+EBUILD valgrind-3.24.0.ebuild 5913 BLAKE2B c04dfa9e55e0d78f7084137b87e68bd40dd4e28e39dcedbe8a11fbc6c4f129e6936de58a00b1a6be40db517f7e243880e13f9eafa6618a7f93cfc44ef0c88e98 SHA512 a2f8ee9c79bc0755b652499e9e35cc70286d232d2b01ac99d05088010c16906498d41990a988cbe45195146e0358026e6a1a17a5430ec48d1317d4a46a84e291
 EBUILD valgrind-9999.ebuild 5913 BLAKE2B c04dfa9e55e0d78f7084137b87e68bd40dd4e28e39dcedbe8a11fbc6c4f129e6936de58a00b1a6be40db517f7e243880e13f9eafa6618a7f93cfc44ef0c88e98 SHA512 a2f8ee9c79bc0755b652499e9e35cc70286d232d2b01ac99d05088010c16906498d41990a988cbe45195146e0358026e6a1a17a5430ec48d1317d4a46a84e291
 MISC metadata.xml 1123 BLAKE2B 17b5501b05acd9384ab57a15018bc0d1ede50d7b5b9a5c38fcce816f68e8946010bc86233a197df89ad208957f90ab643942b7e1a3ceaa6e8d456320828b84e8 SHA512 a8c32063f3afd28c4a2d5c5c0f437c08772e822aaed4feb71f79e0f5a6cf81530d056bd8ae2ef73ac70792bd78fc095c069ef0d4304ff0a1c365f289d1191fe1
diff --git a/dev-debug/valgrind/valgrind-3.24.0_rc1.ebuild b/dev-debug/valgrind/valgrind-3.24.0.ebuild
index bd5cb983fad2..bd5cb983fad2 100644
--- a/dev-debug/valgrind/valgrind-3.24.0_rc1.ebuild
+++ b/dev-debug/valgrind/valgrind-3.24.0.ebuild