diff options
author | Holger Hoffstätte <holger@applied-asynchrony.com> | 2024-10-14 14:47:51 +0200 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2024-11-01 17:28:23 +0000 |
commit | b8f76581cdd2aae952f280484c587d0ecd80e6fd (patch) | |
tree | c9138c62541b8cc0241bef041419b9043b6ff76c /dev-debug | |
parent | dev-debug/sysdig: add 0.39.0 (diff) | |
download | gentoo-b8f76581cdd2aae952f280484c587d0ecd80e6fd.tar.gz gentoo-b8f76581cdd2aae952f280484c587d0ecd80e6fd.tar.bz2 gentoo-b8f76581cdd2aae952f280484c587d0ecd80e6fd.zip |
dev-debug/sysdig: clean up old versions
Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/38986
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-debug')
-rw-r--r-- | dev-debug/sysdig/Manifest | 5 | ||||
-rw-r--r-- | dev-debug/sysdig/files/0.29.3-libs-gcc13.patch | 41 | ||||
-rw-r--r-- | dev-debug/sysdig/files/0.29.3-libs-no-libanl.patch | 16 | ||||
-rw-r--r-- | dev-debug/sysdig/sysdig-0.29.3-r1.ebuild | 91 | ||||
-rw-r--r-- | dev-debug/sysdig/sysdig-0.29.3-r2.ebuild | 103 | ||||
-rw-r--r-- | dev-debug/sysdig/sysdig-0.38.1.ebuild | 132 |
6 files changed, 2 insertions, 386 deletions
diff --git a/dev-debug/sysdig/Manifest b/dev-debug/sysdig/Manifest index 6e009591dfe2..b47ce37cc90e 100644 --- a/dev-debug/sysdig/Manifest +++ b/dev-debug/sysdig/Manifest @@ -1,5 +1,4 @@ -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 +DIST sysdig-0.39.0.tar.gz 85742724 BLAKE2B 7e6414b3b87bd4cc43ede8c28f99ebd385a63b0efd711d6648b832d64d518bbfe7ddb2bff469232933413a2807d4df66775c8d57072d9e80aeffb5b2dd5690fd SHA512 d43c816d4c29cc283d3247ac0ac3591b8adea7a08194a80b4e530f0c45730a824d16eda7b07bb70e4658cbae0f851fbb67ec880eedf33477bf5bfc911d8a7936 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/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.38.1.ebuild deleted file mode 100644 index be7cf88d7db3..000000000000 --- a/dev-debug/sysdig/sysdig-0.38.1.ebuild +++ /dev/null @@ -1,132 +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.2" -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/tbb:= - dev-cpp/yaml-cpp:= - dev-libs/jsoncpp:= - dev-libs/libb64:= - dev-libs/openssl:= - dev-libs/protobuf:= - dev-libs/re2:= - dev-libs/uthash - 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" - -# 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}" - # musl has no libanl (#929227) - if [ ${ELIBC} == "musl" ] ; then - eapply -p0 "${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 - - # 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 - - # 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 - - # move bashcomp to the proper location - dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die - rm -r "${ED}"/usr/etc || die -} |