From 94e94a79c6f0275db8f3171d2e628485ba64ef8f Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Tue, 12 Mar 2024 12:34:53 -0400 Subject: [PATCH 1/3] rizin: update to 0.7.2 --- common/shlibs | 52 +++++++++++----------- srcpkgs/rizin/patches/cross.patch | 22 +++++++++ srcpkgs/rizin/patches/fix-treesitter.patch | 34 -------------- srcpkgs/rizin/template | 20 ++++++--- 4 files changed, 62 insertions(+), 66 deletions(-) create mode 100644 srcpkgs/rizin/patches/cross.patch delete mode 100644 srcpkgs/rizin/patches/fix-treesitter.patch diff --git a/common/shlibs b/common/shlibs index 4c9c98e1a3b7b8..d3298e21003df2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4078,32 +4078,32 @@ libreadosm.so.1 readosm-1.1.0a_1 libSvtAv1Enc.so.1 libsvt-av1-1.3.0_1 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1 libyascreen.so.0 yascreen-1.96_1 -librz_analysis.so.0.6 rizin-0.6.0_1 -librz_asm.so.0.6 rizin-0.6.0_1 -librz_bin.so.0.6 rizin-0.6.0_1 -librz_bp.so.0.6 rizin-0.6.0_1 -librz_config.so.0.6 rizin-0.6.0_1 -librz_cons.so.0.6 rizin-0.6.0_1 -librz_core.so.0.6 rizin-0.6.0_1 -librz_crypto.so.0.6 rizin-0.6.0_1 -librz_debug.so.0.6 rizin-0.6.0_1 -librz_demangler.so.0.6 rizin-0.6.0_1 -librz_diff.so.0.6 rizin-0.6.0_1 -librz_egg.so.0.6 rizin-0.6.0_1 -librz_flag.so.0.6 rizin-0.6.0_1 -librz_hash.so.0.6 rizin-0.6.0_1 -librz_io.so.0.6 rizin-0.6.0_1 -librz_lang.so.0.6 rizin-0.6.0_1 -librz_magic.so.0.6 rizin-0.6.0_1 -librz_main.so.0.6 rizin-0.6.0_1 -librz_parse.so.0.6 rizin-0.6.0_1 -librz_reg.so.0.6 rizin-0.6.0_1 -librz_search.so.0.6 rizin-0.6.0_1 -librz_sign.so.0.6 rizin-0.6.0_1 -librz_socket.so.0.6 rizin-0.6.0_1 -librz_syscall.so.0.6 rizin-0.6.0_1 -librz_type.so.0.6 rizin-0.6.0_1 -librz_util.so.0.6 rizin-0.6.0_1 +librz_analysis.so.0.7 rizin-0.7.2_1 +librz_asm.so.0.7 rizin-0.7.2_1 +librz_bin.so.0.7 rizin-0.7.2_1 +librz_bp.so.0.7 rizin-0.7.2_1 +librz_config.so.0.7 rizin-0.7.2_1 +librz_cons.so.0.7 rizin-0.7.2_1 +librz_core.so.0.7 rizin-0.7.2_1 +librz_crypto.so.0.7 rizin-0.7.2_1 +librz_debug.so.0.7 rizin-0.7.2_1 +librz_demangler.so.0.7 rizin-0.7.2_1 +librz_diff.so.0.7 rizin-0.7.2_1 +librz_egg.so.0.7 rizin-0.7.2_1 +librz_flag.so.0.7 rizin-0.7.2_1 +librz_hash.so.0.7 rizin-0.7.2_1 +librz_io.so.0.7 rizin-0.7.2_1 +librz_lang.so.0.7 rizin-0.7.2_1 +librz_magic.so.0.7 rizin-0.7.2_1 +librz_main.so.0.7 rizin-0.7.2_1 +librz_parse.so.0.7 rizin-0.7.2_1 +librz_reg.so.0.7 rizin-0.7.2_1 +librz_search.so.0.7 rizin-0.7.2_1 +librz_sign.so.0.7 rizin-0.7.2_1 +librz_socket.so.0.7 rizin-0.7.2_1 +librz_syscall.so.0.7 rizin-0.7.2_1 +librz_type.so.0.7 rizin-0.7.2_1 +librz_util.so.0.7 rizin-0.7.2_1 libaravis-0.8.so.0 libaravis-0.8.21_1 libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1 libnvme.so.1 libnvme-1.0_1 diff --git a/srcpkgs/rizin/patches/cross.patch b/srcpkgs/rizin/patches/cross.patch new file mode 100644 index 00000000000000..fed15110e4d3e6 --- /dev/null +++ b/srcpkgs/rizin/patches/cross.patch @@ -0,0 +1,22 @@ +diff --git a/meson.build b/meson.build +index 614563588b2..b7f0330dae3 100644 +--- a/meson.build ++++ b/meson.build +@@ -204,7 +204,7 @@ endif + + pcre2_dep_opt = get_option('use_sys_pcre2') + pcre2_dep = disabler() +-if (pcre2_dep_opt.enabled() or pcre2_dep_opt.auto()) and not meson.is_cross_build() ++if (pcre2_dep_opt.enabled() or pcre2_dep_opt.auto()) + pcre2_dep = dependency('libpcre2-8', required: false, static: false) + if not pcre2_dep.found() + pcre2_dep = cc.find_library('pcre2', required: true, static: true) +@@ -214,7 +214,7 @@ else + endif + + if meson.is_cross_build() +- pcre2_native_dep = dependency('pcre2_cross_native', required: true, static: true, native: true) ++ pcre2_native_dep = dependency('libpcre2-8', required: true, static: false, native: true) + endif + + # handle magic library diff --git a/srcpkgs/rizin/patches/fix-treesitter.patch b/srcpkgs/rizin/patches/fix-treesitter.patch deleted file mode 100644 index e21de7477129f0..00000000000000 --- a/srcpkgs/rizin/patches/fix-treesitter.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 07f92a82df1ef6d4c73ca18ee116a4af4895f343 Mon Sep 17 00:00:00 2001 -From: Gleb Popov <6yearold@gmail.com> -Date: Mon, 29 Jan 2024 16:14:40 +0300 -Subject: [PATCH] rizin-shell-parser: Fix build with newest tree-sitter (#4165) - ---- - subprojects/rizin-shell-parser/src/parser.c | 2 +- - subprojects/rizin-shell-parser/src/scanner.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/subprojects/rizin-shell-parser/src/parser.c b/subprojects/rizin-shell-parser/src/parser.c -index 21e270b58fa..3f83e0bf0b8 100644 ---- a/subprojects/rizin-shell-parser/src/parser.c -+++ b/subprojects/rizin-shell-parser/src/parser.c -@@ -1,4 +1,4 @@ --#include -+#include "tree_sitter/parser.h" - - #if defined(__GNUC__) || defined(__clang__) - #pragma GCC diagnostic push -diff --git a/subprojects/rizin-shell-parser/src/scanner.c b/subprojects/rizin-shell-parser/src/scanner.c -index 133c5850da9..9c17e4a0c13 100644 ---- a/subprojects/rizin-shell-parser/src/scanner.c -+++ b/subprojects/rizin-shell-parser/src/scanner.c -@@ -1,7 +1,7 @@ - // SPDX-FileCopyrightText: 2020 ret2libc - // SPDX-License-Identifier: LGPL-3.0-only - --#include -+#include "tree_sitter/parser.h" - #include - #include - #include - diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template index 8b19cabaee40c5..a21081540a2811 100644 --- a/srcpkgs/rizin/template +++ b/srcpkgs/rizin/template @@ -1,26 +1,34 @@ # Template file for 'rizin' pkgname=rizin -version=0.6.3 +version=0.7.2 revision=1 build_style=meson configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v5 -D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled - -D use_sys_lz4=enabled -D use_sys_xxhash=enabled -D use_sys_openssl=enabled - -D use_sys_tree_sitter=enabled -D use_sys_lzma=enabled -D use_sys_libmspack=enabled - -D local=disabled -D packager=VoidLinux" + -D use_sys_lz4=enabled -D use_sys_libzstd=enabled -D use_sys_lzma=enabled + -D use_sys_xxhash=enabled -D use_sys_openssl=enabled + -D use_sys_libmspack=enabled -D use_sys_tree_sitter=enabled + -D use_sys_pcre2=enabled -D local=disabled -D packager=VoidLinux + -D packager_version=${version}_${revision}" hostmakedepends="pkg-config" makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel - tree-sitter-devel file-devel openssl-devel liblzma-devel libmspack-devel" + tree-sitter-devel file-devel openssl-devel liblzma-devel libmspack-devel + libzstd-devel pcre2-devel" short_desc="UNIX-like reverse engineering framework and command-line toolset" maintainer="Urs Schulz " license="LGPL-3.0-only" homepage="https://rizin.re" changelog="https://github.com/rizinorg/rizin/releases" distfiles="https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz" -checksum=95f64c6ab9e6daa9e9fa5634398eb8f6cdb4ebf2e814da2e4cb969d31f4509c2 +checksum=fcff3fb45ae2b75e3f604bc7a08076e322e6e14def79098186378065ccb3582a # requires some external files, not clear where they come from make_check=no +if [ "${CROSS_BUILD}" ]; then + # Requires a native version of pcre2 to compile + hostmakedepends+=" pcre2-devel" +fi + rizin-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc="${short_desc} - development files" From 7b1e78b0491a9b8e3f3c853be04aff919c6f1a85 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Tue, 12 Mar 2024 12:35:07 -0400 Subject: [PATCH 2/3] cutter: update to 2.3.4 --- srcpkgs/cutter/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template index 0f2d812190411b..e1d8d3373af087 100644 --- a/srcpkgs/cutter/template +++ b/srcpkgs/cutter/template @@ -1,7 +1,7 @@ # Template file for 'cutter' pkgname=cutter -version=2.3.2 -revision=2 +version=2.3.4 +revision=1 build_style=cmake configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/cutter/plugins -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF @@ -17,7 +17,7 @@ maintainer="Urs Schulz " license="GPL-3.0-only" homepage="https://cutter.re" distfiles="https://github.com/rizinorg/cutter/releases/download/v${version}/Cutter-v${version}-src.tar.gz" -checksum=6c63652f6d959a44ce282f4abf7b86dfb86e60c9b0cf00dbd75278ab8cc64d5d +checksum=edc266a5f7a1f1c7f71cf5c6c9727e05008b728eae3bb42beb7d0b24ce07c5c3 cutter-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 9a7a42f0dc405e1417bce879615bf0a542c0af18 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Tue, 12 Mar 2024 12:35:27 -0400 Subject: [PATCH 3/3] rz-ghidra: update to 0.7.0 --- srcpkgs/rz-ghidra/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rz-ghidra/template b/srcpkgs/rz-ghidra/template index 39f5f862242b17..68bf521c5cc413 100644 --- a/srcpkgs/rz-ghidra/template +++ b/srcpkgs/rz-ghidra/template @@ -1,7 +1,7 @@ # Template file for 'rz-ghidra' pkgname=rz-ghidra -version=0.6.0 -revision=2 +version=0.7.0 +revision=1 build_style=cmake build_helper=qemu configure_args="-DCUTTER_INSTALL_PLUGDIR=/usr/lib/rizin/cutter/plugins/native @@ -13,4 +13,4 @@ maintainer="Orphaned " license="LGPL-3.0-or-later" homepage="https://github.com/rizinorg/rz-ghidra" distfiles="https://github.com/rizinorg/rz-ghidra/releases/download/v${version}/rz-ghidra-src-v${version}.tar.gz" -checksum=574eb52dda80c8ef1e24c166cfdc8a462ef01da7930556604d65d86c2a8051e4 +checksum=62b9bc3e8f92efd7aa08a5fec710a19ef976c07f1dae9ba8f76539cc8b6fff6f