diff options
Diffstat (limited to 'dev-debug/sysdig')
| -rw-r--r-- | dev-debug/sysdig/Manifest | 8 | ||||
| -rw-r--r-- | dev-debug/sysdig/files/0.38.1-libs-no-libanl.patch | 21 | ||||
| -rw-r--r-- | dev-debug/sysdig/files/libs-0.20-fix-buffer-overrun-reading-sockets-from-procfs.patch | 36 | ||||
| -rw-r--r-- | dev-debug/sysdig/sysdig-0.40.1.ebuild (renamed from dev-debug/sysdig/sysdig-0.38.1-r1.ebuild) | 67 |
4 files changed, 91 insertions, 41 deletions
diff --git a/dev-debug/sysdig/Manifest b/dev-debug/sysdig/Manifest index 28dd43cc59b2..ebd47b3fdc82 100644 --- a/dev-debug/sysdig/Manifest +++ b/dev-debug/sysdig/Manifest @@ -1,9 +1,9 @@ -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.3.tar.gz 4425090 BLAKE2B 3d6300bba2303715581d9b35f63e453f85a3889fa93233d3b1ca69f6ba92b33e0a7d90bbd160b765487b44771a1d94f5a1fb380cf4e5130506a885471dddb7e7 SHA512 05707c404bdd45c2e944b903dbbc1e5e0e5991a3d4cbe9ea357efb35b5ad0c4ede7cdd7b056a7dde2543cc2c0b8d5d3b42606202128b7287a80a1da686de169e +AUX libs-0.20-fix-buffer-overrun-reading-sockets-from-procfs.patch 1146 BLAKE2B a99bdea968c7d017e4f076a4d868824db3683af44c9d62fdc0b7b0ceb0b3084a87e77c57f92efb7bbe903f23f89c8080dbbc0100d17a21f7829cd3d6b612b446 SHA512 f1bea2696c474b8f9d282dcc1b562845ca37344436fbd456f8daf4453701a34695d414b22624bcc75803709932a2ed3f6c305a9624888aba60c09ad843269829 DIST falcosecurity-libs-0.19.0.tar.gz 4499949 BLAKE2B 4d165f3b023183abf527a2243f601ca7e6929e882ab854901ff98c3441b6bee61f9bb5d3af8974953423fa46d3968872b7f9dbfb1d81d6ad78202442e5f8d9b7 SHA512 5b011c804b07bf2f3eb6a6d7e8c9ef4e54bcc8d74116020e887465aba3dec737bdf8fc854778a8230f7e23e87da29423c6320a8054873eb5c9c957ce40ef3825 -DIST sysdig-0.38.1.tar.gz 67528905 BLAKE2B 9b0e0f337bf64df200b44f7e23c64d00477d6ebfb2bc995dcb04951c8e25fb9274431022b8fa54f54851436f063b79d1268045ba686e97fb0195922bc8dfcf28 SHA512 17275c029368b203ec590cf448a33275bd6c20b81be77edcd393f1a3c04e6c4714c7286b6268823bb0c629d52a88cd97f7b3ef588bd10a000b65de23eb5b5a45 +DIST falcosecurity-libs-0.20.0.tar.gz 4545190 BLAKE2B 93a074ab6451c16c7ad58498ac580f0476339e7dee65112e56142307f79966c43b69c71234a784aff03f47ec2e37e838e797beb4b36e9c105db88cf32cad135e SHA512 b5ef481bda92a29b7b409baee25dabd0b766e4bbcac762740635f99b36cd823a6d98f541817fd03b1a86a1385d3fe24888b33b84dc3486cd9f8d00e5384eb705 DIST sysdig-0.39.0.tar.gz 85742724 BLAKE2B 7e6414b3b87bd4cc43ede8c28f99ebd385a63b0efd711d6648b832d64d518bbfe7ddb2bff469232933413a2807d4df66775c8d57072d9e80aeffb5b2dd5690fd SHA512 d43c816d4c29cc283d3247ac0ac3591b8adea7a08194a80b4e530f0c45730a824d16eda7b07bb70e4658cbae0f851fbb67ec880eedf33477bf5bfc911d8a7936 -EBUILD sysdig-0.38.1-r1.ebuild 3404 BLAKE2B 8d0a578a92aee5af76f46d4cf7863f6bfbad952863379f7fb000fca7352d48f69da1ad0628533148e1f1aa3edee47f8b9544ab024391d93eb47f48e4d9deb5e4 SHA512 fd746ff2ec03f46d035c0229cbb33ba33de8b8e53855a3aa499ac9e1e500b49a778a96076903e12602725dc3893e81009da61468ad8bc65aaea94d96e2c4706e +DIST sysdig-0.40.1.tar.gz 68296332 BLAKE2B 17ed9154d1e955dc18700ab764f0fce11461bea9b6970e8661761269d4f0bbb786ddd8a4cc4c806121a52d0d486080fc231f2447dc69d26d41fa582c1dabda41 SHA512 a50372192ea8708d19ede0550659a2f7ea6b535b419d649ae9b52e32f9c71576f0a3e3ab85dcc8d23f792dff078f15eca1435a1e402e3d98aba7eefc1920989e EBUILD sysdig-0.39.0-r1.ebuild 4030 BLAKE2B 17ca1e2aa694c7fdcf3a0b78b9439adfa6b0f24fb5d76eb9fd85cdc8581bd431f9920379ff06526e5b6ac934f0ce9d9b256b5d0859f0c44b0dd1a8265693b08d SHA512 d0d6fd9e514313bad4e733a4a91b2b51a7d25bf7bceb48ae677ebd0624779a2fe848d87e57a001860e8a6ce5e2f1e7d8683b31823d02137bd1207a949b844bdf +EBUILD sysdig-0.40.1.ebuild 4086 BLAKE2B 9e97151b7406096aa5e2d948fb14a9d9eb0b08798322b549e2d62a415d8e61c1c9d6276acc1763340780f96b07c43b2cf19af03c03135bc0b9b90d437c44063b SHA512 d7d6e1a180d92695b0679b2fc419b9f8eb42f2c9a0898da2a220bede099894625b8c3f0edcdd4be0c66647ab049ef5346b5b968d83877fd83a82b27109dc8d91 MISC metadata.xml 786 BLAKE2B a450cef4fda00c66e71a847a69dce989a7a8b743d6e277e8d3c3035067d9d245c3612d7f7631dd41ded3963dc668d3d7f61c6b2cace5b82664887e7c035f16cb SHA512 926a07f842676753a6d308ec6010c02301e295fccf1e34500e98d6b91c9eb34cc5b02c64704996fdf0d33466d526961036b777dcac18efe83b27c60a3d75849c diff --git a/dev-debug/sysdig/files/0.38.1-libs-no-libanl.patch b/dev-debug/sysdig/files/0.38.1-libs-no-libanl.patch deleted file mode 100644 index f1b10b3f07cd..000000000000 --- a/dev-debug/sysdig/files/0.38.1-libs-no-libanl.patch +++ /dev/null @@ -1,21 +0,0 @@ - -Do not attempt to link against libanl on musl. - -Bug: https://bugs.gentoo.org/929907 -Bug: https://github.com/falcosecurity/libs/issues/1948 - -Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> - ---- libs-0.17.2/userspace/libsinsp/CMakeLists.txt~ 2024-06-14 11:38:50.000000000 +0200 -+++ libs-0.17.2/userspace/libsinsp/CMakeLists.txt 2024-07-05 00:18:03.326406540 +0200 -@@ -258,8 +258,8 @@ if(NOT WIN32) - ) - - if(NOT MUSL_OPTIMIZED_BUILD) -- target_link_libraries(sinsp INTERFACE rt anl) -- list(APPEND SINSP_PKGCONFIG_LIBRARIES rt anl) -+ target_link_libraries(sinsp INTERFACE rt) -+ list(APPEND SINSP_PKGCONFIG_LIBRARIES rt) - endif() - - else() diff --git a/dev-debug/sysdig/files/libs-0.20-fix-buffer-overrun-reading-sockets-from-procfs.patch b/dev-debug/sysdig/files/libs-0.20-fix-buffer-overrun-reading-sockets-from-procfs.patch new file mode 100644 index 000000000000..9741fad48e2a --- /dev/null +++ b/dev-debug/sysdig/files/libs-0.20-fix-buffer-overrun-reading-sockets-from-procfs.patch @@ -0,0 +1,36 @@ + +Patch from: +https://github.com/falcosecurity/libs/commit/de3f4cac9233682eae63c63377c82efb649679f5 + +From de3f4cac9233682eae63c63377c82efb649679f5 Mon Sep 17 00:00:00 2001 +From: Shane Lawrence <shane@lawrence.dev> +Date: Thu, 20 Feb 2025 14:55:41 +0000 +Subject: [PATCH] Fix buffer overrun reading sockets from procfs. + +Signed-off-by: Shane Lawrence <shane@lawrence.dev> +--- + userspace/libscap/linux/scap_fds.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/userspace/libscap/linux/scap_fds.c b/userspace/libscap/linux/scap_fds.c +index f98ac3f32f..73e99ca428 100644 +--- a/userspace/libscap/linux/scap_fds.c ++++ b/userspace/libscap/linux/scap_fds.c +@@ -766,7 +766,7 @@ int32_t scap_fd_read_ipv4_sockets_from_proc_fs(const char *dir, + break; + } + +- while(*scan_pos == ' ' && scan_pos < scan_end) { ++ while(scan_pos < scan_end && *scan_pos == ' ') { + scan_pos++; + } + +@@ -974,7 +974,7 @@ int32_t scap_fd_read_ipv6_sockets_from_proc_fs(char *dir, + break; + } + +- while(*scan_pos == ' ' && scan_pos < scan_end) { ++ while(scan_pos < scan_end && *scan_pos == ' ') { + scan_pos++; + } + diff --git a/dev-debug/sysdig/sysdig-0.38.1-r1.ebuild b/dev-debug/sysdig/sysdig-0.40.1.ebuild index 1c03185f156d..886c0561ccdc 100644 --- a/dev-debug/sysdig/sysdig-0.38.1-r1.ebuild +++ b/dev-debug/sysdig/sysdig-0.40.1.ebuild @@ -1,27 +1,30 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( luajit ) -inherit bash-completion-r1 cmake flag-o-matic lua-single +inherit bash-completion-r1 cmake flag-o-matic linux-info 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.3" +LIBS_VERSION="0.20.0" +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="8.0.0+driver" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="+modules" +KEYWORDS="~amd64 ~x86" +IUSE="bpf +modules" REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND="${LUA_DEPS} @@ -30,6 +33,7 @@ RDEPEND="${LUA_DEPS} dev-cpp/yaml-cpp:= dev-libs/jsoncpp:= dev-libs/libb64:= + bpf? ( >=dev-libs/libbpf-1.1:= ) dev-libs/protobuf:= dev-libs/re2:= dev-libs/uthash @@ -44,18 +48,36 @@ DEPEND="${RDEPEND} dev-cpp/valijson virtual/os-headers" +BDEPEND="bpf? ( + dev-util/bpftool + llvm-core/clang:*[llvm_targets_BPF] + )" + # 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 + # manually apply patches to falcosecurity-libs pushd "${WORKDIR}/libs-${LIBS_VERSION}" - # musl has no libanl (#929227) - if [ ${ELIBC} == "musl" ] ; then - eapply "${FILESDIR}/${PV}-libs-no-libanl.patch" || die - fi + eapply "${FILESDIR}/libs-0.20-fix-buffer-overrun-reading-sockets-from-procfs.patch" || die popd # do not build with debugging info @@ -82,14 +104,15 @@ 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 -DDRIVER_VERSION=${DRIVER_VERSION} # point sysdig to the libs tree + -DUSE_BUNDLED_FALCOSECURITY_LIBS=ON -DFALCOSECURITY_LIBS_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_VERSION} # explicitly set sysdig version - required for some reason @@ -129,3 +152,15 @@ src_install() { 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 +} |