From c4e397c90e6b1bfd1f7754bc8cb5e1ac8c694404 Mon Sep 17 00:00:00 2001 From: icp Date: Tue, 21 Feb 2023 18:37:59 +0530 Subject: [PATCH 1/3] rizin: update to 0.5.1. --- common/shlibs | 52 +++++++++++++-------------- srcpkgs/rizin/patches/fix-cross.patch | 39 ++++++++++++++++++++ srcpkgs/rizin/template | 17 ++++----- 3 files changed, 74 insertions(+), 34 deletions(-) create mode 100644 srcpkgs/rizin/patches/fix-cross.patch diff --git a/common/shlibs b/common/shlibs index 5cc81b9f90b2..2a9e2ad978cd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4130,32 +4130,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.4 rizin-0.4.0_1 -librz_asm.so.0.4 rizin-0.4.0_1 -librz_bin.so.0.4 rizin-0.4.0_1 -librz_bp.so.0.4 rizin-0.4.0_1 -librz_config.so.0.4 rizin-0.4.0_1 -librz_cons.so.0.4 rizin-0.4.0_1 -librz_core.so.0.4 rizin-0.4.0_1 -librz_crypto.so.0.4 rizin-0.4.0_1 -librz_debug.so.0.4 rizin-0.4.0_1 -librz_demangler.so.0.4 rizin-0.4.0_1 -librz_diff.so.0.4 rizin-0.4.0_1 -librz_egg.so.0.4 rizin-0.4.0_1 -librz_flag.so.0.4 rizin-0.4.0_1 -librz_hash.so.0.4 rizin-0.4.0_1 -librz_io.so.0.4 rizin-0.4.0_1 -librz_lang.so.0.4 rizin-0.4.0_1 -librz_magic.so.0.4 rizin-0.4.0_1 -librz_main.so.0.4 rizin-0.4.0_1 -librz_parse.so.0.4 rizin-0.4.0_1 -librz_reg.so.0.4 rizin-0.4.0_1 -librz_search.so.0.4 rizin-0.4.0_1 -librz_sign.so.0.4 rizin-0.4.0_1 -librz_socket.so.0.4 rizin-0.4.0_1 -librz_syscall.so.0.4 rizin-0.4.0_1 -librz_type.so.0.4 rizin-0.4.0_1 -librz_util.so.0.4 rizin-0.4.0_1 +librz_analysis.so.0.5 rizin-0.5.1_1 +librz_asm.so.0.5 rizin-0.5.1_1 +librz_bin.so.0.5 rizin-0.5.1_1 +librz_bp.so.0.5 rizin-0.5.1_1 +librz_config.so.0.5 rizin-0.5.1_1 +librz_cons.so.0.5 rizin-0.5.1_1 +librz_core.so.0.5 rizin-0.5.1_1 +librz_crypto.so.0.5 rizin-0.5.1_1 +librz_debug.so.0.5 rizin-0.5.1_1 +librz_demangler.so.0.5 rizin-0.5.1_1 +librz_diff.so.0.5 rizin-0.5.1_1 +librz_egg.so.0.5 rizin-0.5.1_1 +librz_flag.so.0.5 rizin-0.5.1_1 +librz_hash.so.0.5 rizin-0.5.1_1 +librz_io.so.0.5 rizin-0.5.1_1 +librz_lang.so.0.5 rizin-0.5.1_1 +librz_magic.so.0.5 rizin-0.5.1_1 +librz_main.so.0.5 rizin-0.5.1_1 +librz_parse.so.0.5 rizin-0.5.1_1 +librz_reg.so.0.5 rizin-0.5.1_1 +librz_search.so.0.5 rizin-0.5.1_1 +librz_sign.so.0.5 rizin-0.5.1_1 +librz_socket.so.0.5 rizin-0.5.1_1 +librz_syscall.so.0.5 rizin-0.5.1_1 +librz_type.so.0.5 rizin-0.5.1_1 +librz_util.so.0.5 rizin-0.5.1_1 libaravis-0.8.so.0 libaravis-0.8.21_1 libLimeSuite.so.22.09-1 LimeSuite-22.09.0_1 libnvme.so.1 libnvme-1.0_1 diff --git a/srcpkgs/rizin/patches/fix-cross.patch b/srcpkgs/rizin/patches/fix-cross.patch new file mode 100644 index 000000000000..8ffdb3fa5574 --- /dev/null +++ b/srcpkgs/rizin/patches/fix-cross.patch @@ -0,0 +1,39 @@ +From: Riccardo Schirone +Date: Tue, 14 Mar 2023 20:56:59 +0100 +Subject: [PATCH] rz_util: Fix cross-compilation when using system openssl + +--- + librz/util/meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/librz/util/meson.build b/librz/util/meson.build +index 29def91b3e7..9f23dae3a38 100644 +--- a/librz/util/meson.build ++++ b/librz/util/meson.build +@@ -1,6 +1,6 @@ + subdir('sdb/src') + +-rz_util_sources = [ ++rz_util_common_sources = [ + 'alloc.c', + 'annotated_code.c', + 'ascii_table.c', +@@ -83,6 +83,7 @@ rz_util_sources = [ + 'w32-sys.c', + 'x509.c', + ] ++rz_util_sources = rz_util_common_sources + + rz_util_deps = [ldl, lrt, mth, th, utl] + platform_deps + if zlib_dep.found() +@@ -162,8 +163,9 @@ if meson.is_cross_build() + install_dir: rizin_incdir + ) + rz_util_native_includes = [include_directories('.'), rz_util_includes] ++ rz_util_native_sources = rz_util_common_sources + ['big.c'] + +- rz_util_native = static_library('rz_util_native', rz_util_sources, libsdb_sources, ++ rz_util_native = static_library('rz_util_native', rz_util_native_sources, libsdb_sources, + include_directories: rz_util_native_includes, + dependencies: rz_util_native_deps, + implicit_include_directories: false, diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template index 2209a55ecd95..d7d367c36e82 100644 --- a/srcpkgs/rizin/template +++ b/srcpkgs/rizin/template @@ -1,25 +1,26 @@ # Template file for 'rizin' pkgname=rizin -version=0.4.1 +version=0.5.1 revision=1 build_style=meson configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v4 -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_libuv=true -D local=disabled" + -D use_sys_tree_sitter=enabled -D use_sys_lzma=enabled -D use_sys_libmspack=enabled + -D local=disabled -D packager=VoidLinux" hostmakedepends="pkg-config" -makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel libuv-devel - tree-sitter-devel file-devel openssl-devel" +makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel + tree-sitter-devel file-devel openssl-devel liblzma-devel libmspack-devel" short_desc="UNIX-like reverse engineering framework and command-line toolset" maintainer="Urs Schulz " license="LGPL-3.0-only" -homepage="https://github.com/rizinorg/rizin" -distfiles="https://github.com/rizinorg/${pkgname}/releases/download/v${version}/${pkgname}-src-v${version}.tar.xz" -checksum=669d956b997820a36e423cf35d482aa99849254b9658cef6844459912dfdbfb8 +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=f7a1338a909de465f56e4a59217669d595153be39ee2de5b86d8466475159859 # requires some external files, not clear where they come from make_check=no - rizin-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc="${short_desc} - development files" From 437229fe7c21a3f21c2867e0a62aed60dc94b486 Mon Sep 17 00:00:00 2001 From: icp Date: Tue, 21 Feb 2023 18:42:38 +0530 Subject: [PATCH 2/3] cutter: update to 2.2.0. --- srcpkgs/cutter/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template index 516ba935342e..8431c67fcdd6 100644 --- a/srcpkgs/cutter/template +++ b/srcpkgs/cutter/template @@ -1,23 +1,23 @@ # Template file for 'cutter' pkgname=cutter -version=2.1.2 -revision=2 +version=2.2.0 +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 -DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON -DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF -DCUTTER_ENABLE_CRASH_REPORTS=OFF" -hostmakedepends="pkg-config qt5-qmake qt5-host-tools meson git" +hostmakedepends="pkg-config qt5-qmake qt5-host-tools meson" makedepends="capstone-devel python3-devel qt5-declarative-devel qt5-location-devel qt5-svg-devel graphviz-devel libshiboken2-devel libpyside2-python3-devel syntax-highlighting-devel rizin-devel" -short_desc="GUI for radare2 written in C++ and QT" +short_desc="Free and open source reverse engineering platform powered by rizin" 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=088351e280d158e07498098ffba355a6272c2e4faf4b350ac7778e369eb23fe1 +checksum=f5d2017c657ffb0eb001710e111a05b3068b40a29b51f5d8f4a650a037329f35 cutter-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 81938f24118ffb83897a8a4cec068023dc73468b Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 23 Feb 2023 00:32:43 +0530 Subject: [PATCH 3/3] rz-ghidra: update to 0.5.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 90a3839844aa..d0db71bbd5a1 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.4.0 -revision=2 +version=0.5.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="classabbyamp " 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=6b8a6d1259699115e70f1f7d27de26c57fc19338d2d3e517460e35bb5f39eb55 +checksum=cb3da4b7d21324062ab94eff9e892dbb69de2be1133275c7ae9aff37b91404c7