summaryrefslogtreecommitdiff
path: root/dev-util/rizin
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/rizin')
-rw-r--r--dev-util/rizin/Manifest9
-rw-r--r--dev-util/rizin/files/rizin-0.3.1-CVE-2021-43814.patch90
-rw-r--r--dev-util/rizin/rizin-0.3.1-r2.ebuild103
-rw-r--r--dev-util/rizin/rizin-0.3.4.ebuild (renamed from dev-util/rizin/rizin-0.3.2.ebuild)2
4 files changed, 4 insertions, 200 deletions
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 32ae4498cb4c..fd26d9276c82 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,9 +1,6 @@
AUX rizin-0.3.0-typedb-prefix.patch 5175 BLAKE2B 08fea1ba6297f17d42f518c1739875c0964f6f00c1bcd01cba51a56e6626fe50c6ad2c36bece4db326f7b128d6ea5786970eb454832e32f9d837458f92f2a596 SHA512 241a72a7f1c3ec8ba831ca696faf0cfc09a58207c6d3db7005b09b9016a71ed9238bcb9441a389116083557538a0ff1a6adf55e78e1aa35d67aa206f30774391
-AUX rizin-0.3.1-CVE-2021-43814.patch 3292 BLAKE2B 4d9e9f43296dc906839fee4b97794141157dea5e3af7b0f96f5c35369b44f2d04a1f4363366d0e495112d29b658927953b3c19a1375c7ad2377bb3504be3e9ef SHA512 0bcfe32bab666d99fa68e825f4d7406024d2d1f76abc7b3fdbd7803be3f3c27205bbe7d91a671e2679094bedc944a59980a798e07adf20e6bf6d2c46e884b297
AUX rizin-0.3.2-never-rebuild-parser.patch 1493 BLAKE2B fd5a4d306336ccba939e9d96e97d4b653b83407352f9babf9c39bbad28a18b4fc1a3e2f1eb57b25b7f8dad35b3400271cf6a6bf1cec55c74dc00f424da715c91 SHA512 7a105831cbdb99633c43411b7a407ff6970cb8e89cae561886ade96c75579c0484271641e957762189fc68762952a26ca0a2536bd1342802c408041066852b16
-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
-EBUILD rizin-0.3.1-r2.ebuild 2910 BLAKE2B 3b1817a02c425f703168c5b5c78c7df0106f64df1d2420f59f2d4b66581b1439d18f9e22cb9db3ef08b4580f6e37ace6797113a0a461e5ef7c657b527193c5bb SHA512 4540a23f9a6ca9586a45fb8fbac22762886e54bba5d3863d098bf40a291c09fb5a49f24107352f7a9230749de0aafaec002c91ff3ba6d8b2cd38c281cbcd9b85
-EBUILD rizin-0.3.2.ebuild 2945 BLAKE2B a8887f8f05d71b972076e46f8a41d7d7b2122e699d26dfaeaff720722ae80afcd8d4eb8c6b2b3a2b60232bfc17960f52028f91bf088b6fd3233feaadb8ebfe95 SHA512 a80e5d328a25a464f1ad6c96be3930422c663ab164d00bbb489305932b35619e1d35f6dc6bd8aa32ea2fcf8b7e9b875a3535b51023181cc09a81a744c402dcdd
+DIST rizin-src-v0.3.4.tar.xz 10411432 BLAKE2B 99745f069e6bd72aec6a6f335f3aa0ccc46ebf186b1dc0aaf32b4f95d2be4bb49e8d3d976a72978c22fce82d896e70bf8403568e100b73898731045ef06a2ad5 SHA512 cda35afe8c031f3207c055ed31d7f76a46b7addd04cead0f5aadf0733b66f4dd953ca16f054b47da7921d4726d6ea1250436012954a9755c1cd524a8fd0d670c
+DIST rizin-testbins-aa6a88dcdfaad54335e3935c16ce21a124ff861d.tar.gz 127254454 BLAKE2B e7a4536be7169abd197c2128e103b8d669fbb7532ce265b27da3ce347b1aa58c8a96c95d85cf7700f66a44c041a0575175de3a0e176a0d31c490f7ccfb2f6d6b SHA512 20cf299e5324793f07f8a2fdcfa3d66c3a418f09bfc6a272e35ab31d4a64408bf91532ae431098dede1a2d0ad0b1c02433304c514816d98dc068f6c0528a4099
+EBUILD rizin-0.3.4.ebuild 2945 BLAKE2B 0a2591f74cb16d23957114fadff4ec2279c3b7f21423d65ea6674f486f9f5ad55dfd347464d1f0af93edda904fc8f71be5bdf21b34f54f3186980670f7d40312 SHA512 af755c1a1a23ced8d2e67f2b7178303c8e1875a5a1cd26898fbe473a97c05b157fbc1674d1e567d95be72895eeed24a5961ae36d72a4365174c2756c4aa96d97
MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/dev-util/rizin/files/rizin-0.3.1-CVE-2021-43814.patch b/dev-util/rizin/files/rizin-0.3.1-CVE-2021-43814.patch
deleted file mode 100644
index f7c511b5a0cf..000000000000
--- a/dev-util/rizin/files/rizin-0.3.1-CVE-2021-43814.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From aa6917772d2f32e5a7daab25a46c72df0b5ea406 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
-Date: Fri, 10 Dec 2021 15:43:12 +0100
-Subject: [PATCH] Fix oob write for dwarf with abbrev with count 0 (Fix #2083)
- (#2086)
-
----
- librz/bin/dwarf.c | 40 ++++++++++++++++++++++-----------------
- test/db/formats/elf/crash | 8 ++++++++
- 2 files changed, 31 insertions(+), 17 deletions(-)
-
-diff --git a/librz/bin/dwarf.c b/librz/bin/dwarf.c
-index 1ed1d3517c2..23dd1f9f0b1 100644
---- a/librz/bin/dwarf.c
-+++ b/librz/bin/dwarf.c
-@@ -1220,9 +1220,13 @@ static int init_die(RzBinDwarfDie *die, ut64 abbr_code, ut64 attr_count) {
- if (!die) {
- return -1;
- }
-- die->attr_values = calloc(sizeof(RzBinDwarfAttrValue), attr_count);
-- if (!die->attr_values) {
-- return -1;
-+ if (attr_count) {
-+ die->attr_values = calloc(sizeof(RzBinDwarfAttrValue), attr_count);
-+ if (!die->attr_values) {
-+ return -1;
-+ }
-+ } else {
-+ die->attr_values = NULL;
- }
- die->abbrev_code = abbr_code;
- die->capacity = attr_count;
-@@ -1726,25 +1730,27 @@ static const ut8 *parse_die(const ut8 *buf, const ut8 *buf_end, RzBinDwarfDebugI
- size_t i;
- const char *comp_dir = NULL;
- ut64 line_info_offset = UT64_MAX;
-- for (i = 0; i < abbrev->count - 1; i++) {
-- memset(&die->attr_values[i], 0, sizeof(die->attr_values[i]));
-+ if (abbrev->count) {
-+ for (i = 0; i < abbrev->count - 1; i++) {
-+ memset(&die->attr_values[i], 0, sizeof(die->attr_values[i]));
-
-- buf = parse_attr_value(buf, buf_end - buf, &abbrev->defs[i],
-- &die->attr_values[i], hdr, debug_str, debug_str_len, big_endian);
-+ buf = parse_attr_value(buf, buf_end - buf, &abbrev->defs[i],
-+ &die->attr_values[i], hdr, debug_str, debug_str_len, big_endian);
-
-- RzBinDwarfAttrValue *attribute = &die->attr_values[i];
-+ RzBinDwarfAttrValue *attribute = &die->attr_values[i];
-
-- if (attribute->attr_name == DW_AT_comp_dir && (attribute->attr_form == DW_FORM_strp || attribute->attr_form == DW_FORM_string) && attribute->string.content) {
-- comp_dir = attribute->string.content;
-- }
-- if (attribute->attr_name == DW_AT_stmt_list) {
-- if (attribute->kind == DW_AT_KIND_CONSTANT) {
-- line_info_offset = attribute->uconstant;
-- } else if (attribute->kind == DW_AT_KIND_REFERENCE) {
-- line_info_offset = attribute->reference;
-+ if (attribute->attr_name == DW_AT_comp_dir && (attribute->attr_form == DW_FORM_strp || attribute->attr_form == DW_FORM_string) && attribute->string.content) {
-+ comp_dir = attribute->string.content;
-+ }
-+ if (attribute->attr_name == DW_AT_stmt_list) {
-+ if (attribute->kind == DW_AT_KIND_CONSTANT) {
-+ line_info_offset = attribute->uconstant;
-+ } else if (attribute->kind == DW_AT_KIND_REFERENCE) {
-+ line_info_offset = attribute->reference;
-+ }
- }
-+ die->count++;
- }
-- die->count++;
- }
-
- // If this is a compilation unit dir attribute, we want to cache it so the line info parsing
-diff --git a/test/db/formats/elf/crash b/test/db/formats/elf/crash
-index ea6c2c214bb..fb8a572bd56 100644
---- a/test/db/formats/elf/crash
-+++ b/test/db/formats/elf/crash
-@@ -25,3 +25,11 @@ nth vaddr bind type lib name
- []
- EOF
- RUN
-+
-+NAME=ELF/Dwarf: abbrev empty
-+FILE=bins/elf/dwarf_fuzzed_abbrev_empty
-+CMDS=<<EOF
-+aaa
-+EOF
-+EXPECT=
-+RUN
diff --git a/dev-util/rizin/rizin-0.3.1-r2.ebuild b/dev-util/rizin/rizin-0.3.1-r2.ebuild
deleted file mode 100644
index 5148796711c6..000000000000
--- a/dev-util/rizin/rizin-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,103 +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"
- "${FILESDIR}/${P}-CVE-2021-43814.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.2.ebuild b/dev-util/rizin/rizin-0.3.4.ebuild
index f0f118bdd3dc..b4bfee6c1042 100644
--- a/dev-util/rizin/rizin-0.3.2.ebuild
+++ b/dev-util/rizin/rizin-0.3.4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=(python3_{8,9,10})
# This is the commit that the CI for the release commit used
-BINS_COMMIT="d66fa0feaf3b1ecdad261ca17542f1d5d0b101cc"
+BINS_COMMIT="aa6a88dcdfaad54335e3935c16ce21a124ff861d"
inherit meson python-any-r1