* [gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/files/, dev-util/rizin/
@ 2021-06-04 9:31 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2021-06-04 9:31 UTC (permalink / raw
To: gentoo-commits
commit: 5f37a5d8d047c32806eefc0d6da6a3101d03816d
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 4 09:31:18 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jun 4 09:31:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f37a5d8
dev-util/rizin: disable rzpipe test
The test relies on `rizin` presence in PATH. This means test run fails
on first install attempt of rizin. Let's disable test test until it's
sorted out upstream.
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch | 14 ++++++++++++++
dev-util/rizin/rizin-0.2.1.ebuild | 2 ++
2 files changed, 16 insertions(+)
diff --git a/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch b/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch
new file mode 100644
index 00000000000..3e7a6cc70c1
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch
@@ -0,0 +1,14 @@
+https://github.com/rizinorg/rizin/issues/1192
+--- a/test/unit/test_rzpipe.c
++++ b/test/unit/test_rzpipe.c
+@@ -30,7 +30,9 @@ static bool test_rzpipe_404(void) {
+ }
+
+ static int all_tests() {
+- mu_run_test(test_rzpipe);
++ // Disabled in Genoo, relies on `rizin` binary in $PATH:
++ // https://github.com/rizinorg/rizin/issues/1192
++ //mu_run_test(test_rzpipe);
+ mu_run_test(test_rzpipe_404);
+ return tests_passed != tests_run;
+ }
diff --git a/dev-util/rizin/rizin-0.2.1.ebuild b/dev-util/rizin/rizin-0.2.1.ebuild
index 7f58bcca359..08ed3c5435e 100644
--- a/dev-util/rizin/rizin-0.2.1.ebuild
+++ b/dev-util/rizin/rizin-0.2.1.ebuild
@@ -36,6 +36,8 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="${PYTHON_DEPS}"
+PATCHES=("${FILESDIR}"/${PN}-0.2.1-no-rzpipe.patch)
+
S="${WORKDIR}/${PN}-v${PV}"
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/files/, dev-util/rizin/
@ 2021-10-05 20:40 John Helmert III
0 siblings, 0 replies; 5+ messages in thread
From: John Helmert III @ 2021-10-05 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 412eaec7e9d11870fb4b831213d93f422b6b613c
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 5 20:35:25 2021 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Oct 5 20:40:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=412eaec7
dev-util/rizin: add 0.3.0
Note that tests are restricted due to uncertainty about the licenses
of the test binaries.
Bug: https://bugs.gentoo.org/792357
Bug: https://bugs.gentoo.org/807067
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
dev-util/rizin/Manifest | 1 +
dev-util/rizin/files/rizin-0.3.0-md4-openssl.patch | 100 ++++++++++++++++
.../rizin/files/rizin-0.3.0-typedb-prefix.patch | 132 +++++++++++++++++++++
dev-util/rizin/rizin-0.3.0.ebuild | 103 ++++++++++++++++
4 files changed, 336 insertions(+)
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 1327734a460..1b95d38c2f3 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,2 +1,3 @@
DIST rizin-src-v0.2.1.tar.xz 51439132 BLAKE2B 3ce048c5e93afa43b33bb7c36e7f7a96734886a44a67339c18b36de84b6e3dd015aa49fd048815bc7cb26a39bd3c44ebd00227fdb0c3dc9d9f07ff2ff1f1948d SHA512 4d0a68971a8fe1de3860f8ee18197606f59c22d4c24f3fcce691c73b45c8fe8c356a9b411604e9c3d4e5bb01f695b6ead32cdc217134eb4ddfec76867c16c327
+DIST rizin-src-v0.3.0.tar.xz 64097204 BLAKE2B 308037ce60ec6523f337580221ea265c912ff92032fc5e1c2ab37430eae5a16cc2e8efa74447a79735c7814a35d3b08e5fc2f548612a1553c5edc2f314d22df5 SHA512 68f71e612bd4df90c79ebd4cb26c3e09bb370ccd9e51f574f2687f940b3934d9bf417108f3f7e678cabc6ddba7402e0420aab569c24316e07b2b56ed33153ed3
DIST rizin-testbins-a80fd0d56d538d07a05ef01e29c8cb430a4f9d72.tar.gz 119214206 BLAKE2B 33916d466d77aaa0aeb6b221529a570a2bd2ad07b59b45967d75a84e3efbbc8ca3b8fff9cd88d61598b4e785ead2f8bc58eb7c1cb31007c27e497d80f36e4d2d SHA512 9b01a63ff281ac19b427e715d669e6080c4afdfd777ae762c30537c59bd2cdc2865adc1b34ccb61430b172e54995375b48bb35fd88f098b6a9839e9f3669fde4
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
new file mode 100644
index 00000000000..d2c3135d1c7
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.3.0-md4-openssl.patch
@@ -0,0 +1,100 @@
+From 6a1edf5fb6967d57d1dcc8cf21ea3a6bbdf8a5b8 Mon Sep 17 00:00:00 2001
+From: wargio <wargio@libero.it>
+Date: Sat, 2 Oct 2021 22:36:32 +0200
+Subject: [PATCH 1/2] Fix nullptr due missing small_block method when openssl
+ is used.
+
+---
+ librz/hash/algorithms/openssl_common.h | 42 ++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+diff --git a/librz/hash/algorithms/openssl_common.h b/librz/hash/algorithms/openssl_common.h
+index b29a1ae1221..e2399cff68d 100644
+--- a/librz/hash/algorithms/openssl_common.h
++++ b/librz/hash/algorithms/openssl_common.h
+@@ -76,6 +76,46 @@ EVP_sha512
+ return true; \
+ }
+
++#define rz_openssl_plugin_small_block(pluginname, evpmd) \
++ static bool openssl_plugin_##pluginname##_small_block(const ut8 *data, ut64 size, ut8 **digest, RzMsgDigestSize *digest_size) { \
++ rz_return_val_if_fail(data &&digest, false); \
++ const EVP_MD *evp_md = evpmd(); \
++ if (!evp_md) { \
++ return false; \
++ } \
++ RzMsgDigestSize dgst_size = EVP_MD_size(evp_md); \
++ ut8 *dgst = malloc(dgst_size); \
++ if (!dgst) { \
++ return false; \
++ } \
++ EVP_MD_CTX *context = EVP_MD_CTX_new(); \
++ if (!context) { \
++ free(dgst); \
++ return false; \
++ } \
++ if (EVP_DigestInit_ex(context, evp_md, NULL) != 1) { \
++ EVP_MD_CTX_free(context); \
++ free(dgst); \
++ return false; \
++ } \
++ if (EVP_DigestUpdate(context, data, size) != 1) { \
++ EVP_MD_CTX_free(context); \
++ free(dgst); \
++ return false; \
++ } \
++ if (EVP_DigestFinal_ex(context, dgst, NULL) != 1) { \
++ EVP_MD_CTX_free(context); \
++ free(dgst); \
++ return false; \
++ } \
++ *digest = dgst; \
++ if (digest_size) { \
++ *digest_size = dgst_size; \
++ } \
++ EVP_MD_CTX_free(context); \
++ return true; \
++ }
++
+ #define rz_openssl_plugin_define_msg_digest(pluginname, evpmd, canhmac) \
+ rz_openssl_plugin_context_new(pluginname); \
+ rz_openssl_plugin_context_free(pluginname); \
+@@ -84,6 +124,7 @@ EVP_sha512
+ rz_openssl_plugin_init(pluginname, evpmd); \
+ rz_openssl_plugin_update(pluginname); \
+ rz_openssl_plugin_final(pluginname); \
++ rz_openssl_plugin_small_block(pluginname, evpmd); \
+ RzMsgDigestPlugin rz_msg_digest_plugin_##pluginname = { \
+ .name = #pluginname, \
+ .license = "Apache 2.0", \
+@@ -96,6 +137,7 @@ EVP_sha512
+ .init = openssl_plugin_##pluginname##_init, \
+ .update = openssl_plugin_##pluginname##_update, \
+ .final = openssl_plugin_##pluginname##_final, \
++ .small_block = openssl_plugin_##pluginname##_small_block, \
+ }
+
+ #endif /* RZ_OPENSSL_COMMON_H */
+
+From f4a8e2c86be861f33327c2a8f1d181b42232069e Mon Sep 17 00:00:00 2001
+From: wargio <wargio@libero.it>
+Date: Sat, 2 Oct 2021 23:07:54 +0200
+Subject: [PATCH 2/2] Fix style
+
+---
+ librz/hash/algorithms/openssl_common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/librz/hash/algorithms/openssl_common.h b/librz/hash/algorithms/openssl_common.h
+index e2399cff68d..0091fef2fa3 100644
+--- a/librz/hash/algorithms/openssl_common.h
++++ b/librz/hash/algorithms/openssl_common.h
+@@ -78,7 +78,7 @@ EVP_sha512
+
+ #define rz_openssl_plugin_small_block(pluginname, evpmd) \
+ static bool openssl_plugin_##pluginname##_small_block(const ut8 *data, ut64 size, ut8 **digest, RzMsgDigestSize *digest_size) { \
+- rz_return_val_if_fail(data &&digest, false); \
++ rz_return_val_if_fail((data) && (digest), false); \
+ const EVP_MD *evp_md = evpmd(); \
+ if (!evp_md) { \
+ return false; \
diff --git a/dev-util/rizin/files/rizin-0.3.0-typedb-prefix.patch b/dev-util/rizin/files/rizin-0.3.0-typedb-prefix.patch
new file mode 100644
index 00000000000..dfb86447df7
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.3.0-typedb-prefix.patch
@@ -0,0 +1,132 @@
+https://github.com/rizinorg/rizin/issues/1789
+
+Signed-off-by: Florian Märkl <info@florianmaerkl.de>
+
+diff --git a/test/unit/test_serialize_analysis.c b/test/unit/test_serialize_analysis.c
+index 51092c067..0d714ba90 100644
+--- a/test/unit/test_serialize_analysis.c
++++ b/test/unit/test_serialize_analysis.c
+@@ -546,7 +546,10 @@ Sdb *vars_ref_db() {
+ }
+
+ bool test_analysis_var_save() {
+- const char *dir_prefix = rz_sys_prefix(NULL);
++ const char *dir_prefix = getenv("RZ_PREFIX");
++ if (!dir_prefix) {
++ dir_prefix = rz_sys_prefix(NULL);
++ }
+ RzAnalysis *analysis = rz_analysis_new();
+ rz_analysis_use(analysis, "x86");
+ rz_analysis_set_bits(analysis, 64);
+diff --git a/test/unit/test_type.c b/test/unit/test_type.c
+index d8a3d9c5f..3956a800b 100644
+--- a/test/unit/test_type.c
++++ b/test/unit/test_type.c
+@@ -379,7 +379,10 @@ static bool test_enum_types(void) {
+ RzTypeDB *typedb = rz_type_db_new();
+ mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
+ mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
+- const char *dir_prefix = rz_sys_prefix(NULL);
++ const char *dir_prefix = getenv("RZ_PREFIX");
++ if (!dir_prefix) {
++ dir_prefix = rz_sys_prefix(NULL);
++ }
+ rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
+
+ char *error_msg = NULL;
+@@ -417,7 +420,10 @@ static bool test_const_types(void) {
+ RzTypeDB *typedb = rz_type_db_new();
+ mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
+ mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
+- const char *dir_prefix = rz_sys_prefix(NULL);
++ const char *dir_prefix = getenv("RZ_PREFIX");
++ if (!dir_prefix) {
++ dir_prefix = rz_sys_prefix(NULL);
++ }
+ rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
+
+ char *error_msg = NULL;
+@@ -469,7 +475,10 @@ static bool test_type_as_string(void) {
+ RzTypeDB *typedb = rz_type_db_new();
+ mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
+ mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
+- const char *dir_prefix = rz_sys_prefix(NULL);
++ const char *dir_prefix = getenv("RZ_PREFIX");
++ if (!dir_prefix) {
++ dir_prefix = rz_sys_prefix(NULL);
++ }
+ rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
+
+ char *error_msg = NULL;
+@@ -516,7 +525,10 @@ static bool test_array_types(void) {
+ RzTypeDB *typedb = rz_type_db_new();
+ mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
+ mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
+- const char *dir_prefix = rz_sys_prefix(NULL);
++ const char *dir_prefix = getenv("RZ_PREFIX");
++ if (!dir_prefix) {
++ dir_prefix = rz_sys_prefix(NULL);
++ }
+ rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
+
+ char *error_msg = NULL;
+@@ -569,7 +581,10 @@ static bool test_struct_func_types(void) {
+ RzTypeDB *typedb = rz_type_db_new();
+ mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
+ mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
+- const char *dir_prefix = rz_sys_prefix(NULL);
++ const char *dir_prefix = getenv("RZ_PREFIX");
++ if (!dir_prefix) {
++ dir_prefix = rz_sys_prefix(NULL);
++ }
+ rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
+
+ char *error_msg = NULL;
+@@ -659,7 +674,10 @@ static bool test_struct_array_types(void) {
+ RzTypeDB *typedb = rz_type_db_new();
+ mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
+ mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
+- const char *dir_prefix = rz_sys_prefix(NULL);
++ const char *dir_prefix = getenv("RZ_PREFIX");
++ if (!dir_prefix) {
++ dir_prefix = rz_sys_prefix(NULL);
++ }
+ rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
+
+ char *error_msg = NULL;
+@@ -707,7 +725,10 @@ static bool test_struct_identifier_without_specifier(void) {
+ RzTypeDB *typedb = rz_type_db_new();
+ mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
+ mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
+- const char *dir_prefix = rz_sys_prefix(NULL);
++ const char *dir_prefix = getenv("RZ_PREFIX");
++ if (!dir_prefix) {
++ dir_prefix = rz_sys_prefix(NULL);
++ }
+ rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
+
+ char *error_msg = NULL;
+@@ -735,7 +756,10 @@ static bool test_union_identifier_without_specifier(void) {
+ RzTypeDB *typedb = rz_type_db_new();
+ mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
+ mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
+- const char *dir_prefix = rz_sys_prefix(NULL);
++ const char *dir_prefix = getenv("RZ_PREFIX");
++ if (!dir_prefix) {
++ dir_prefix = rz_sys_prefix(NULL);
++ }
+ rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
+
+ char *error_msg = NULL;
+@@ -767,7 +791,10 @@ static bool test_edit_types(void) {
+ RzTypeDB *typedb = rz_type_db_new();
+ mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
+ mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
+- const char *dir_prefix = rz_sys_prefix(NULL);
++ const char *dir_prefix = getenv("RZ_PREFIX");
++ if (!dir_prefix) {
++ dir_prefix = rz_sys_prefix(NULL);
++ }
+ rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
+
+ char *error_msg = NULL;
diff --git a/dev-util/rizin/rizin-0.3.0.ebuild b/dev-util/rizin/rizin-0.3.0.ebuild
new file mode 100644
index 00000000000..0ac6575d67e
--- /dev/null
+++ b/dev-util/rizin/rizin-0.3.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{8,9,10})
+
+# This is the commit that the CI for the release commit used
+BINS_COMMIT="d4cee85f3e94f1151dc9ff1681555ebcff7931f0"
+
+inherit meson python-any-r1
+
+DESCRIPTION="reverse engineering framework for binary analysis"
+HOMEPAGE="https://rizin.re/"
+
+SRC_URI="https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz"
+ #test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0"
+IUSE="test"
+
+# Need to audit licenses of the binaries used for testing
+RESTRICT="test"
+
+RDEPEND="
+ sys-apps/file
+ app-arch/lz4:0=
+ dev-libs/capstone:0=
+ dev-libs/libuv:0=
+ dev-libs/libzip:0=
+ dev-libs/openssl:0=
+ >=dev-libs/tree-sitter-0.19.0
+ dev-libs/xxhash
+ sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-${PV}-typedb-prefix.patch"
+ "${FILESDIR}/${PN}-${PV}-md4-openssl.patch"
+)
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_prepare() {
+ default
+
+ local py_to_mangle=(
+ librz/core/cmd_descs/cmd_descs_generate.py
+ subprojects/lz4-1.9.3/contrib/meson/meson/GetLz4LibraryVersion.py
+ subprojects/lz4-1.9.3/contrib/meson/meson/InstallSymlink.py
+ subprojects/lz4-1.9.3/tests/test-lz4-list.py
+ subprojects/lz4-1.9.3/tests/test-lz4-speed.py
+ subprojects/lz4-1.9.3/tests/test-lz4-versions.py
+ sys/clang-format.py
+ test/fuzz/scripts/fuzz_rz_asm.py
+ test/scripts/gdbserver.py
+ )
+
+ python_fix_shebang "${py_to_mangle[@]}"
+
+ if use test; then
+ cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
+ cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
+ fi
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dcli=enabled
+ -Duse_sys_capstone=enabled
+ -Duse_sys_magic=enabled
+ -Duse_sys_libzip=enabled
+ -Duse_sys_zlib=enabled
+ -Duse_sys_lz4=enabled
+ -Duse_sys_xxhash=enabled
+ -Duse_sys_openssl=enabled
+ -Duse_sys_tree_sitter=enabled
+
+ $(meson_use test enable_tests)
+ $(meson_use test enable_rz_test)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ # Rizin uses data files that it expects to be installed on the
+ # system. To hack around this, we create a tree of what it expects
+ # in ${T}, and patch the tests to support a prefix from the
+ # environment. https://github.com/rizinorg/rizin/issues/1789
+ mkdir -p "${T}/usr/share/${PN}/${PV}" || die
+ ln -sf "${BUILD_DIR}/librz/analysis/d" "${T}/usr/share/${PN}/${PV}/types" || die
+ ln -sf "${BUILD_DIR}/librz/syscall/d" "${T}/usr/share/${PN}/${PV}/syscall" || die
+ ln -sf "${BUILD_DIR}/librz/asm/d" "${T}/usr/share/${PN}/${PV}/opcodes" || die
+ # https://github.com/rizinorg/rizin/issues/1797
+ ln -sf "${BUILD_DIR}/librz/flag/d" "${T}/usr/share/${PN}/${PV}/flag" || die
+ export RZ_PREFIX="${T}/usr"
+
+ meson_src_test
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/files/, dev-util/rizin/
@ 2021-10-17 16:08 John Helmert III
0 siblings, 0 replies; 5+ messages in thread
From: John Helmert III @ 2021-10-17 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 64ff47121444571971ac7092180f61cd07bbf58f
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 14:09:23 2021 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 16:08:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ff4712
dev-util/rizin: drop 0.2.1
Bug: https://bugs.gentoo.org/807067
Bug: https://bugs.gentoo.org/792357
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
dev-util/rizin/Manifest | 2 -
dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch | 14 ----
dev-util/rizin/rizin-0.2.1.ebuild | 81 ------------------------
3 files changed, 97 deletions(-)
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 1b95d38c2f3..2820a9c4eb5 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,3 +1 @@
-DIST rizin-src-v0.2.1.tar.xz 51439132 BLAKE2B 3ce048c5e93afa43b33bb7c36e7f7a96734886a44a67339c18b36de84b6e3dd015aa49fd048815bc7cb26a39bd3c44ebd00227fdb0c3dc9d9f07ff2ff1f1948d SHA512 4d0a68971a8fe1de3860f8ee18197606f59c22d4c24f3fcce691c73b45c8fe8c356a9b411604e9c3d4e5bb01f695b6ead32cdc217134eb4ddfec76867c16c327
DIST rizin-src-v0.3.0.tar.xz 64097204 BLAKE2B 308037ce60ec6523f337580221ea265c912ff92032fc5e1c2ab37430eae5a16cc2e8efa74447a79735c7814a35d3b08e5fc2f548612a1553c5edc2f314d22df5 SHA512 68f71e612bd4df90c79ebd4cb26c3e09bb370ccd9e51f574f2687f940b3934d9bf417108f3f7e678cabc6ddba7402e0420aab569c24316e07b2b56ed33153ed3
-DIST rizin-testbins-a80fd0d56d538d07a05ef01e29c8cb430a4f9d72.tar.gz 119214206 BLAKE2B 33916d466d77aaa0aeb6b221529a570a2bd2ad07b59b45967d75a84e3efbbc8ca3b8fff9cd88d61598b4e785ead2f8bc58eb7c1cb31007c27e497d80f36e4d2d SHA512 9b01a63ff281ac19b427e715d669e6080c4afdfd777ae762c30537c59bd2cdc2865adc1b34ccb61430b172e54995375b48bb35fd88f098b6a9839e9f3669fde4
diff --git a/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch b/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch
deleted file mode 100644
index 3e7a6cc70c1..00000000000
--- a/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/rizinorg/rizin/issues/1192
---- a/test/unit/test_rzpipe.c
-+++ b/test/unit/test_rzpipe.c
-@@ -30,7 +30,9 @@ static bool test_rzpipe_404(void) {
- }
-
- static int all_tests() {
-- mu_run_test(test_rzpipe);
-+ // Disabled in Genoo, relies on `rizin` binary in $PATH:
-+ // https://github.com/rizinorg/rizin/issues/1192
-+ //mu_run_test(test_rzpipe);
- mu_run_test(test_rzpipe_404);
- return tests_passed != tests_run;
- }
diff --git a/dev-util/rizin/rizin-0.2.1.ebuild b/dev-util/rizin/rizin-0.2.1.ebuild
deleted file mode 100644
index 056670c878d..00000000000
--- a/dev-util/rizin/rizin-0.2.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6,7,8,9,10})
-
-# This is the commit that the CI for the release commit used
-BINS_COMMIT="a80fd0d56d538d07a05ef01e29c8cb430a4f9d72"
-
-inherit meson python-any-r1
-
-DESCRIPTION="reverse engineering framework for binary analysis"
-HOMEPAGE="https://rizin.re/"
-
-SRC_URI="https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
- test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- sys-apps/file
- app-arch/lz4:0=
- dev-libs/capstone:0=
- dev-libs/libuv:0=
- dev-libs/libzip:0=
- dev-libs/openssl:0=
- >=dev-libs/tree-sitter-0.19.0
- dev-libs/xxhash
- sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=("${FILESDIR}"/${PN}-0.2.1-no-rzpipe.patch)
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_prepare() {
- default
-
- local py_to_mangle=(
- librz/core/cmd_descs/cmd_descs_generate.py
- subprojects/lz4-1.9.3/contrib/meson/meson/GetLz4LibraryVersion.py
- subprojects/lz4-1.9.3/contrib/meson/meson/InstallSymlink.py
- subprojects/lz4-1.9.3/tests/test-lz4-list.py
- subprojects/lz4-1.9.3/tests/test-lz4-speed.py
- subprojects/lz4-1.9.3/tests/test-lz4-versions.py
- sys/clang-format.py
- test/fuzz/scripts/fuzz_rz_asm.py
- test/scripts/gdbserver.py
- )
-
- python_fix_shebang "${py_to_mangle[@]}"
-
- if use test; then
- mv "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
- fi
-}
-
-src_configure() {
- local emesonargs=(
- -Dcli=enabled
- -Duse_sys_capstone=enabled
- -Duse_sys_magic=enabled
- -Duse_sys_libzip=enabled
- -Duse_sys_zlib=enabled
- -Duse_sys_lz4=enabled
- -Duse_sys_xxhash=enabled
- -Duse_sys_openssl=enabled
- -Duse_sys_tree_sitter=enabled
-
- $(meson_use test enable_tests)
- $(meson_use test enable_rz_test)
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/files/, dev-util/rizin/
@ 2021-12-31 22:13 John Helmert III
0 siblings, 0 replies; 5+ messages in thread
From: John Helmert III @ 2021-12-31 22:13 UTC (permalink / raw
To: gentoo-commits
commit: 3e8928e8264ae4783d97f77700a0f747b31d4bab
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 31 11:52:41 2021 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Fri Dec 31 22:13:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e8928e8
dev-util/rizin: drop 0.3.0, 0.3.1-r1
Bug: https://bugs.gentoo.org/829129
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
dev-util/rizin/Manifest | 1 -
dev-util/rizin/files/rizin-0.3.0-md4-openssl.patch | 100 --------------------
dev-util/rizin/rizin-0.3.0.ebuild | 103 ---------------------
dev-util/rizin/rizin-0.3.1-r1.ebuild | 102 --------------------
4 files changed, 306 deletions(-)
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index c6d198b9cfd0..fe5e33e3c58b 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,4 +1,3 @@
-DIST rizin-src-v0.3.0.tar.xz 64097204 BLAKE2B 308037ce60ec6523f337580221ea265c912ff92032fc5e1c2ab37430eae5a16cc2e8efa74447a79735c7814a35d3b08e5fc2f548612a1553c5edc2f314d22df5 SHA512 68f71e612bd4df90c79ebd4cb26c3e09bb370ccd9e51f574f2687f940b3934d9bf417108f3f7e678cabc6ddba7402e0420aab569c24316e07b2b56ed33153ed3
DIST rizin-src-v0.3.1.tar.xz 64089580 BLAKE2B 04f7e3cfa20a787f47af90c78405f295b346cc0c7d81164ff01bc6a69df526f3f9112ab4cb62092297ae2dda1fa738a2e7feff35e0f1b7f3e7467a8c6e4d1a1e SHA512 743f8f2c9ddb045f39147de9ad971d47f1a26bfcc233f41c12c64ade5e31c992104cf3f93c44c5035142b554779e895224b68f839cd87a59aaf344b4ec88d5fe
DIST rizin-src-v0.3.2.tar.xz 64170200 BLAKE2B fe11317e4acc1a803323f42fd4c2c6435a2fe4032581ed509f37f7221ec53e0afac04ebe8cb9da693ac283b61c0a70e135007d635c4c5010519a5c7e7cfa19cf SHA512 c472770ee1b156d42a98d4641f365e2255f16489b2223b117c8b88dcac0d72065d1fd7eedad70046188231889e492bafb7b8462987c68311143f14808eaab1cc
DIST rizin-testbins-d66fa0feaf3b1ecdad261ca17542f1d5d0b101cc.tar.gz 126773703 BLAKE2B f5eaeb7e99e9091b6ca043dd50d03143950adc06b75b5834886d96d6280207c0bea73101a5f9e06c38ba60c0d4cff82dbf1f00364f7d87fe183c0687b06d1904 SHA512 0a017954017c8d57133d51b441411a50aa9ed062c0cc61e1561951fdf0703f5244230cda377885199e9e35dca6780d8582a445ac92286b63ef2ac784777ec0c4
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
deleted file mode 100644
index d2c3135d1c72..000000000000
--- a/dev-util/rizin/files/rizin-0.3.0-md4-openssl.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 6a1edf5fb6967d57d1dcc8cf21ea3a6bbdf8a5b8 Mon Sep 17 00:00:00 2001
-From: wargio <wargio@libero.it>
-Date: Sat, 2 Oct 2021 22:36:32 +0200
-Subject: [PATCH 1/2] Fix nullptr due missing small_block method when openssl
- is used.
-
----
- librz/hash/algorithms/openssl_common.h | 42 ++++++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
-
-diff --git a/librz/hash/algorithms/openssl_common.h b/librz/hash/algorithms/openssl_common.h
-index b29a1ae1221..e2399cff68d 100644
---- a/librz/hash/algorithms/openssl_common.h
-+++ b/librz/hash/algorithms/openssl_common.h
-@@ -76,6 +76,46 @@ EVP_sha512
- return true; \
- }
-
-+#define rz_openssl_plugin_small_block(pluginname, evpmd) \
-+ static bool openssl_plugin_##pluginname##_small_block(const ut8 *data, ut64 size, ut8 **digest, RzMsgDigestSize *digest_size) { \
-+ rz_return_val_if_fail(data &&digest, false); \
-+ const EVP_MD *evp_md = evpmd(); \
-+ if (!evp_md) { \
-+ return false; \
-+ } \
-+ RzMsgDigestSize dgst_size = EVP_MD_size(evp_md); \
-+ ut8 *dgst = malloc(dgst_size); \
-+ if (!dgst) { \
-+ return false; \
-+ } \
-+ EVP_MD_CTX *context = EVP_MD_CTX_new(); \
-+ if (!context) { \
-+ free(dgst); \
-+ return false; \
-+ } \
-+ if (EVP_DigestInit_ex(context, evp_md, NULL) != 1) { \
-+ EVP_MD_CTX_free(context); \
-+ free(dgst); \
-+ return false; \
-+ } \
-+ if (EVP_DigestUpdate(context, data, size) != 1) { \
-+ EVP_MD_CTX_free(context); \
-+ free(dgst); \
-+ return false; \
-+ } \
-+ if (EVP_DigestFinal_ex(context, dgst, NULL) != 1) { \
-+ EVP_MD_CTX_free(context); \
-+ free(dgst); \
-+ return false; \
-+ } \
-+ *digest = dgst; \
-+ if (digest_size) { \
-+ *digest_size = dgst_size; \
-+ } \
-+ EVP_MD_CTX_free(context); \
-+ return true; \
-+ }
-+
- #define rz_openssl_plugin_define_msg_digest(pluginname, evpmd, canhmac) \
- rz_openssl_plugin_context_new(pluginname); \
- rz_openssl_plugin_context_free(pluginname); \
-@@ -84,6 +124,7 @@ EVP_sha512
- rz_openssl_plugin_init(pluginname, evpmd); \
- rz_openssl_plugin_update(pluginname); \
- rz_openssl_plugin_final(pluginname); \
-+ rz_openssl_plugin_small_block(pluginname, evpmd); \
- RzMsgDigestPlugin rz_msg_digest_plugin_##pluginname = { \
- .name = #pluginname, \
- .license = "Apache 2.0", \
-@@ -96,6 +137,7 @@ EVP_sha512
- .init = openssl_plugin_##pluginname##_init, \
- .update = openssl_plugin_##pluginname##_update, \
- .final = openssl_plugin_##pluginname##_final, \
-+ .small_block = openssl_plugin_##pluginname##_small_block, \
- }
-
- #endif /* RZ_OPENSSL_COMMON_H */
-
-From f4a8e2c86be861f33327c2a8f1d181b42232069e Mon Sep 17 00:00:00 2001
-From: wargio <wargio@libero.it>
-Date: Sat, 2 Oct 2021 23:07:54 +0200
-Subject: [PATCH 2/2] Fix style
-
----
- librz/hash/algorithms/openssl_common.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/librz/hash/algorithms/openssl_common.h b/librz/hash/algorithms/openssl_common.h
-index e2399cff68d..0091fef2fa3 100644
---- a/librz/hash/algorithms/openssl_common.h
-+++ b/librz/hash/algorithms/openssl_common.h
-@@ -78,7 +78,7 @@ EVP_sha512
-
- #define rz_openssl_plugin_small_block(pluginname, evpmd) \
- static bool openssl_plugin_##pluginname##_small_block(const ut8 *data, ut64 size, ut8 **digest, RzMsgDigestSize *digest_size) { \
-- rz_return_val_if_fail(data &&digest, false); \
-+ rz_return_val_if_fail((data) && (digest), false); \
- const EVP_MD *evp_md = evpmd(); \
- if (!evp_md) { \
- return false; \
diff --git a/dev-util/rizin/rizin-0.3.0.ebuild b/dev-util/rizin/rizin-0.3.0.ebuild
deleted file mode 100644
index 0ac6575d67e4..000000000000
--- a/dev-util/rizin/rizin-0.3.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{8,9,10})
-
-# This is the commit that the CI for the release commit used
-BINS_COMMIT="d4cee85f3e94f1151dc9ff1681555ebcff7931f0"
-
-inherit meson python-any-r1
-
-DESCRIPTION="reverse engineering framework for binary analysis"
-HOMEPAGE="https://rizin.re/"
-
-SRC_URI="https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz"
- #test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0"
-IUSE="test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="test"
-
-RDEPEND="
- sys-apps/file
- app-arch/lz4:0=
- dev-libs/capstone:0=
- dev-libs/libuv:0=
- dev-libs/libzip:0=
- dev-libs/openssl:0=
- >=dev-libs/tree-sitter-0.19.0
- dev-libs/xxhash
- sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-${PV}-typedb-prefix.patch"
- "${FILESDIR}/${PN}-${PV}-md4-openssl.patch"
-)
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_prepare() {
- default
-
- local py_to_mangle=(
- librz/core/cmd_descs/cmd_descs_generate.py
- subprojects/lz4-1.9.3/contrib/meson/meson/GetLz4LibraryVersion.py
- subprojects/lz4-1.9.3/contrib/meson/meson/InstallSymlink.py
- subprojects/lz4-1.9.3/tests/test-lz4-list.py
- subprojects/lz4-1.9.3/tests/test-lz4-speed.py
- subprojects/lz4-1.9.3/tests/test-lz4-versions.py
- sys/clang-format.py
- test/fuzz/scripts/fuzz_rz_asm.py
- test/scripts/gdbserver.py
- )
-
- python_fix_shebang "${py_to_mangle[@]}"
-
- if use test; then
- cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
- cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
- fi
-}
-
-src_configure() {
- local emesonargs=(
- -Dcli=enabled
- -Duse_sys_capstone=enabled
- -Duse_sys_magic=enabled
- -Duse_sys_libzip=enabled
- -Duse_sys_zlib=enabled
- -Duse_sys_lz4=enabled
- -Duse_sys_xxhash=enabled
- -Duse_sys_openssl=enabled
- -Duse_sys_tree_sitter=enabled
-
- $(meson_use test enable_tests)
- $(meson_use test enable_rz_test)
- )
- meson_src_configure
-}
-
-src_test() {
- # Rizin uses data files that it expects to be installed on the
- # system. To hack around this, we create a tree of what it expects
- # in ${T}, and patch the tests to support a prefix from the
- # environment. https://github.com/rizinorg/rizin/issues/1789
- mkdir -p "${T}/usr/share/${PN}/${PV}" || die
- ln -sf "${BUILD_DIR}/librz/analysis/d" "${T}/usr/share/${PN}/${PV}/types" || die
- ln -sf "${BUILD_DIR}/librz/syscall/d" "${T}/usr/share/${PN}/${PV}/syscall" || die
- ln -sf "${BUILD_DIR}/librz/asm/d" "${T}/usr/share/${PN}/${PV}/opcodes" || die
- # https://github.com/rizinorg/rizin/issues/1797
- ln -sf "${BUILD_DIR}/librz/flag/d" "${T}/usr/share/${PN}/${PV}/flag" || die
- export RZ_PREFIX="${T}/usr"
-
- meson_src_test
-}
diff --git a/dev-util/rizin/rizin-0.3.1-r1.ebuild b/dev-util/rizin/rizin-0.3.1-r1.ebuild
deleted file mode 100644
index 84113bbf4057..000000000000
--- a/dev-util/rizin/rizin-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=(python3_{8,9,10})
-
-# This is the commit that the CI for the release commit used
-BINS_COMMIT="74b6e4511112b1a6abc571091efc32ec2a7d98a6"
-
-inherit meson python-any-r1
-
-DESCRIPTION="reverse engineering framework for binary analysis"
-HOMEPAGE="https://rizin.re/"
-
-SRC_URI="https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz"
- #test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/${PV}"
-IUSE="test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="test"
-
-RDEPEND="
- sys-apps/file
- app-arch/lz4:0=
- dev-libs/capstone:0=
- dev-libs/libuv:0=
- dev-libs/libzip:0=
- dev-libs/openssl:0=
- >=dev-libs/tree-sitter-0.19.0
- dev-libs/xxhash
- sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.3.0-typedb-prefix.patch"
-)
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_prepare() {
- default
-
- local py_to_mangle=(
- librz/core/cmd_descs/cmd_descs_generate.py
- subprojects/lz4-1.9.3/contrib/meson/meson/GetLz4LibraryVersion.py
- subprojects/lz4-1.9.3/contrib/meson/meson/InstallSymlink.py
- subprojects/lz4-1.9.3/tests/test-lz4-list.py
- subprojects/lz4-1.9.3/tests/test-lz4-speed.py
- subprojects/lz4-1.9.3/tests/test-lz4-versions.py
- sys/clang-format.py
- test/fuzz/scripts/fuzz_rz_asm.py
- test/scripts/gdbserver.py
- )
-
- python_fix_shebang "${py_to_mangle[@]}"
-
- if use test; then
- cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
- cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
- fi
-}
-
-src_configure() {
- local emesonargs=(
- -Dcli=enabled
- -Duse_sys_capstone=enabled
- -Duse_sys_magic=enabled
- -Duse_sys_libzip=enabled
- -Duse_sys_zlib=enabled
- -Duse_sys_lz4=enabled
- -Duse_sys_xxhash=enabled
- -Duse_sys_openssl=enabled
- -Duse_sys_tree_sitter=enabled
-
- $(meson_use test enable_tests)
- $(meson_use test enable_rz_test)
- )
- meson_src_configure
-}
-
-src_test() {
- # Rizin uses data files that it expects to be installed on the
- # system. To hack around this, we create a tree of what it expects
- # in ${T}, and patch the tests to support a prefix from the
- # environment. https://github.com/rizinorg/rizin/issues/1789
- mkdir -p "${T}/usr/share/${PN}/${PV}" || die
- ln -sf "${BUILD_DIR}/librz/analysis/d" "${T}/usr/share/${PN}/${PV}/types" || die
- ln -sf "${BUILD_DIR}/librz/syscall/d" "${T}/usr/share/${PN}/${PV}/syscall" || die
- ln -sf "${BUILD_DIR}/librz/asm/d" "${T}/usr/share/${PN}/${PV}/opcodes" || die
- # https://github.com/rizinorg/rizin/issues/1797
- ln -sf "${BUILD_DIR}/librz/flag/d" "${T}/usr/share/${PN}/${PV}/flag" || die
- export RZ_PREFIX="${T}/usr"
-
- meson_src_test
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/files/, dev-util/rizin/
@ 2022-01-06 19:08 John Helmert III
0 siblings, 0 replies; 5+ messages in thread
From: John Helmert III @ 2022-01-06 19:08 UTC (permalink / raw
To: gentoo-commits
commit: c177d1212996d8cf74d5fc8b1b613fdb1dd4e7c9
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 6 18:52:29 2022 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Thu Jan 6 19:07:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c177d121
dev-util/rizin: workaround build failure with tree-sitter[-ts-cli] and nodejs
Closes: https://bugs.gentoo.org/830068
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
.../files/rizin-0.3.2-never-rebuild-parser.patch | 36 ++++++++++++++++++++++
dev-util/rizin/rizin-0.3.2.ebuild | 3 +-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch b/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch
new file mode 100644
index 000000000000..5231da0c7eaf
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch
@@ -0,0 +1,36 @@
+commit 9bcfa2a6d3eaa5df00ae728c44811faf08effbd3
+Author: John Helmert III <jchelmert3@posteo.net>
+Date: Thu Jan 6 11:12:58 2022 -0600
+
+ shlr/rizin-shell-parser/src: Never rebuild parser.c
+
+ This requires dev-libs/tree-sitter[ts-cli] and net-libs/nodejs, both
+ of which would be heavy new dependencies. However, these are only
+ needed to rebuild the already-existing tree-sitter parser, which
+ doesn't do much for us (if anything) since it already exists. In this
+ case, it's better to just reduce fragility by unconditionally
+ disabling this.
+
+ Bug: https://bugs.gentoo.org/830068
+ Signed-off-by: John Helmert III <ajak@gentoo.org>
+
+diff --git a/shlr/rizin-shell-parser/src/meson.build b/shlr/rizin-shell-parser/src/meson.build
+index 0171183ae0..81dcc13b33 100644
+--- a/shlr/rizin-shell-parser/src/meson.build
++++ b/shlr/rizin-shell-parser/src/meson.build
+@@ -1,14 +1,4 @@
+-tree_sitter_bin = find_program('tree-sitter', required: false)
+-node_bin = find_program('node', required: false)
+-if tree_sitter_bin.found() and node_bin.found() and tree_sitter_dep.type_name() != 'internal'
+- parser_c = custom_target('parser_src_c',
+- command: [tree_sitter_wrap_py, tree_sitter_bin, '@OUTDIR@/..', '@INPUT@'],
+- input: [grammar_js],
+- output: 'parser.c',
+- )
+-else
+- parser_c = files('parser.c')
+-endif
++parser_c = files('parser.c')
+
+ shell_parser_files = [files('scanner.c'), parser_c]
+ shell_parser_inc = [platform_inc, include_directories('tree_sitter')]
diff --git a/dev-util/rizin/rizin-0.3.2.ebuild b/dev-util/rizin/rizin-0.3.2.ebuild
index be6e33690c5a..f0f118bdd3dc 100644
--- a/dev-util/rizin/rizin-0.3.2.ebuild
+++ b/dev-util/rizin/rizin-0.3.2.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=8
@@ -40,6 +40,7 @@ BDEPEND="${PYTHON_DEPS}"
PATCHES=(
"${FILESDIR}/${PN}-0.3.0-typedb-prefix.patch"
+ "${FILESDIR}/${PN}-0.3.2-never-rebuild-parser.patch"
)
S="${WORKDIR}/${PN}-v${PV}"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-01-06 19:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-04 9:31 [gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/files/, dev-util/rizin/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2021-10-05 20:40 John Helmert III
2021-10-17 16:08 John Helmert III
2021-12-31 22:13 John Helmert III
2022-01-06 19:08 John Helmert III
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox