Index | Thread | Search

From:
Edd Barrett <edd@theunixzoo.co.uk>
Subject:
UPDATE: rizin-0.7.2
To:
ports@openbsd.org
Date:
Sun, 14 Apr 2024 11:27:36 +0100

Download raw body.

Thread

  • Edd Barrett:

    UPDATE: rizin-0.7.2

Hi,

This updates rizin to the latest. I'll post a cutter update too in a moment.

Quite a few new deps to unbundle this time, and a little patch to make it work
with our in-tree libpcre.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/rizin/Makefile,v
diff -u -p -r1.7 Makefile
--- Makefile	17 Nov 2023 12:39:47 -0000	1.7
+++ Makefile	14 Apr 2024 09:19:09 -0000
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = aarch64 amd64 i386
 
 COMMENT =	free and open source reverse engineering framework
 
-V =		0.4.1
+V =		0.7.2
 DISTNAME =	rizin-src-v${V}
 EXTRACT_SUFX =	.tar.xz
 PKGNAME =	rizin-${V}
@@ -12,7 +12,7 @@ PKGNAME =	rizin-${V}
 SITES =		https://github.com/rizinorg/rizin/releases/download/v${V}/
 
 # Upstream shared lib versions are the same as the rizin release version.
-LIBV =			0.0	# ${V}
+LIBV =			1.0	# ${V}
 .for _lib in rz_analysis rz_asm rz_bin rz_bp rz_config rz_cons rz_core \
 	rz_crypto rz_debug rz_demangler rz_diff rz_egg rz_flag rz_hash \
 	rz_il rz_io rz_lang rz_magic rz_main rz_parse rz_reg rz_search \
@@ -27,8 +27,8 @@ HOMEPAGE =	https://rizin.re/
 # Many licenses. See ${WRKDIST}/LICENSES.
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += c capstone crypto kvm lz4 m magic pthread ssl uv xxhash
-WANTLIB += z zip
+WANTLIB += c capstone crypto kvm lz4 lzma m magic mspack pcre2-8 pthread ssl
+WANTLIB += util xxhash z zip zstd
 
 MODULES =		devel/meson \
 			lang/python
@@ -38,9 +38,11 @@ MODPY_RUNDEP =		No
 LIB_DEPENDS =		devel/capstone/main \
 			sysutils/xxhash \
 			devel/libmagic \
-			devel/libuv \
 			archivers/lz4 \
-			archivers/libzip
+			archivers/libzip \
+			archivers/libmspack \
+			archivers/zstd \
+			devel/pcre2
 
 # Used during build if detected during configure time,
 # so list as a BDEP to avoid DPB junking.
@@ -57,10 +59,15 @@ CONFIGURE_ARGS =	-Dpackager="OpenBSD por
 			-Duse_sys_xxhash=enabled \
 			-Duse_sys_magic=enabled \
 			-Duse_sys_openssl=enabled \
-			-Duse_sys_libuv=enabled \
 			-Duse_sys_zlib=enabled \
 			-Duse_sys_lz4=enabled \
-			-Duse_sys_libzip=enabled
+			-Duse_sys_libzip=enabled \
+			-Duse_sys_libzstd=enabled \
+			-Duse_sys_lzma=enabled \
+			-Duse_sys_magic=enabled \
+			-Duse_sys_libzip_openssl=true \
+			-Duse_sys_libmspack=enabled \
+			-Duse_sys_pcre2=enabled
 
 CFLAGS +=		-I${LOCALBASE}/include
 WRKDIST =		${WRKDIR}/rizin-v${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/rizin/distinfo,v
diff -u -p -r1.2 distinfo
--- distinfo	15 Nov 2022 14:32:48 -0000	1.2
+++ distinfo	13 Apr 2024 15:09:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (rizin-src-v0.4.1.tar.xz) = Zp2Va5l4IKNuQjzzXUgqqZhJJUuWWM72hERZkS39v7g=
-SIZE (rizin-src-v0.4.1.tar.xz) = 11453808
+SHA256 (rizin-src-v0.7.2.tar.xz) = 6vnkOl2heENHp0ZyTllDj0oWlNyh5ipQCSAJ8BcuH2w=
+SIZE (rizin-src-v0.7.2.tar.xz) = 18601700
Index: patches/patch-librz_analysis_p_analysis_mips_cs_c
===================================================================
RCS file: /cvs/ports/devel/rizin/patches/patch-librz_analysis_p_analysis_mips_cs_c,v
diff -u -p -r1.1.1.1 patch-librz_analysis_p_analysis_mips_cs_c
--- patches/patch-librz_analysis_p_analysis_mips_cs_c	12 Aug 2022 20:01:10 -0000	1.1.1.1
+++ patches/patch-librz_analysis_p_analysis_mips_cs_c	13 Apr 2024 15:10:05 -0000
@@ -74,7 +74,7 @@ Index: librz/analysis/p/analysis_mips_cs
  		}
  	} break;
  	}
