diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2023-04-29 10:29:35 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2023-04-29 10:29:35 +0000 |
| commit | a6edbe1d116f3115483abe4147585663d7ff4112 (patch) | |
| tree | f5ac0aedf022f393d5ee05b11bb90243d8f389c7 /dev-util/sysdig | |
| parent | 585411f8a551570e81d5af64aac1ac83374fd93e (diff) | |
| download | srcux-a6edbe1d116f3115483abe4147585663d7ff4112.tar.gz srcux-a6edbe1d116f3115483abe4147585663d7ff4112.tar.xz srcux-a6edbe1d116f3115483abe4147585663d7ff4112.zip | |
Adding metadata
Diffstat (limited to 'dev-util/sysdig')
| -rw-r--r-- | dev-util/sysdig/files/0.29.3-libs-gcc13.patch | 28 | ||||
| -rw-r--r-- | dev-util/sysdig/metadata.xml | 31 | ||||
| -rw-r--r-- | dev-util/sysdig/sysdig-0.29.3-r1.ebuild | 91 |
3 files changed, 134 insertions, 16 deletions
diff --git a/dev-util/sysdig/files/0.29.3-libs-gcc13.patch b/dev-util/sysdig/files/0.29.3-libs-gcc13.patch new file mode 100644 index 000000000000..ce1a686cc65c --- /dev/null +++ b/dev-util/sysdig/files/0.29.3-libs-gcc13.patch @@ -0,0 +1,28 @@ + +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 a/dev-util/sysdig/metadata.xml b/dev-util/sysdig/metadata.xml index c16f8ef41665..6ff4967ef8a4 100644 --- a/dev-util/sysdig/metadata.xml +++ b/dev-util/sysdig/metadata.xml @@ -1,20 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>holger@applied-asynchrony.com</email> - <name>Holger Hoffstätte</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="modules">Build kernel modules needed for tracing local + <maintainer type="person"> + <email>holger@applied-asynchrony.com</email> + <name>Holger Hoffstätte</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + + <use> + <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> - </use> - <upstream> - <remote-id type="github">draios/sysdig</remote-id> - </upstream> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/sysdig/sysdig-0.29.3-r1.ebuild b/dev-util/sysdig/sysdig-0.29.3-r1.ebuild new file mode 100644 index 000000000000..2c56d49ba02e --- /dev/null +++ b/dev-util/sysdig/sysdig-0.29.3-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1,3,4} 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-util/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 +} |
