From c6e62298405d39e635c0d8dd6e026c8cb667a478 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 12 Mar 2024 06:46:08 +0000 Subject: gentoo auto-resync : 12:03:2024 - 06:46:08 --- dev-debug/Manifest.gz | Bin 4008 -> 4009 bytes dev-debug/scap-driver/Manifest | 2 + .../files/0.29.3-fix-kmod-build-on-6.8+.patch | 44 +++++++++++++++++ dev-debug/scap-driver/scap-driver-0.29.3-r6.ebuild | 53 +++++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.8+.patch create mode 100644 dev-debug/scap-driver/scap-driver-0.29.3-r6.ebuild (limited to 'dev-debug') diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz index b16af32e1702..2d2c5f30c172 100644 Binary files a/dev-debug/Manifest.gz and b/dev-debug/Manifest.gz differ diff --git a/dev-debug/scap-driver/Manifest b/dev-debug/scap-driver/Manifest index a84d27bdc9c1..aa026e8acae6 100644 --- a/dev-debug/scap-driver/Manifest +++ b/dev-debug/scap-driver/Manifest @@ -3,7 +3,9 @@ AUX 0.29.3-fix-kmod-build-on-6.2+.patch 1420 BLAKE2B 45f312bce9ce3dbaa0ddd300ccf 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-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce 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 MISC metadata.xml 494 BLAKE2B d0bc754d3af2488b9dc7672fc63e962f4c885d88a819e4332bd1c25f84c967e2e1cd8489122490a864cbfd930225b3dc28c8bfad4426750c030dce6ef5a08b4e SHA512 b77b7c103cfb606333814af210a0fae1f7956ddd9d3c3a044b0bebf42553f5ffe99d04549fb9c5e40fce33e9d23761830b4944b2cd83bd8ca2193f9b7da60fc0 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 new file mode 100644 index 000000000000..b33ba164b97a --- /dev/null +++ b/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.8+.patch @@ -0,0 +1,44 @@ + +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.29.3-r6.ebuild b/dev-debug/scap-driver/scap-driver-0.29.3-r6.ebuild new file mode 100644 index 000000000000..6874973ae601 --- /dev/null +++ b/dev-debug/scap-driver/scap-driver-0.29.3-r6.ebuild @@ -0,0 +1,53 @@ +# 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="!