-@@ -209,7 +209,7 @@ static int analop_esil(RzAnalysis *a, RzAnalysisOp *op
+@@ -209,7 +209,7 @@ static int analyze_op_esil(RzAnalysis *a, RzAnalysisOp
  
  	if (insn) {
  		// caching operands
@@ -83,7 +83,7 @@ Index: librz/analysis/p/analysis_mips_cs
  			*str[i] = 0;
  			ARG(i);
  		}
-@@ -1035,7 +1035,7 @@ static int analop(RzAnalysis *analysis, RzAnalysisOp *
+@@ -1049,7 +1049,7 @@ static int analyze_op(RzAnalysis *analysis, RzAnalysis
  		op->type = RZ_ANALYSIS_OP_TYPE_RJMP;
  		op->delay = 1;
  		// register is $ra, so jmp is a return
Index: patches/patch-librz_debug_p_native_reg_c
===================================================================
RCS file: /cvs/ports/devel/rizin/patches/patch-librz_debug_p_native_reg_c,v
diff -u -p -r1.1 patch-librz_debug_p_native_reg_c
--- patches/patch-librz_debug_p_native_reg_c	17 Nov 2023 12:39:47 -0000	1.1
+++ patches/patch-librz_debug_p_native_reg_c	5 Dec 2023 12:05:20 -0000
@@ -1,7 +1,7 @@
 Index: librz/debug/p/native/reg.c
 --- librz/debug/p/native/reg.c.orig
 +++ librz/debug/p/native/reg.c
-@@ -34,6 +34,8 @@ static char *rz_debug_native_reg_profile(RzDebug *dbg)
+@@ -38,6 +38,8 @@ static char *rz_debug_native_reg_profile(RzDebug *dbg)
  #include "reg/netbsd-x86.h"
  #elif __x86_64__
  #include "reg/netbsd-x64.h"
Index: patches/patch-meson_build
===================================================================
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-meson_build	14 Apr 2024 09:00:38 -0000
@@ -0,0 +1,17 @@
+Tell rizin our pcre doesn't JIT.
+
+Error at runtime if you leave it on:
+"Regex compilation for '\s+' failed at 0: bad JIT option"
+
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -197,7 +197,7 @@ endif
+ 
+ # Handle PCRE2
+ cpu_jit_supported = [ 'aarch64', 'arm', 'mips', 'mips64', 'ppc', 'ppc64', 'riscv32', 'riscv64', 's390x', 'x86', 'x86_64' ]
+-pcre2_jit_supported = target_machine.cpu_family() in cpu_jit_supported and cc.get_id() != 'tcc' and target_machine.system() != 'darwin'
++pcre2_jit_supported = target_machine.cpu_family() in cpu_jit_supported and cc.get_id() != 'tcc' and target_machine.system() != 'darwin' and target_machine.system() != 'openbsd'
+ if pcre2_jit_supported
+   add_project_arguments(['-DSUPPORTS_PCRE2_JIT'], language: 'c')
+ endif
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/rizin/pkg/PLIST,v
diff -u -p -r1.2 PLIST
--- pkg/PLIST	15 Nov 2022 14:32:48 -0000	1.2
+++ pkg/PLIST	13 Apr 2024 16:37:55 -0000
@@ -1,5 +1,4 @@
 @bin bin/rizin
-@bin bin/rz-agent
 @bin bin/rz-asm
 @bin bin/rz-ax
 @bin bin/rz-bin
@@ -7,20 +6,20 @@
 @bin bin/rz-find
 @bin bin/rz-gg
 @bin bin/rz-hash
-bin/rz-pm
 @bin bin/rz-run
 @bin bin/rz-sign
 @bin bin/rz-test
 include/librz/
 include/librz/rz_agraph.h
 include/librz/rz_analysis.h
-include/librz/rz_arch.h
 include/librz/rz_asm.h
 include/librz/rz_basefind.h
 include/librz/rz_bin.h
 include/librz/rz_bin_dwarf.h
+include/librz/rz_bin_source_line.h
 include/librz/rz_bind.h
 include/librz/rz_bp.h
+include/librz/rz_build_version.h
 include/librz/rz_cmd.h
 include/librz/rz_cmp.h
 include/librz/rz_config.h
@@ -38,6 +37,7 @@ include/librz/rz_endian.h
 include/librz/rz_flag.h
 include/librz/rz_flirt.h
 include/librz/rz_getopt.h
+include/librz/rz_hash.h
 include/librz/rz_heap_glibc.h
 include/librz/rz_heap_jemalloc.h
 include/librz/rz_il/
@@ -45,6 +45,7 @@ include/librz/rz_il.h
 include/librz/rz_il/definitions/
 include/librz/rz_il/definitions/bool.h
 include/librz/rz_il/definitions/definitions.h
+include/librz/rz_il/definitions/float.h
 include/librz/rz_il/definitions/label.h
 include/librz/rz_il/definitions/mem.h
 include/librz/rz_il/definitions/sort.h
@@ -63,12 +64,11 @@ include/librz/rz_lib.h
 include/librz/rz_list.h
 include/librz/rz_magic.h
 include/librz/rz_main.h
-include/librz/rz_msg_digest.h
 include/librz/rz_parse.h
 include/librz/rz_pdb.h
+include/librz/rz_platform.h
 include/librz/rz_project.h
 include/librz/rz_reg.h
-include/librz/rz_regex.h
 include/librz/rz_search.h
 include/librz/rz_sign.h
 include/librz/rz_skiplist.h
@@ -83,6 +83,11 @@ include/librz/rz_types_overflow.h
 include/librz/rz_userconf.h
 include/librz/rz_util/
 include/librz/rz_util.h
+include/librz/rz_util/ht_inc.h
+include/librz/rz_util/ht_pp.h
+include/librz/rz_util/ht_pu.h
+include/librz/rz_util/ht_up.h
+include/librz/rz_util/ht_uu.h
 include/librz/rz_util/rz_alloc.h
 include/librz/rz_util/rz_annotated_code.h
 include/librz/rz_util/rz_ascii_table.h
@@ -92,17 +97,19 @@ include/librz/rz_util/rz_axml.h
 include/librz/rz_util/rz_base64.h
 include/librz/rz_util/rz_base91.h
 include/librz/rz_util/rz_big.h
-include/librz/rz_util/rz_bitmap.h
+include/librz/rz_util/rz_bits.h
 include/librz/rz_util/rz_bitvector.h
 include/librz/rz_util/rz_buf.h
 include/librz/rz_util/rz_debruijn.h
 include/librz/rz_util/rz_event.h
 include/librz/rz_util/rz_file.h
+include/librz/rz_util/rz_float.h
 include/librz/rz_util/rz_graph.h
 include/librz/rz_util/rz_graph_drawable.h
 include/librz/rz_util/rz_hex.h
 include/librz/rz_util/rz_idpool.h
 include/librz/rz_util/rz_intervaltree.h
+include/librz/rz_util/rz_iterator.h
 include/librz/rz_util/rz_itv.h
 include/librz/rz_util/rz_json.h
 include/librz/rz_util/rz_lang_byte_array.h
@@ -115,13 +122,12 @@ include/librz/rz_util/rz_panels.h
 include/librz/rz_util/rz_path.h
 include/librz/rz_util/rz_pj.h
 include/librz/rz_util/rz_pkcs7.h
-include/librz/rz_util/rz_pool.h
 include/librz/rz_util/rz_print.h
 include/librz/rz_util/rz_protobuf.h
 include/librz/rz_util/rz_punycode.h
-include/librz/rz_util/rz_queue.h
 include/librz/rz_util/rz_range.h
 include/librz/rz_util/rz_rbtree.h
+include/librz/rz_util/rz_regex.h
 include/librz/rz_util/rz_serialize.h
 include/librz/rz_util/rz_signal.h
 include/librz/rz_util/rz_spaces.h
@@ -135,33 +141,26 @@ include/librz/rz_util/rz_strpool.h
 include/librz/rz_util/rz_subprocess.h
 include/librz/rz_util/rz_sys.h
 include/librz/rz_util/rz_table.h
+include/librz/rz_util/rz_th_ht.h
 include/librz/rz_util/rz_time.h
 include/librz/rz_util/rz_tree.h
 include/librz/rz_util/rz_uleb128.h
 include/librz/rz_util/rz_utf16.h
 include/librz/rz_util/rz_utf32.h
 include/librz/rz_util/rz_utf8.h
+include/librz/rz_util/rz_version.h
 include/librz/rz_util/rz_x509.h
+include/librz/rz_util/set.h
 include/librz/rz_vector.h
-include/librz/rz_version.h
+include/librz/rz_windows.h
 include/librz/rz_windows_heap.h
 include/librz/sdb/
 include/librz/sdb/buffer.h
 include/librz/sdb/cdb.h
 include/librz/sdb/cdb_make.h
-include/librz/sdb/config.h
-include/librz/sdb/ht_inc.h
-include/librz/sdb/ht_pp.h
-include/librz/sdb/ht_pu.h
-include/librz/sdb/ht_up.h
-include/librz/sdb/ht_uu.h
 include/librz/sdb/ls.h
 include/librz/sdb/sdb.h
-include/librz/sdb/sdb_userconf.h
-include/librz/sdb/sdb_version.h
 include/librz/sdb/sdbht.h
-include/librz/sdb/set.h
-include/librz/sdb/types.h
 include/librz/sflib/
 include/librz/sflib/common/
 include/librz/sflib/common/sfsocketcall.h
@@ -305,7 +304,6 @@ lib/pkgconfig/rz_syscall.pc
 lib/pkgconfig/rz_type.pc
 lib/pkgconfig/rz_util.pc
 @man man/man1/rizin.1
-@man man/man1/rz-agent.1
 @man man/man1/rz-asm.1
 @man man/man1/rz-ax.1
 @man man/man1/rz-bin.1
@@ -313,7 +311,6 @@ lib/pkgconfig/rz_util.pc
 @man man/man1/rz-find.1
 @man man/man1/rz-gg.1
 @man man/man1/rz-hash.1
-@man man/man1/rz-pm.1
 @man man/man1/rz-run.1
 @man man/man1/rz-sign.1
 @man man/man7/rz-esil.7
@@ -354,8 +351,10 @@ share/rizin/cons/focus
 share/rizin/cons/gb
 share/rizin/cons/gentoo
 share/rizin/cons/lima
+share/rizin/cons/mars
 share/rizin/cons/matrix
 share/rizin/cons/monokai
+share/rizin/cons/nord
 share/rizin/cons/ogray
 share/rizin/cons/onedark
 share/rizin/cons/pink
@@ -490,7 +489,9 @@ share/rizin/format/dll/dsound.sdb
 share/rizin/format/dll/gsprop32.sdb
 share/rizin/format/dll/iertutil.sdb
 share/rizin/format/dll/kernel32.sdb
+share/rizin/format/dll/mfc100u.sdb
 share/rizin/format/dll/mfc120.sdb
+share/rizin/format/dll/mfc140u.sdb
 share/rizin/format/dll/mfc30.sdb
 share/rizin/format/dll/mfc40.sdb
 share/rizin/format/dll/mfc42.sdb
@@ -526,7 +527,6 @@ share/rizin/format/elf64
 share/rizin/format/elf_enums
 share/rizin/format/mz
 share/rizin/format/pe32
-share/rizin/format/trx
 share/rizin/format/zip
 share/rizin/fortunes/
 share/rizin/fortunes/fortunes.fun
@@ -640,6 +640,7 @@ share/rizin/types/cc-riscv-64.sdb
 share/rizin/types/cc-sparc-32.sdb
 share/rizin/types/cc-spc700-16.sdb
 share/rizin/types/cc-sysz-64.sdb
+share/rizin/types/cc-tricore-32.sdb
 share/rizin/types/cc-x86-16.sdb
 share/rizin/types/cc-x86-32.sdb
 share/rizin/types/cc-x86-64.sdb

-- 
Best Regards
Edd Barrett

https://www.theunixzoo.co.uk