commit: 7b1ac17f41162103ec26bfcb288e815eba879ee3 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jan 3 11:20:05 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jan 3 11:20:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1ac17f
dev-util/sysdig: drop 0.27.1-r100 Bug: https://bugs.gentoo.org/889532 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-util/sysdig/Manifest | 1 - .../files/sysdig-0.27.1-grpc-absl-sync.patch | 25 ------ .../sysdig/files/sysdig-0.27.1-luajit-2.1.patch | 99 ---------------------- dev-util/sysdig/sysdig-0.27.1-r100.ebuild | 81 ------------------ 4 files changed, 206 deletions(-) diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest index 9262fd7968f3..234cd960eb7a 100644 --- a/dev-util/sysdig/Manifest +++ b/dev-util/sysdig/Manifest @@ -1,3 +1,2 @@ DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce -DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08 DIST sysdig-0.29.3.tar.gz 306984 BLAKE2B 51e9a0a085fa91d65963fd33e00b139d97d22b551de8ca85e48b4af73991897378970dfde54754a970e79300f06a54bad1d9c8fdfdb44f24150d0b21077e423f SHA512 1dbe1195f245921c671ed2343325aee79fd0cde34681b9cab445135662d3ed7c84884e46b2270c0e868b5de1a3f2800b84e8bf9fcf0dfe581dd17e2e633f46d8 diff --git a/dev-util/sysdig/files/sysdig-0.27.1-grpc-absl-sync.patch b/dev-util/sysdig/files/sysdig-0.27.1-grpc-absl-sync.patch deleted file mode 100644 index eaf689a54d0d..000000000000 --- a/dev-util/sysdig/files/sysdig-0.27.1-grpc-absl-sync.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.gentoo.org/817128 -https://github.com/hhoffstaette/portage/blob/master/dev-util/sysdig/files/0.27.1-grpc-absl-sync.patch ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -552,6 +552,7 @@ if(NOT WIN32 AND NOT APPLE) - else() - message(FATAL_ERROR "Couldn't find system grpc") - endif() -+ find_library(ABSL_SYNC_LIB NAMES absl_synchronization) - find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin) - if(NOT GRPC_CPP_PLUGIN) - message(FATAL_ERROR "System grpc_cpp_plugin not found") ---- a/userspace/libsinsp/CMakeLists.txt -+++ b/userspace/libsinsp/CMakeLists.txt -@@ -214,6 +214,10 @@ if(NOT WIN32) - "${JQ_LIB}" - "${B64_LIB}") - -+ if(ABSL_SYNC_LIB) -+ target_link_libraries(sinsp "${ABSL_SYNC_LIB}") -+ endif() -+ - if(NOT MUSL_OPTIMIZED_BUILD) - target_link_libraries(sinsp - rt diff --git a/dev-util/sysdig/files/sysdig-0.27.1-luajit-2.1.patch b/dev-util/sysdig/files/sysdig-0.27.1-luajit-2.1.patch deleted file mode 100644 index b0d5c9dc724c..000000000000 --- a/dev-util/sysdig/files/sysdig-0.27.1-luajit-2.1.patch +++ /dev/null @@ -1,99 +0,0 @@ - -https://bugs.gentoo.org/834664 -https://github.com/draios/sysdig/pull/921 - -Backport for 0.27.1 in lua_parser_api.cpp by: -Holger Hoffstätte <hol...@applied-asynchrony.com> - -From 1147b9a4f6f1f9e97b43735e7980da387837de4a Mon Sep 17 00:00:00 2001 -From: Evgeni Golov <evg...@golov.de> -Date: Sun, 27 Aug 2017 13:51:19 +0200 -Subject: [PATCH] fix build with LuaJIT 2.1 betas - -LuaJIT 2.1 drops some compat symbols [1]. And while I think that this is -wrong, as it breaks compatibility with Lua 5.1 [2], it is quite easy to -adopt the code to work with both versions (2.0 and 2.1) of LuaJIT and -remain Lua 5.1 compatible. - -[1] https://github.com/LuaJIT/LuaJIT/commit/dc320ca70f2c5bb3977b82853bcee6dad2523d01 -[2] https://github.com/LuaJIT/LuaJIT/issues/325 - -Signed-off-by: Evgeni Golov <evg...@golov.de> -sysdig-CLA-1.0-signed-off-by: Evgeni Golov <evg...@golov.de> ---- - CMakeLists.txt | 2 +- - userspace/libsinsp/chisel.cpp | 6 +++--- - userspace/libsinsp/lua_parser.cpp | 2 +- - userspace/libsinsp/lua_parser_api.cpp | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8613a774d..4f27db9b3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -103,7 +103,7 @@ option(USE_BUNDLED_DEPS "Enable bundled dependencies instead of using the system - option(USE_BUNDLED_LUAJIT "Enable building of the bundled LuaJIT" ${USE_BUNDLED_DEPS}) - - if(NOT USE_BUNDLED_LUAJIT) -- find_path(LUAJIT_INCLUDE luajit.h PATH_SUFFIXES luajit-2.0 luajit) -+ find_path(LUAJIT_INCLUDE luajit.h PATH_SUFFIXES luajit-2.1 luajit-2.0 luajit) - find_library(LUAJIT_LIB NAMES luajit luajit-5.1) - if(LUAJIT_INCLUDE AND LUAJIT_LIB) - message(STATUS "Found LuaJIT: include: ${LUAJIT_INCLUDE}, lib: ${LUAJIT_LIB}") -diff --git a/userspace/libsinsp/chisel.cpp b/userspace/libsinsp/chisel.cpp -index 048bedc4e..b2bb8e872 100644 ---- a/userspace/libsinsp/chisel.cpp -+++ b/userspace/libsinsp/chisel.cpp -@@ -96,7 +96,7 @@ void lua_stackdump(lua_State *L) - // Lua callbacks - /////////////////////////////////////////////////////////////////////////////// - #ifdef HAS_LUA_CHISELS --const static struct luaL_reg ll_sysdig [] = -+const static struct luaL_Reg ll_sysdig [] = - { - {"set_filter", &lua_cbacks::set_global_filter}, - {"set_snaplen", &lua_cbacks::set_snaplen}, -@@ -124,7 +124,7 @@ const static struct luaL_reg ll_sysdig [] = - {NULL,NULL} - }; - --const static struct luaL_reg ll_chisel [] = -+const static struct luaL_Reg ll_chisel [] = - { - {"request_field", &lua_cbacks::request_field}, - {"set_filter", &lua_cbacks::set_filter}, -@@ -135,7 +135,7 @@ const static struct luaL_reg ll_chisel [] = - {NULL,NULL} - }; - --const static struct luaL_reg ll_evt [] = -+const static struct luaL_Reg ll_evt [] = - { - {"field", &lua_cbacks::field}, - {"get_num", &lua_cbacks::get_num}, -diff --git a/userspace/libsinsp/lua_parser.cpp b/userspace/libsinsp/lua_parser.cpp -index 90a2c664f..55096d157 100644 ---- a/userspace/libsinsp/lua_parser.cpp -+++ b/userspace/libsinsp/lua_parser.cpp -@@ -14,7 +14,7 @@ extern "C" { - #include "lauxlib.h" - } - --const static struct luaL_reg ll_filter [] = -+const static struct luaL_Reg ll_filter [] = - { - {"rel_expr", &lua_parser_cbacks::rel_expr}, - {"bool_op", &lua_parser_cbacks::bool_op}, -diff --git a/userspace/libsinsp/lua_parser_api.cpp b/userspace/libsinsp/lua_parser_api.cpp -index 7511814e3..90a3a9fb4 100644 ---- a/userspace/libsinsp/lua_parser_api.cpp -+++ b/userspace/libsinsp/lua_parser_api.cpp -@@ -228,7 +228,7 @@ int lua_parser_cbacks::rel_expr(lua_State *ls) - string err = "Got non-table as in-expression operand\n"; - throw sinsp_exception("parser API error"); - } -- int n = luaL_getn(ls, 4); /* get size of table */ -+ int n = (int)lua_objlen(ls, 4); /* get size of table */ - for (i=1; i<=n; i++) - { - lua_rawgeti(ls, 4, i); diff --git a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild deleted file mode 100644 index a31a6e8614d1..000000000000 --- a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( luajit ) -# Documentation says this might be needed but since the unmigrated ebuilds -# did not enforce it, nor does this one. -#LUA_REQ_USE="-lua52compat" - -inherit bash-completion-r1 cmake lua-single - -DESCRIPTION="A system exploration and troubleshooting tool" -HOMEPAGE="https://sysdig.com/"; -SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+modules test" -REQUIRED_USE="${LUA_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND="${LUA_DEPS} - app-misc/jq:0= - dev-cpp/tbb:0= - >=dev-libs/jsoncpp-0.6_pre:0= - dev-libs/libb64:0= - dev-libs/protobuf:0= - net-dns/c-ares:0= - net-libs/grpc:0= - sys-libs/ncurses:0= - sys-libs/zlib:0= - dev-libs/openssl:0= - net-misc/curl:0=" -DEPEND="${RDEPEND} - virtual/os-headers - test? ( dev-cpp/gtest )" -PDEPEND=" - modules? ( >=dev-util/sysdig-kmod-${PV} )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.27.1-grpc-absl-sync.patch - "${FILESDIR}"/${PN}-0.27.1-luajit-2.1.patch -) - -src_prepare() { - sed -i -e 's:-ggdb::' CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCREATE_TEST_TARGETS=$(usex test) - - # done in dev-util/sysdig-kmod - -DBUILD_DRIVER=OFF - # libscap examples are not installed or really useful - -DBUILD_LIBSCAP_EXAMPLES=OFF - - # unbundle the deps - -DUSE_BUNDLED_DEPS=OFF - - # explicitly set version - -DSYSDIG_VERSION=${PV} - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - # remove sources - 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 -}
