Gentoo Archives: gentoo-commits

From: John Helmert III <ajak@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/files/, dev-util/rizin/
Date: Fri, 31 Dec 2021 22:13:34
Message-Id: 1640988792.3e8928e8264ae4783d97f77700a0f747b31d4bab.ajak@gentoo
1 commit: 3e8928e8264ae4783d97f77700a0f747b31d4bab
2 Author: John Helmert III <ajak <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 31 11:52:41 2021 +0000
4 Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 31 22:13:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e8928e8
7
8 dev-util/rizin: drop 0.3.0, 0.3.1-r1
9
10 Bug: https://bugs.gentoo.org/829129
11 Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
12
13 dev-util/rizin/Manifest | 1 -
14 dev-util/rizin/files/rizin-0.3.0-md4-openssl.patch | 100 --------------------
15 dev-util/rizin/rizin-0.3.0.ebuild | 103 ---------------------
16 dev-util/rizin/rizin-0.3.1-r1.ebuild | 102 --------------------
17 4 files changed, 306 deletions(-)
18
19 diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
20 index c6d198b9cfd0..fe5e33e3c58b 100644
21 --- a/dev-util/rizin/Manifest
22 +++ b/dev-util/rizin/Manifest
23 @@ -1,4 +1,3 @@
24 -DIST rizin-src-v0.3.0.tar.xz 64097204 BLAKE2B 308037ce60ec6523f337580221ea265c912ff92032fc5e1c2ab37430eae5a16cc2e8efa74447a79735c7814a35d3b08e5fc2f548612a1553c5edc2f314d22df5 SHA512 68f71e612bd4df90c79ebd4cb26c3e09bb370ccd9e51f574f2687f940b3934d9bf417108f3f7e678cabc6ddba7402e0420aab569c24316e07b2b56ed33153ed3
25 DIST rizin-src-v0.3.1.tar.xz 64089580 BLAKE2B 04f7e3cfa20a787f47af90c78405f295b346cc0c7d81164ff01bc6a69df526f3f9112ab4cb62092297ae2dda1fa738a2e7feff35e0f1b7f3e7467a8c6e4d1a1e SHA512 743f8f2c9ddb045f39147de9ad971d47f1a26bfcc233f41c12c64ade5e31c992104cf3f93c44c5035142b554779e895224b68f839cd87a59aaf344b4ec88d5fe
26 DIST rizin-src-v0.3.2.tar.xz 64170200 BLAKE2B fe11317e4acc1a803323f42fd4c2c6435a2fe4032581ed509f37f7221ec53e0afac04ebe8cb9da693ac283b61c0a70e135007d635c4c5010519a5c7e7cfa19cf SHA512 c472770ee1b156d42a98d4641f365e2255f16489b2223b117c8b88dcac0d72065d1fd7eedad70046188231889e492bafb7b8462987c68311143f14808eaab1cc
27 DIST rizin-testbins-d66fa0feaf3b1ecdad261ca17542f1d5d0b101cc.tar.gz 126773703 BLAKE2B f5eaeb7e99e9091b6ca043dd50d03143950adc06b75b5834886d96d6280207c0bea73101a5f9e06c38ba60c0d4cff82dbf1f00364f7d87fe183c0687b06d1904 SHA512 0a017954017c8d57133d51b441411a50aa9ed062c0cc61e1561951fdf0703f5244230cda377885199e9e35dca6780d8582a445ac92286b63ef2ac784777ec0c4
28
29 diff --git a/dev-util/rizin/files/rizin-0.3.0-md4-openssl.patch b/dev-util/rizin/files/rizin-0.3.0-md4-openssl.patch
30 deleted file mode 100644
31 index d2c3135d1c72..000000000000
32 --- a/dev-util/rizin/files/rizin-0.3.0-md4-openssl.patch
33 +++ /dev/null
34 @@ -1,100 +0,0 @@
35 -From 6a1edf5fb6967d57d1dcc8cf21ea3a6bbdf8a5b8 Mon Sep 17 00:00:00 2001
36 -From: wargio <wargio@××××××.it>
37 -Date: Sat, 2 Oct 2021 22:36:32 +0200
38 -Subject: [PATCH 1/2] Fix nullptr due missing small_block method when openssl
39 - is used.
40 -
41 ----
42 - librz/hash/algorithms/openssl_common.h | 42 ++++++++++++++++++++++++++
43 - 1 file changed, 42 insertions(+)
44 -
45 -diff --git a/librz/hash/algorithms/openssl_common.h b/librz/hash/algorithms/openssl_common.h
46 -index b29a1ae1221..e2399cff68d 100644
47 ---- a/librz/hash/algorithms/openssl_common.h
48 -+++ b/librz/hash/algorithms/openssl_common.h
49 -@@ -76,6 +76,46 @@ EVP_sha512
50 - return true; \
51 - }
52 -
53 -+#define rz_openssl_plugin_small_block(pluginname, evpmd) \
54 -+ static bool openssl_plugin_##pluginname##_small_block(const ut8 *data, ut64 size, ut8 **digest, RzMsgDigestSize *digest_size) { \
55 -+ rz_return_val_if_fail(data &&digest, false); \
56 -+ const EVP_MD *evp_md = evpmd(); \
57 -+ if (!evp_md) { \
58 -+ return false; \
59 -+ } \
60 -+ RzMsgDigestSize dgst_size = EVP_MD_size(evp_md); \
61 -+ ut8 *dgst = malloc(dgst_size); \
62 -+ if (!dgst) { \
63 -+ return false; \
64 -+ } \
65 -+ EVP_MD_CTX *context = EVP_MD_CTX_new(); \
66 -+ if (!context) { \
67 -+ free(dgst); \
68 -+ return false; \
69 -+ } \
70 -+ if (EVP_DigestInit_ex(context, evp_md, NULL) != 1) { \
71 -+ EVP_MD_CTX_free(context); \
72 -+ free(dgst); \
73 -+ return false; \
74 -+ } \
75 -+ if (EVP_DigestUpdate(context, data, size) != 1) { \
76 -+ EVP_MD_CTX_free(context); \
77 -+ free(dgst); \
78 -+ return false; \
79 -+ } \
80 -+ if (EVP_DigestFinal_ex(context, dgst, NULL) != 1) { \
81 -+ EVP_MD_CTX_free(context); \
82 -+ free(dgst); \
83 -+ return false; \
84 -+ } \
85 -+ *digest = dgst; \
86 -+ if (digest_size) { \
87 -+ *digest_size = dgst_size; \
88 -+ } \
89 -+ EVP_MD_CTX_free(context); \
90 -+ return true; \
91 -+ }
92 -+
93 - #define rz_openssl_plugin_define_msg_digest(pluginname, evpmd, canhmac) \
94 - rz_openssl_plugin_context_new(pluginname); \
95 - rz_openssl_plugin_context_free(pluginname); \
96 -@@ -84,6 +124,7 @@ EVP_sha512
97 - rz_openssl_plugin_init(pluginname, evpmd); \
98 - rz_openssl_plugin_update(pluginname); \
99 - rz_openssl_plugin_final(pluginname); \
100 -+ rz_openssl_plugin_small_block(pluginname, evpmd); \
101 - RzMsgDigestPlugin rz_msg_digest_plugin_##pluginname = { \
102 - .name = #pluginname, \
103 - .license = "Apache 2.0", \
104 -@@ -96,6 +137,7 @@ EVP_sha512
105 - .init = openssl_plugin_##pluginname##_init, \
106 - .update = openssl_plugin_##pluginname##_update, \
107 - .final = openssl_plugin_##pluginname##_final, \
108 -+ .small_block = openssl_plugin_##pluginname##_small_block, \
109 - }
110 -
111 - #endif /* RZ_OPENSSL_COMMON_H */
112 -
113 -From f4a8e2c86be861f33327c2a8f1d181b42232069e Mon Sep 17 00:00:00 2001
114 -From: wargio <wargio@××××××.it>
115 -Date: Sat, 2 Oct 2021 23:07:54 +0200
116 -Subject: [PATCH 2/2] Fix style
117 -
118 ----
119 - librz/hash/algorithms/openssl_common.h | 2 +-
120 - 1 file changed, 1 insertion(+), 1 deletion(-)
121 -
122 -diff --git a/librz/hash/algorithms/openssl_common.h b/librz/hash/algorithms/openssl_common.h
123 -index e2399cff68d..0091fef2fa3 100644
124 ---- a/librz/hash/algorithms/openssl_common.h
125 -+++ b/librz/hash/algorithms/openssl_common.h
126 -@@ -78,7 +78,7 @@ EVP_sha512
127 -
128 - #define rz_openssl_plugin_small_block(pluginname, evpmd) \
129 - static bool openssl_plugin_##pluginname##_small_block(const ut8 *data, ut64 size, ut8 **digest, RzMsgDigestSize *digest_size) { \
130 -- rz_return_val_if_fail(data &&digest, false); \
131 -+ rz_return_val_if_fail((data) && (digest), false); \
132 - const EVP_MD *evp_md = evpmd(); \
133 - if (!evp_md) { \
134 - return false; \
135
136 diff --git a/dev-util/rizin/rizin-0.3.0.ebuild b/dev-util/rizin/rizin-0.3.0.ebuild
137 deleted file mode 100644
138 index 0ac6575d67e4..000000000000
139 --- a/dev-util/rizin/rizin-0.3.0.ebuild
140 +++ /dev/null
141 @@ -1,103 +0,0 @@
142 -# Copyright 1999-2021 Gentoo Authors
143 -# Distributed under the terms of the GNU General Public License v2
144 -
145 -EAPI=7
146 -
147 -PYTHON_COMPAT=(python3_{8,9,10})
148 -
149 -# This is the commit that the CI for the release commit used
150 -BINS_COMMIT="d4cee85f3e94f1151dc9ff1681555ebcff7931f0"
151 -
152 -inherit meson python-any-r1
153 -
154 -DESCRIPTION="reverse engineering framework for binary analysis"
155 -HOMEPAGE="https://rizin.re/"
156 -
157 -SRC_URI="https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz"
158 - #test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
159 -KEYWORDS="~amd64 ~arm64 ~x86"
160 -
161 -LICENSE="Apache-2.0 BSD LGPL-3 MIT"
162 -SLOT="0"
163 -IUSE="test"
164 -
165 -# Need to audit licenses of the binaries used for testing
166 -RESTRICT="test"
167 -
168 -RDEPEND="
169 - sys-apps/file
170 - app-arch/lz4:0=
171 - dev-libs/capstone:0=
172 - dev-libs/libuv:0=
173 - dev-libs/libzip:0=
174 - dev-libs/openssl:0=
175 - >=dev-libs/tree-sitter-0.19.0
176 - dev-libs/xxhash
177 - sys-libs/zlib:0=
178 -"
179 -DEPEND="${RDEPEND}"
180 -BDEPEND="${PYTHON_DEPS}"
181 -
182 -PATCHES=(
183 - "${FILESDIR}/${PN}-${PV}-typedb-prefix.patch"
184 - "${FILESDIR}/${PN}-${PV}-md4-openssl.patch"
185 -)
186 -
187 -S="${WORKDIR}/${PN}-v${PV}"
188 -
189 -src_prepare() {
190 - default
191 -
192 - local py_to_mangle=(
193 - librz/core/cmd_descs/cmd_descs_generate.py
194 - subprojects/lz4-1.9.3/contrib/meson/meson/GetLz4LibraryVersion.py
195 - subprojects/lz4-1.9.3/contrib/meson/meson/InstallSymlink.py
196 - subprojects/lz4-1.9.3/tests/test-lz4-list.py
197 - subprojects/lz4-1.9.3/tests/test-lz4-speed.py
198 - subprojects/lz4-1.9.3/tests/test-lz4-versions.py
199 - sys/clang-format.py
200 - test/fuzz/scripts/fuzz_rz_asm.py
201 - test/scripts/gdbserver.py
202 - )
203 -
204 - python_fix_shebang "${py_to_mangle[@]}"
205 -
206 - if use test; then
207 - cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
208 - cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
209 - fi
210 -}
211 -
212 -src_configure() {
213 - local emesonargs=(
214 - -Dcli=enabled
215 - -Duse_sys_capstone=enabled
216 - -Duse_sys_magic=enabled
217 - -Duse_sys_libzip=enabled
218 - -Duse_sys_zlib=enabled
219 - -Duse_sys_lz4=enabled
220 - -Duse_sys_xxhash=enabled
221 - -Duse_sys_openssl=enabled
222 - -Duse_sys_tree_sitter=enabled
223 -
224 - $(meson_use test enable_tests)
225 - $(meson_use test enable_rz_test)
226 - )
227 - meson_src_configure
228 -}
229 -
230 -src_test() {
231 - # Rizin uses data files that it expects to be installed on the
232 - # system. To hack around this, we create a tree of what it expects
233 - # in ${T}, and patch the tests to support a prefix from the
234 - # environment. https://github.com/rizinorg/rizin/issues/1789
235 - mkdir -p "${T}/usr/share/${PN}/${PV}" || die
236 - ln -sf "${BUILD_DIR}/librz/analysis/d" "${T}/usr/share/${PN}/${PV}/types" || die
237 - ln -sf "${BUILD_DIR}/librz/syscall/d" "${T}/usr/share/${PN}/${PV}/syscall" || die
238 - ln -sf "${BUILD_DIR}/librz/asm/d" "${T}/usr/share/${PN}/${PV}/opcodes" || die
239 - # https://github.com/rizinorg/rizin/issues/1797
240 - ln -sf "${BUILD_DIR}/librz/flag/d" "${T}/usr/share/${PN}/${PV}/flag" || die
241 - export RZ_PREFIX="${T}/usr"
242 -
243 - meson_src_test
244 -}
245
246 diff --git a/dev-util/rizin/rizin-0.3.1-r1.ebuild b/dev-util/rizin/rizin-0.3.1-r1.ebuild
247 deleted file mode 100644
248 index 84113bbf4057..000000000000
249 --- a/dev-util/rizin/rizin-0.3.1-r1.ebuild
250 +++ /dev/null
251 @@ -1,102 +0,0 @@
252 -# Copyright 1999-2021 Gentoo Authors
253 -# Distributed under the terms of the GNU General Public License v2
254 -
255 -EAPI=8
256 -
257 -PYTHON_COMPAT=(python3_{8,9,10})
258 -
259 -# This is the commit that the CI for the release commit used
260 -BINS_COMMIT="74b6e4511112b1a6abc571091efc32ec2a7d98a6"
261 -
262 -inherit meson python-any-r1
263 -
264 -DESCRIPTION="reverse engineering framework for binary analysis"
265 -HOMEPAGE="https://rizin.re/"
266 -
267 -SRC_URI="https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz"
268 - #test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
269 -KEYWORDS="~amd64 ~arm64 ~x86"
270 -
271 -LICENSE="Apache-2.0 BSD LGPL-3 MIT"
272 -SLOT="0/${PV}"
273 -IUSE="test"
274 -
275 -# Need to audit licenses of the binaries used for testing
276 -RESTRICT="test"
277 -
278 -RDEPEND="
279 - sys-apps/file
280 - app-arch/lz4:0=
281 - dev-libs/capstone:0=
282 - dev-libs/libuv:0=
283 - dev-libs/libzip:0=
284 - dev-libs/openssl:0=
285 - >=dev-libs/tree-sitter-0.19.0
286 - dev-libs/xxhash
287 - sys-libs/zlib:0=
288 -"
289 -DEPEND="${RDEPEND}"
290 -BDEPEND="${PYTHON_DEPS}"
291 -
292 -PATCHES=(
293 - "${FILESDIR}/${PN}-0.3.0-typedb-prefix.patch"
294 -)
295 -
296 -S="${WORKDIR}/${PN}-v${PV}"
297 -
298 -src_prepare() {
299 - default
300 -
301 - local py_to_mangle=(
302 - librz/core/cmd_descs/cmd_descs_generate.py
303 - subprojects/lz4-1.9.3/contrib/meson/meson/GetLz4LibraryVersion.py
304 - subprojects/lz4-1.9.3/contrib/meson/meson/InstallSymlink.py
305 - subprojects/lz4-1.9.3/tests/test-lz4-list.py
306 - subprojects/lz4-1.9.3/tests/test-lz4-speed.py
307 - subprojects/lz4-1.9.3/tests/test-lz4-versions.py
308 - sys/clang-format.py
309 - test/fuzz/scripts/fuzz_rz_asm.py
310 - test/scripts/gdbserver.py
311 - )
312 -
313 - python_fix_shebang "${py_to_mangle[@]}"
314 -
315 - if use test; then
316 - cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
317 - cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
318 - fi
319 -}
320 -
321 -src_configure() {
322 - local emesonargs=(
323 - -Dcli=enabled
324 - -Duse_sys_capstone=enabled
325 - -Duse_sys_magic=enabled
326 - -Duse_sys_libzip=enabled
327 - -Duse_sys_zlib=enabled
328 - -Duse_sys_lz4=enabled
329 - -Duse_sys_xxhash=enabled
330 - -Duse_sys_openssl=enabled
331 - -Duse_sys_tree_sitter=enabled
332 -
333 - $(meson_use test enable_tests)
334 - $(meson_use test enable_rz_test)
335 - )
336 - meson_src_configure
337 -}
338 -
339 -src_test() {
340 - # Rizin uses data files that it expects to be installed on the
341 - # system. To hack around this, we create a tree of what it expects
342 - # in ${T}, and patch the tests to support a prefix from the
343 - # environment. https://github.com/rizinorg/rizin/issues/1789
344 - mkdir -p "${T}/usr/share/${PN}/${PV}" || die
345 - ln -sf "${BUILD_DIR}/librz/analysis/d" "${T}/usr/share/${PN}/${PV}/types" || die
346 - ln -sf "${BUILD_DIR}/librz/syscall/d" "${T}/usr/share/${PN}/${PV}/syscall" || die
347 - ln -sf "${BUILD_DIR}/librz/asm/d" "${T}/usr/share/${PN}/${PV}/opcodes" || die
348 - # https://github.com/rizinorg/rizin/issues/1797
349 - ln -sf "${BUILD_DIR}/librz/flag/d" "${T}/usr/share/${PN}/${PV}/flag" || die
350 - export RZ_PREFIX="${T}/usr"
351 -
352 - meson_src_test
353 -}