From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-util/sysdig/Manifest | 6 +- .../sysdig/files/sysdig-0.27.1-luajit-2.1.patch | 99 ++++++++++++++++++++++ dev-util/sysdig/sysdig-0.27.0.ebuild | 68 --------------- dev-util/sysdig/sysdig-0.27.1-r100.ebuild | 6 +- dev-util/sysdig/sysdig-0.27.1.ebuild | 68 --------------- 5 files changed, 106 insertions(+), 141 deletions(-) create mode 100644 dev-util/sysdig/files/sysdig-0.27.1-luajit-2.1.patch delete mode 100644 dev-util/sysdig/sysdig-0.27.0.ebuild delete mode 100644 dev-util/sysdig/sysdig-0.27.1.ebuild (limited to 'dev-util/sysdig') diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest index bc128bcc62bb..04c6c8f784a8 100644 --- a/dev-util/sysdig/Manifest +++ b/dev-util/sysdig/Manifest @@ -1,7 +1,5 @@ AUX sysdig-0.27.1-grpc-absl-sync.patch 813 BLAKE2B 663be7d7011fc1a973972015d6a0dd4f5e1fd42ee09247cf200195660cb347df3fee35759ec596e0851124bffb7a95469788677f03dea36359a0b8124091b318 SHA512 edfad225dd2cbe45ab22da2785c58f738a20b113cc8b1099326ffe4ed5929e55d0c4aa6cf23c8c01c6cd8c48d316be3fcb1a359a91bcaab6a7d383eebdf3aed6 -DIST sysdig-0.27.0.tar.gz 933094 BLAKE2B e412bd2a35a62b580344a49e2deee85764710f91327cd63b42913dc361ee96943ffe51b90ee745c420454f0a4be455606d486a91ab3e103d7e396f04dc3f1ff4 SHA512 102150cc641165a6c18ce71e3c6148dc10700f614fec7e1909c29172e3cce02dfa16af56aabdcd420499d0aa89f90fee8f26d92a250b0a521d1b9d416c6a678f +AUX sysdig-0.27.1-luajit-2.1.patch 3824 BLAKE2B cac4079894303c4ee1d7829ec2fd77675db76883973cf0cae99d61d8ce459eb9735dc9d504064280e8c77b39ecefa2c48a191f8880b743c3ea1be92e8695c4a8 SHA512 1acca04049255538003ba95effc0ce631036ed872e54b19601a2f690428531e80c6e5d9ea86b8639d17df32608d9fab8e4085d858b4157ce37a1e929aa5537fe DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08 -EBUILD sysdig-0.27.0.ebuild 1386 BLAKE2B 26a8a657dccc2d003ab5d3d9e66e2557610b216776fac551d267adea41b0c8f8c96626f395ffbc9ae469454c5dc400c24f0cdd64dc2089aebb0f1303f2c360d7 SHA512 f9d4a46adf142d27c8acf5bdb479529e975d30d97f0508761d278ba49073d8fb5568977865bfe6f2098217015120568c26cb1dfec4b2e7c5c898e128fdb8cfc4 -EBUILD sysdig-0.27.1-r100.ebuild 1652 BLAKE2B 75d52ce30c8e2592be903d6cd3d9db99575bbbb18b6320bdb4457a37ecd952cbfe9dfdb12d5cc5b6081c04906301b02f6b35d65cd9a3a4087ef53f196e37290e SHA512 35ef63592248cca5188ebe96449074bba77d984acbd4cded00ca17f8af70d11e12759a7d1ada4b2a6b6ebaa72d97aa461a5dbb512ecaf0e7d0153984af0e3aa7 -EBUILD sysdig-0.27.1.ebuild 1386 BLAKE2B 26a8a657dccc2d003ab5d3d9e66e2557610b216776fac551d267adea41b0c8f8c96626f395ffbc9ae469454c5dc400c24f0cdd64dc2089aebb0f1303f2c360d7 SHA512 f9d4a46adf142d27c8acf5bdb479529e975d30d97f0508761d278ba49073d8fb5568977865bfe6f2098217015120568c26cb1dfec4b2e7c5c898e128fdb8cfc4 +EBUILD sysdig-0.27.1-r100.ebuild 1750 BLAKE2B b41840987df0d6a09c4539e914c26efa56fd6d8df029cc0d0d97513ca281007cce4be60619231195e5e7055cad8f558926adbd50fb16e9b6acaa65208c17f0f9 SHA512 07e0c1e07c93b9e7be2bfd6b4b67d2dba255767b73a70ce787669a9b4cd200efd1deeb9e7f1589e11a5364c2b882430a3f73f70dd4e2a18206f45ac3993c4c1d MISC metadata.xml 428 BLAKE2B 06b3d161458d7de7549a6a737ad526232d58ce75ceb52a0f7c55f5647a1c49a8b8dfe79f8a1e2bd155ef0a2924839094a4578fd73243870250f42704ae14cd04 SHA512 bbd2326f2d2fda2d7a9716e6e63676217bd730de7c2a6457bee068893f67766b6b5ab392485c5f9ce2896fc34c5eab3bfd5b91dd6dffdafeac30c58b1983a533 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 new file mode 100644 index 000000000000..b0d5c9dc724c --- /dev/null +++ b/dev-util/sysdig/files/sysdig-0.27.1-luajit-2.1.patch @@ -0,0 +1,99 @@ + +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 + +From 1147b9a4f6f1f9e97b43735e7980da387837de4a Mon Sep 17 00:00:00 2001 +From: Evgeni Golov +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 +sysdig-CLA-1.0-signed-off-by: Evgeni Golov +--- + 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.0.ebuild b/dev-util/sysdig/sysdig-0.27.0.ebuild deleted file mode 100644 index f415c1f52770..000000000000 --- a/dev-util/sysdig/sysdig-0.27.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 cmake - -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" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-misc/jq:0= - dev-cpp/tbb:0= - dev-lang/luajit:2= - >=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} )" - -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 - ) - - 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 -} diff --git a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild index ab9bce5d68b9..a31a6e8614d1 100644 --- a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild +++ b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -41,6 +41,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.27.1-grpc-absl-sync.patch + "${FILESDIR}"/${PN}-0.27.1-luajit-2.1.patch ) src_prepare() { @@ -60,6 +61,9 @@ src_configure() { # unbundle the deps -DUSE_BUNDLED_DEPS=OFF + + # explicitly set version + -DSYSDIG_VERSION=${PV} ) cmake_src_configure diff --git a/dev-util/sysdig/sysdig-0.27.1.ebuild b/dev-util/sysdig/sysdig-0.27.1.ebuild deleted file mode 100644 index f415c1f52770..000000000000 --- a/dev-util/sysdig/sysdig-0.27.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 cmake - -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" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-misc/jq:0= - dev-cpp/tbb:0= - dev-lang/luajit:2= - >=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} )" - -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 - ) - - 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 -} -- cgit v1.2.3