Re: [PR PATCH] [Updated] Capstone 5.0

[motorto <motorto@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 561 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages capstone-5.0
https://github.com/void-linux/void-packages/pull/44967

Capstone 5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc



A patch file from https://github.com/void-linux/void-packages/pull/44967.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-capstone-5.0-44967.patch --]
[-- Type: text/x-diff, Size: 10284 bytes --]

From 2f4b29b695bbefa8f024ac83bbecac039400bcde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Jul 2023 16:15:54 +0100
Subject: [PATCH 1/9] capstone: update to 5.0.

---
 common/shlibs             |  2 +-
 srcpkgs/capstone/template | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4b2122d1b199..3bc4258061ad 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2129,7 +2129,7 @@ libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.5.3_12
 libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.18_1
-libcapstone.so.4 capstone-4.0_1
+libcapstone.so.5 capstone-5.0_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
 libnih-dbus.so.1 libnih-1.0.3_1
diff --git a/srcpkgs/capstone/template b/srcpkgs/capstone/template
index 99c20894520b..e4c157effe2c 100644
--- a/srcpkgs/capstone/template
+++ b/srcpkgs/capstone/template
@@ -1,16 +1,17 @@
 # Template file for 'capstone'
 pkgname=capstone
-version=4.0.2
-revision=5
+version=5.0
+revision=1
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="python3-setuptools"
 short_desc="Lightweight multi-platform, multi-architecture disassembly framework"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://www.capstone-engine.org/"
-distfiles="https://github.com/aquynh/${pkgname}/archive/${version}.tar.gz"
-checksum=7c81d798022f81e7507f1a60d6817f63aa76e489aa4e7055255f21a22f5e526a
+changelog="https://raw.githubusercontent.com/capstone-engine/capstone/next/ChangeLog"
+distfiles="https://github.com/aquynh/capstone/archive/${version}.tar.gz"
+checksum=df24344407baa7415eeb006f742afc9b92cd33abf2c4c120a6e97cfb376882dc
 
 post_install() {
 	make -C bindings/python PREFIX=/usr DESTDIR=${DESTDIR} install3

From b51bd63672fa8fdc41b6304f80c98d96b9ea1e69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Jul 2023 16:06:58 +0100
Subject: [PATCH 2/9] bloaty: rebuild for capstone-5.0.

---
 srcpkgs/bloaty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bloaty/template b/srcpkgs/bloaty/template
index 226d2f30ffcd..2a79fb502f99 100644
--- a/srcpkgs/bloaty/template
+++ b/srcpkgs/bloaty/template
@@ -1,7 +1,7 @@
 # Template file for 'bloaty'
 pkgname=bloaty
 version=1.1
-revision=11
+revision=12
 build_style=cmake
 hostmakedepends="pkg-config protobuf"
 makedepends="capstone-devel protobuf-devel re2-devel zlib-devel"

From 8fb4553c5b6e459ebec07535a0480908e203bb1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Jul 2023 16:06:58 +0100
Subject: [PATCH 3/9] boomerang: rebuild for capstone-5.0.

---
 srcpkgs/boomerang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boomerang/template b/srcpkgs/boomerang/template
index 4c64c6ba3d6a..d8829c693e85 100644
--- a/srcpkgs/boomerang/template
+++ b/srcpkgs/boomerang/template
@@ -1,7 +1,7 @@
 # Template file for 'boomerang'
 pkgname=boomerang
 version=0.5.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBOOMERANG_BUILD_REGRESSION_TESTS=TRUE"
 make_check_target="check"

From 0bd7bf3faf7e792426ab9e97046c49d370401b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Jul 2023 16:06:59 +0100
Subject: [PATCH 4/9] edb-debugger: rebuild for capstone-5.0.

---
 srcpkgs/edb-debugger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/edb-debugger/template b/srcpkgs/edb-debugger/template
index 91e73f4574ee..0e47747c5cab 100644
--- a/srcpkgs/edb-debugger/template
+++ b/srcpkgs/edb-debugger/template
@@ -1,7 +1,7 @@
 # Template file for 'edb-debugger'
 pkgname=edb-debugger
 version=1.3.0
-revision=1
+revision=2
 archs="x86_64* i686*"
 build_style=cmake
 hostmakedepends='pkg-config'

From 0bf8db1a374a2a76c8ab4f1ba7a2bf7a948be8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Jul 2023 16:06:59 +0100
Subject: [PATCH 5/9] openocd: rebuild for capstone-5.0.

---
 srcpkgs/openocd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openocd/template b/srcpkgs/openocd/template
index 9309090c35de..f88e96193947 100644
--- a/srcpkgs/openocd/template
+++ b/srcpkgs/openocd/template
@@ -1,7 +1,7 @@
 # Template file for 'openocd'
 pkgname=openocd
 version=0.11.0+1
-revision=2
+revision=3
 # update to a commit that has a compatible jimtcl version
 _commit=830d70bfc66ada2a68c73283b9e4fa4770d408ee
 _jimtcl_version=0.81

From 0b74f67df48d7b4ab419b09ee252cdb61e7786fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Jul 2023 16:07:00 +0100
Subject: [PATCH 6/9] radare2: rebuild for capstone-5.0.

---
 srcpkgs/radare2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template
index 7ccf26ae8918..f38c84efa1d2 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -1,7 +1,7 @@
 # Template file for 'radare2'
 pkgname=radare2
 version=5.7.8
-revision=1
+revision=2
 build_style=meson
 configure_args="-Denable_tests=false -Duse_sys_capstone=true
  -Duse_sys_magic=true -Duse_sys_xxhash=true

From 742c57e6c285a3cfcdcd2b8556a78be2853e4c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Jul 2023 16:07:01 +0100
Subject: [PATCH 7/9] rizin: rebuild for capstone-5.0.

---
 srcpkgs/rizin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
index 8fe7acb2ff45..4888fc014d3b 100644
--- a/srcpkgs/rizin/template
+++ b/srcpkgs/rizin/template
@@ -1,7 +1,7 @@
 # Template file for 'rizin'
 pkgname=rizin
 version=0.5.2
-revision=1
+revision=2
 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

From 68644c25d3de158f914b568bca7a818cd52d46ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Jul 2023 16:07:01 +0100
Subject: [PATCH 8/9] uftrace: rebuild for capstone-5.0.

---
 srcpkgs/uftrace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uftrace/template b/srcpkgs/uftrace/template
index 8f703e0a812f..3e7690e4ea90 100644
--- a/srcpkgs/uftrace/template
+++ b/srcpkgs/uftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'uftrace'
 pkgname=uftrace
 version=0.14
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"

From fe5c0ff5d690d5275e45268980f99e22f580810a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Jul 2023 18:09:08 +0100
Subject: [PATCH 9/9] qemu: rebuild for capstone-5.0

---
 srcpkgs/qemu/patches/tricore_feature.patch | 60 ++++++++++++++++++++++
 srcpkgs/qemu/template                      |  2 +-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qemu/patches/tricore_feature.patch

diff --git a/srcpkgs/qemu/patches/tricore_feature.patch b/srcpkgs/qemu/patches/tricore_feature.patch
new file mode 100644
index 000000000000..f7f621f81170
--- /dev/null
+++ b/srcpkgs/qemu/patches/tricore_feature.patch
@@ -0,0 +1,60 @@
+capstone 5 declares this struct, so we need a different name
+--
+diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c
+index d0a9272..6297af9 100644
+--- a/target/tricore/cpu.c
++++ b/target/tricore/cpu.c
+@@ -103,14 +103,14 @@ static void tricore_cpu_realizefn(DeviceState *dev, Error **errp)
+     }
+ 
+     /* Some features automatically imply others */
+-    if (tricore_feature(env, TRICORE_FEATURE_161)) {
++    if (tricore_feature_x(env, TRICORE_FEATURE_161)) {
+         set_feature(env, TRICORE_FEATURE_16);
+     }
+ 
+-    if (tricore_feature(env, TRICORE_FEATURE_16)) {
++    if (tricore_feature_x(env, TRICORE_FEATURE_16)) {
+         set_feature(env, TRICORE_FEATURE_131);
+     }
+-    if (tricore_feature(env, TRICORE_FEATURE_131)) {
++    if (tricore_feature_x(env, TRICORE_FEATURE_131)) {
+         set_feature(env, TRICORE_FEATURE_13);
+     }
+     cpu_reset(cs);
+diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h
+index 47d0ffb..6fd447c 100644
+--- a/target/tricore/cpu.h
++++ b/target/tricore/cpu.h
+@@ -258,7 +258,7 @@ enum tricore_features {
+     TRICORE_FEATURE_161,
+ };
+ 
+-static inline int tricore_feature(CPUTriCoreState *env, int feature)
++static inline int tricore_feature_x(CPUTriCoreState *env, int feature)
+ {
+     return (env->features & (1ULL << feature)) != 0;
+ }
+diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c
+index 532ae6b..6a71b5b 100644
+--- a/target/tricore/op_helper.c
++++ b/target/tricore/op_helper.c
+@@ -2528,7 +2528,7 @@ void helper_ret(CPUTriCoreState *env)
+     /* PCXI = new_PCXI; */
+     env->PCXI = new_PCXI;
+ 
+-    if (tricore_feature(env, TRICORE_FEATURE_13)) {
++    if (tricore_feature_x(env, TRICORE_FEATURE_13)) {
+         /* PSW = new_PSW */
+         psw_write(env, new_PSW);
+     } else {
+@@ -2639,7 +2639,7 @@ void helper_rfm(CPUTriCoreState *env)
+     env->gpr_a[10] = cpu_ldl_data(env, env->DCX+8);
+     env->gpr_a[11] = cpu_ldl_data(env, env->DCX+12);
+ 
+-    if (tricore_feature(env, TRICORE_FEATURE_131)) {
++    if (tricore_feature_x(env, TRICORE_FEATURE_131)) {
+         env->DBGTCR = 0;
+     }
+ }
+
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 48ab199e5686..6f2c6ee51383 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
 # This package should be updated together with qemu-user-static
 pkgname=qemu
 version=7.1.0
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
  --disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie