1 |
commit: 7b1ac17f41162103ec26bfcb288e815eba879ee3 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 3 11:20:05 2023 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 3 11:20:31 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1ac17f |
7 |
|
8 |
dev-util/sysdig: drop 0.27.1-r100 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/889532 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-util/sysdig/Manifest | 1 - |
14 |
.../files/sysdig-0.27.1-grpc-absl-sync.patch | 25 ------ |
15 |
.../sysdig/files/sysdig-0.27.1-luajit-2.1.patch | 99 ---------------------- |
16 |
dev-util/sysdig/sysdig-0.27.1-r100.ebuild | 81 ------------------ |
17 |
4 files changed, 206 deletions(-) |
18 |
|
19 |
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest |
20 |
index 9262fd7968f3..234cd960eb7a 100644 |
21 |
--- a/dev-util/sysdig/Manifest |
22 |
+++ b/dev-util/sysdig/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce |
25 |
-DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08 |
26 |
DIST sysdig-0.29.3.tar.gz 306984 BLAKE2B 51e9a0a085fa91d65963fd33e00b139d97d22b551de8ca85e48b4af73991897378970dfde54754a970e79300f06a54bad1d9c8fdfdb44f24150d0b21077e423f SHA512 1dbe1195f245921c671ed2343325aee79fd0cde34681b9cab445135662d3ed7c84884e46b2270c0e868b5de1a3f2800b84e8bf9fcf0dfe581dd17e2e633f46d8 |
27 |
|
28 |
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 |
29 |
deleted file mode 100644 |
30 |
index eaf689a54d0d..000000000000 |
31 |
--- a/dev-util/sysdig/files/sysdig-0.27.1-grpc-absl-sync.patch |
32 |
+++ /dev/null |
33 |
@@ -1,25 +0,0 @@ |
34 |
-https://bugs.gentoo.org/817128 |
35 |
-https://github.com/hhoffstaette/portage/blob/master/dev-util/sysdig/files/0.27.1-grpc-absl-sync.patch |
36 |
---- a/CMakeLists.txt |
37 |
-+++ b/CMakeLists.txt |
38 |
-@@ -552,6 +552,7 @@ if(NOT WIN32 AND NOT APPLE) |
39 |
- else() |
40 |
- message(FATAL_ERROR "Couldn't find system grpc") |
41 |
- endif() |
42 |
-+ find_library(ABSL_SYNC_LIB NAMES absl_synchronization) |
43 |
- find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin) |
44 |
- if(NOT GRPC_CPP_PLUGIN) |
45 |
- message(FATAL_ERROR "System grpc_cpp_plugin not found") |
46 |
---- a/userspace/libsinsp/CMakeLists.txt |
47 |
-+++ b/userspace/libsinsp/CMakeLists.txt |
48 |
-@@ -214,6 +214,10 @@ if(NOT WIN32) |
49 |
- "${JQ_LIB}" |
50 |
- "${B64_LIB}") |
51 |
- |
52 |
-+ if(ABSL_SYNC_LIB) |
53 |
-+ target_link_libraries(sinsp "${ABSL_SYNC_LIB}") |
54 |
-+ endif() |
55 |
-+ |
56 |
- if(NOT MUSL_OPTIMIZED_BUILD) |
57 |
- target_link_libraries(sinsp |
58 |
- rt |
59 |
|
60 |
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 |
61 |
deleted file mode 100644 |
62 |
index b0d5c9dc724c..000000000000 |
63 |
--- a/dev-util/sysdig/files/sysdig-0.27.1-luajit-2.1.patch |
64 |
+++ /dev/null |
65 |
@@ -1,99 +0,0 @@ |
66 |
- |
67 |
-https://bugs.gentoo.org/834664 |
68 |
-https://github.com/draios/sysdig/pull/921 |
69 |
- |
70 |
-Backport for 0.27.1 in lua_parser_api.cpp by: |
71 |
-Holger Hoffstätte <holger@××××××××××××××××××.com> |
72 |
- |
73 |
-From 1147b9a4f6f1f9e97b43735e7980da387837de4a Mon Sep 17 00:00:00 2001 |
74 |
-From: Evgeni Golov <evgeni@×××××.de> |
75 |
-Date: Sun, 27 Aug 2017 13:51:19 +0200 |
76 |
-Subject: [PATCH] fix build with LuaJIT 2.1 betas |
77 |
- |
78 |
-LuaJIT 2.1 drops some compat symbols [1]. And while I think that this is |
79 |
-wrong, as it breaks compatibility with Lua 5.1 [2], it is quite easy to |
80 |
-adopt the code to work with both versions (2.0 and 2.1) of LuaJIT and |
81 |
-remain Lua 5.1 compatible. |
82 |
- |
83 |
-[1] https://github.com/LuaJIT/LuaJIT/commit/dc320ca70f2c5bb3977b82853bcee6dad2523d01 |
84 |
-[2] https://github.com/LuaJIT/LuaJIT/issues/325 |
85 |
- |
86 |
-Signed-off-by: Evgeni Golov <evgeni@×××××.de> |
87 |
-sysdig-CLA-1.0-signed-off-by: Evgeni Golov <evgeni@×××××.de> |
88 |
---- |
89 |
- CMakeLists.txt | 2 +- |
90 |
- userspace/libsinsp/chisel.cpp | 6 +++--- |
91 |
- userspace/libsinsp/lua_parser.cpp | 2 +- |
92 |
- userspace/libsinsp/lua_parser_api.cpp | 2 +- |
93 |
- 4 files changed, 6 insertions(+), 6 deletions(-) |
94 |
- |
95 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
96 |
-index 8613a774d..4f27db9b3 100644 |
97 |
---- a/CMakeLists.txt |
98 |
-+++ b/CMakeLists.txt |
99 |
-@@ -103,7 +103,7 @@ option(USE_BUNDLED_DEPS "Enable bundled dependencies instead of using the system |
100 |
- option(USE_BUNDLED_LUAJIT "Enable building of the bundled LuaJIT" ${USE_BUNDLED_DEPS}) |
101 |
- |
102 |
- if(NOT USE_BUNDLED_LUAJIT) |
103 |
-- find_path(LUAJIT_INCLUDE luajit.h PATH_SUFFIXES luajit-2.0 luajit) |
104 |
-+ find_path(LUAJIT_INCLUDE luajit.h PATH_SUFFIXES luajit-2.1 luajit-2.0 luajit) |
105 |
- find_library(LUAJIT_LIB NAMES luajit luajit-5.1) |
106 |
- if(LUAJIT_INCLUDE AND LUAJIT_LIB) |
107 |
- message(STATUS "Found LuaJIT: include: ${LUAJIT_INCLUDE}, lib: ${LUAJIT_LIB}") |
108 |
-diff --git a/userspace/libsinsp/chisel.cpp b/userspace/libsinsp/chisel.cpp |
109 |
-index 048bedc4e..b2bb8e872 100644 |
110 |
---- a/userspace/libsinsp/chisel.cpp |
111 |
-+++ b/userspace/libsinsp/chisel.cpp |
112 |
-@@ -96,7 +96,7 @@ void lua_stackdump(lua_State *L) |
113 |
- // Lua callbacks |
114 |
- /////////////////////////////////////////////////////////////////////////////// |
115 |
- #ifdef HAS_LUA_CHISELS |
116 |
--const static struct luaL_reg ll_sysdig [] = |
117 |
-+const static struct luaL_Reg ll_sysdig [] = |
118 |
- { |
119 |
- {"set_filter", &lua_cbacks::set_global_filter}, |
120 |
- {"set_snaplen", &lua_cbacks::set_snaplen}, |
121 |
-@@ -124,7 +124,7 @@ const static struct luaL_reg ll_sysdig [] = |
122 |
- {NULL,NULL} |
123 |
- }; |
124 |
- |
125 |
--const static struct luaL_reg ll_chisel [] = |
126 |
-+const static struct luaL_Reg ll_chisel [] = |
127 |
- { |
128 |
- {"request_field", &lua_cbacks::request_field}, |
129 |
- {"set_filter", &lua_cbacks::set_filter}, |
130 |
-@@ -135,7 +135,7 @@ const static struct luaL_reg ll_chisel [] = |
131 |
- {NULL,NULL} |
132 |
- }; |
133 |
- |
134 |
--const static struct luaL_reg ll_evt [] = |
135 |
-+const static struct luaL_Reg ll_evt [] = |
136 |
- { |
137 |
- {"field", &lua_cbacks::field}, |
138 |
- {"get_num", &lua_cbacks::get_num}, |
139 |
-diff --git a/userspace/libsinsp/lua_parser.cpp b/userspace/libsinsp/lua_parser.cpp |
140 |
-index 90a2c664f..55096d157 100644 |
141 |
---- a/userspace/libsinsp/lua_parser.cpp |
142 |
-+++ b/userspace/libsinsp/lua_parser.cpp |
143 |
-@@ -14,7 +14,7 @@ extern "C" { |
144 |
- #include "lauxlib.h" |
145 |
- } |
146 |
- |
147 |
--const static struct luaL_reg ll_filter [] = |
148 |
-+const static struct luaL_Reg ll_filter [] = |
149 |
- { |
150 |
- {"rel_expr", &lua_parser_cbacks::rel_expr}, |
151 |
- {"bool_op", &lua_parser_cbacks::bool_op}, |
152 |
-diff --git a/userspace/libsinsp/lua_parser_api.cpp b/userspace/libsinsp/lua_parser_api.cpp |
153 |
-index 7511814e3..90a3a9fb4 100644 |
154 |
---- a/userspace/libsinsp/lua_parser_api.cpp |
155 |
-+++ b/userspace/libsinsp/lua_parser_api.cpp |
156 |
-@@ -228,7 +228,7 @@ int lua_parser_cbacks::rel_expr(lua_State *ls) |
157 |
- string err = "Got non-table as in-expression operand\n"; |
158 |
- throw sinsp_exception("parser API error"); |
159 |
- } |
160 |
-- int n = luaL_getn(ls, 4); /* get size of table */ |
161 |
-+ int n = (int)lua_objlen(ls, 4); /* get size of table */ |
162 |
- for (i=1; i<=n; i++) |
163 |
- { |
164 |
- lua_rawgeti(ls, 4, i); |
165 |
|
166 |
diff --git a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild |
167 |
deleted file mode 100644 |
168 |
index a31a6e8614d1..000000000000 |
169 |
--- a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild |
170 |
+++ /dev/null |
171 |
@@ -1,81 +0,0 @@ |
172 |
-# Copyright 1999-2022 Gentoo Authors |
173 |
-# Distributed under the terms of the GNU General Public License v2 |
174 |
- |
175 |
-EAPI=7 |
176 |
- |
177 |
-LUA_COMPAT=( luajit ) |
178 |
-# Documentation says this might be needed but since the unmigrated ebuilds |
179 |
-# did not enforce it, nor does this one. |
180 |
-#LUA_REQ_USE="-lua52compat" |
181 |
- |
182 |
-inherit bash-completion-r1 cmake lua-single |
183 |
- |
184 |
-DESCRIPTION="A system exploration and troubleshooting tool" |
185 |
-HOMEPAGE="https://sysdig.com/" |
186 |
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz" |
187 |
- |
188 |
-LICENSE="Apache-2.0" |
189 |
-SLOT="0" |
190 |
-KEYWORDS="~amd64 ~x86" |
191 |
-IUSE="+modules test" |
192 |
-REQUIRED_USE="${LUA_REQUIRED_USE}" |
193 |
-RESTRICT="!test? ( test )" |
194 |
- |
195 |
-RDEPEND="${LUA_DEPS} |
196 |
- app-misc/jq:0= |
197 |
- dev-cpp/tbb:0= |
198 |
- >=dev-libs/jsoncpp-0.6_pre:0= |
199 |
- dev-libs/libb64:0= |
200 |
- dev-libs/protobuf:0= |
201 |
- net-dns/c-ares:0= |
202 |
- net-libs/grpc:0= |
203 |
- sys-libs/ncurses:0= |
204 |
- sys-libs/zlib:0= |
205 |
- dev-libs/openssl:0= |
206 |
- net-misc/curl:0=" |
207 |
-DEPEND="${RDEPEND} |
208 |
- virtual/os-headers |
209 |
- test? ( dev-cpp/gtest )" |
210 |
-PDEPEND=" |
211 |
- modules? ( >=dev-util/sysdig-kmod-${PV} )" |
212 |
- |
213 |
-PATCHES=( |
214 |
- "${FILESDIR}"/${PN}-0.27.1-grpc-absl-sync.patch |
215 |
- "${FILESDIR}"/${PN}-0.27.1-luajit-2.1.patch |
216 |
-) |
217 |
- |
218 |
-src_prepare() { |
219 |
- sed -i -e 's:-ggdb::' CMakeLists.txt || die |
220 |
- |
221 |
- cmake_src_prepare |
222 |
-} |
223 |
- |
224 |
-src_configure() { |
225 |
- local mycmakeargs=( |
226 |
- -DCREATE_TEST_TARGETS=$(usex test) |
227 |
- |
228 |
- # done in dev-util/sysdig-kmod |
229 |
- -DBUILD_DRIVER=OFF |
230 |
- # libscap examples are not installed or really useful |
231 |
- -DBUILD_LIBSCAP_EXAMPLES=OFF |
232 |
- |
233 |
- # unbundle the deps |
234 |
- -DUSE_BUNDLED_DEPS=OFF |
235 |
- |
236 |
- # explicitly set version |
237 |
- -DSYSDIG_VERSION=${PV} |
238 |
- ) |
239 |
- |
240 |
- cmake_src_configure |
241 |
-} |
242 |
- |
243 |
-src_install() { |
244 |
- cmake_src_install |
245 |
- |
246 |
- # remove sources |
247 |
- rm -r "${ED}"/usr/src || die |
248 |
- |
249 |
- # move bashcomp to the proper location |
250 |
- dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die |
251 |
- rm -r "${ED}"/usr/etc || die |
252 |
-} |