gentoo auto-resync : 03:01:2023 - 14:26:21

5 files changed, 0 insertions, 209 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 362aea8966b8..a7341f113470 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 5a2f7c5da4af..b07a2446bcc5 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,8 +1,4 @@
-AUX sysdig-0.27.1-grpc-absl-sync.patch 813 BLAKE2B 663be7d7011fc1a973972015d6a0dd4f5e1fd42ee09247cf200195660cb347df3fee35759ec596e0851124bffb7a95469788677f03dea36359a0b8124091b318 SHA512 edfad225dd2cbe45ab22da2785c58f738a20b113cc8b1099326ffe4ed5929e55d0c4aa6cf23c8c01c6cd8c48d316be3fcb1a359a91bcaab6a7d383eebdf3aed6
-AUX sysdig-0.27.1-luajit-2.1.patch 3824 BLAKE2B cac4079894303c4ee1d7829ec2fd77675db76883973cf0cae99d61d8ce459eb9735dc9d504064280e8c77b39ecefa2c48a191f8880b743c3ea1be92e8695c4a8 SHA512 1acca04049255538003ba95effc0ce631036ed872e54b19601a2f690428531e80c6e5d9ea86b8639d17df32608d9fab8e4085d858b4157ce37a1e929aa5537fe
 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
-EBUILD sysdig-0.27.1-r100.ebuild 1750 BLAKE2B b41840987df0d6a09c4539e914c26efa56fd6d8df029cc0d0d97513ca281007cce4be60619231195e5e7055cad8f558926adbd50fb16e9b6acaa65208c17f0f9 SHA512 07e0c1e07c93b9e7be2bfd6b4b67d2dba255767b73a70ce787669a9b4cd200efd1deeb9e7f1589e11a5364c2b882430a3f73f70dd4e2a18206f45ac3993c4c1d
 EBUILD sysdig-0.29.3.ebuild 2037 BLAKE2B 80952b562f59739320d4d936daf83331903c896692caae41d058acd18879ca22c7f5efb44d48eeb8567ecf1922bc879184bc9109832246661337b8d4ea75033b SHA512 d7876cb3eed6aaa2d43d01dd36e280cd77385cb80ed524f7cca91dcac83336c5586a2bd005bc632c1c1d5d7096ba33573632438b78cf09836b35bc7d5562fe7c
 MISC metadata.xml 671 BLAKE2B 553dbbe2ea2a56f5a88bb0276b3f97c5d4d8d798291eaef42d5aadd842cf5cbbb770515729c9779890f9227f7cc96fc8e35457009f066cfb43993b02c7406d7a SHA512 4d0b92b271bd4ceb86db363a29cd465124ab71ec6941848cafec4ebba0232a52bf62a4128d8cbaf5a7a6c9350aef29e4a797b6a659d5d5896c077b0b5df9f73d
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 <holger@applied-asynchrony.com>
-
-From 1147b9a4f6f1f9e97b43735e7980da387837de4a Mon Sep 17 00:00:00 2001
-From: Evgeni Golov <evgeni@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 <evgeni@golov.de>
-sysdig-CLA-1.0-signed-off-by: Evgeni Golov <evgeni@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
-}