* [gentoo-commits] repo/gentoo:master commit in: dev-debug/sysdig/files/, dev-debug/sysdig/
@ 2025-03-27 12:05 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2025-03-27 12:05 UTC (permalink / raw
To: gentoo-commits
commit: 6f36a8169bd5b26b9f0563b534ecc381a7ca6a29
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Sat Feb 22 17:33:26 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 27 12:04:42 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f36a816
dev-debug/sysdig: clean up old
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/40705
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-debug/sysdig/Manifest | 2 -
dev-debug/sysdig/files/0.38.1-libs-no-libanl.patch | 21 ----
dev-debug/sysdig/sysdig-0.38.1-r1.ebuild | 131 ---------------------
3 files changed, 154 deletions(-)
diff --git a/dev-debug/sysdig/Manifest b/dev-debug/sysdig/Manifest
index 7649f298d36a..a716f469365f 100644
--- a/dev-debug/sysdig/Manifest
+++ b/dev-debug/sysdig/Manifest
@@ -1,6 +1,4 @@
-DIST falcosecurity-libs-0.17.3.tar.gz 4425090 BLAKE2B 3d6300bba2303715581d9b35f63e453f85a3889fa93233d3b1ca69f6ba92b33e0a7d90bbd160b765487b44771a1d94f5a1fb380cf4e5130506a885471dddb7e7 SHA512 05707c404bdd45c2e944b903dbbc1e5e0e5991a3d4cbe9ea357efb35b5ad0c4ede7cdd7b056a7dde2543cc2c0b8d5d3b42606202128b7287a80a1da686de169e
DIST falcosecurity-libs-0.19.0.tar.gz 4499949 BLAKE2B 4d165f3b023183abf527a2243f601ca7e6929e882ab854901ff98c3441b6bee61f9bb5d3af8974953423fa46d3968872b7f9dbfb1d81d6ad78202442e5f8d9b7 SHA512 5b011c804b07bf2f3eb6a6d7e8c9ef4e54bcc8d74116020e887465aba3dec737bdf8fc854778a8230f7e23e87da29423c6320a8054873eb5c9c957ce40ef3825
DIST falcosecurity-libs-0.20.0.tar.gz 4545190 BLAKE2B 93a074ab6451c16c7ad58498ac580f0476339e7dee65112e56142307f79966c43b69c71234a784aff03f47ec2e37e838e797beb4b36e9c105db88cf32cad135e SHA512 b5ef481bda92a29b7b409baee25dabd0b766e4bbcac762740635f99b36cd823a6d98f541817fd03b1a86a1385d3fe24888b33b84dc3486cd9f8d00e5384eb705
-DIST sysdig-0.38.1.tar.gz 67528905 BLAKE2B 9b0e0f337bf64df200b44f7e23c64d00477d6ebfb2bc995dcb04951c8e25fb9274431022b8fa54f54851436f063b79d1268045ba686e97fb0195922bc8dfcf28 SHA512 17275c029368b203ec590cf448a33275bd6c20b81be77edcd393f1a3c04e6c4714c7286b6268823bb0c629d52a88cd97f7b3ef588bd10a000b65de23eb5b5a45
DIST sysdig-0.39.0.tar.gz 85742724 BLAKE2B 7e6414b3b87bd4cc43ede8c28f99ebd385a63b0efd711d6648b832d64d518bbfe7ddb2bff469232933413a2807d4df66775c8d57072d9e80aeffb5b2dd5690fd SHA512 d43c816d4c29cc283d3247ac0ac3591b8adea7a08194a80b4e530f0c45730a824d16eda7b07bb70e4658cbae0f851fbb67ec880eedf33477bf5bfc911d8a7936
DIST sysdig-0.40.1.tar.gz 68296332 BLAKE2B 17ed9154d1e955dc18700ab764f0fce11461bea9b6970e8661761269d4f0bbb786ddd8a4cc4c806121a52d0d486080fc231f2447dc69d26d41fa582c1dabda41 SHA512 a50372192ea8708d19ede0550659a2f7ea6b535b419d649ae9b52e32f9c71576f0a3e3ab85dcc8d23f792dff078f15eca1435a1e402e3d98aba7eefc1920989e
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/sysdig-0.38.1-r1.ebuild b/dev-debug/sysdig/sysdig-0.38.1-r1.ebuild
deleted file mode 100644
index 1c03185f156d..000000000000
--- a/dev-debug/sysdig/sysdig-0.38.1-r1.ebuild
+++ /dev/null
@@ -1,131 +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 flag-o-matic 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"
-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"
-
-# The driver version as found in cmake/modules/driver.cmake
-DRIVER_VERSION="7.2.0+driver"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+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/protobuf:=
- dev-libs/re2:=
- dev-libs/uthash
- 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"
-
-# pin the driver to the falcosecurity-libs version
-PDEPEND="modules? ( =dev-debug/scap-driver-${LIBS_VERSION}* )"
-
-PATCHES=( "${FILESDIR}/${PV}-scap-loader.patch" )
-
-src_prepare() {
- # manually apply patches to falcosecurity-libs dependency
- pushd "${WORKDIR}/libs-${LIBS_VERSION}"
- # musl has no libanl (#929227)
- if [ ${ELIBC} == "musl" ] ; then
- eapply "${FILESDIR}/${PV}-libs-no-libanl.patch" || die
- fi
- popd
-
- # do not build with debugging info
- sed -i -e 's/-ggdb//g' CMakeLists.txt "${WORKDIR}"/libs-${LIBS_VERSION}/cmake/modules/CompilerFlags.cmake || die
-
- # fix the driver version
- sed -i -e 's/0.0.0-local/${DRIVER_VERSION}/g' cmake/modules/driver.cmake || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- # known problems with strict aliasing:
- # https://github.com/falcosecurity/libs/issues/1964
- append-flags -fno-strict-aliasing
-
- local mycmakeargs=(
- # do not build the kernel driver
- -DBUILD_DRIVER=OFF
-
- # libscap examples are not installed or really useful
- -DBUILD_LIBSCAP_EXAMPLES=OFF
-
- # do not build internal libs as shared
- -DBUILD_SHARED_LIBS=OFF
-
- # do not build eBPF driver for now
- -DBUILD_SYSDIG_MODERN_BPF=OFF
-
- # 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
- -DFALCOSECURITY_LIBS_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_VERSION}
-
- # explicitly set sysdig version - required for some reason
- -DSYSDIG_VERSION=${PV}
-
- # do not use bundled dependencies for sysdig
- -DUSE_BUNDLED_DEPS=OFF
-
- # do not use bundled dependencies for falcosecurity-libs
- -DUSE_BUNDLED_B64=OFF
- -DUSE_BUNDLED_JSONCPP=OFF
- -DUSE_BUNDLED_RE2=OFF
- -DUSE_BUNDLED_TBB=OFF
- -DUSE_BUNDLED_VALIJSON=OFF
-
- # set 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
-
- # 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-debug/sysdig/files/, dev-debug/sysdig/
@ 2025-03-27 12:05 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2025-03-27 12:05 UTC (permalink / raw
To: gentoo-commits
commit: a4b6e63441547f20982d672cf3d5a381fb04ec75
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Fri Mar 7 18:12:50 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 27 12:04:41 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4b6e634
dev-debug/sysdig: fix buffer overrun reading sockets from procfs
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...uffer-overrun-reading-sockets-from-procfs.patch | 36 ++++++++++++++++++++++
dev-debug/sysdig/sysdig-0.40.1.ebuild | 5 +++
2 files changed, 41 insertions(+)
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.40.1.ebuild b/dev-debug/sysdig/sysdig-0.40.1.ebuild
index 5d37a6719dac..886c0561ccdc 100644
--- a/dev-debug/sysdig/sysdig-0.40.1.ebuild
+++ b/dev-debug/sysdig/sysdig-0.40.1.ebuild
@@ -75,6 +75,11 @@ pkg_pretend() {
}
src_prepare() {
+ # manually apply patches to falcosecurity-libs
+ pushd "${WORKDIR}/libs-${LIBS_VERSION}"
+ eapply "${FILESDIR}/libs-0.20-fix-buffer-overrun-reading-sockets-from-procfs.patch" || die
+ popd
+
# do not build with debugging info
sed -i -e 's/-ggdb//g' CMakeLists.txt "${WORKDIR}"/libs-${LIBS_VERSION}/cmake/modules/CompilerFlags.cmake || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-27 12:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-27 12:05 [gentoo-commits] repo/gentoo:master commit in: dev-debug/sysdig/files/, dev-debug/sysdig/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-03-27 12:05 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox