Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Capstone 5.0 #44967

Merged
merged 12 commits into from
Sep 15, 2023
Merged

Capstone 5.0 #44967

merged 12 commits into from
Sep 15, 2023

Conversation

motorto
Copy link
Contributor

@motorto motorto commented Jul 10, 2023

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

@classabbyamp
Copy link
Member

would you mind adding this patch to the PR? I've tested it and it works.

From 681f1c71fe0ffe780407365ebbd91efdfc3fb8b9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 11 Jul 2023 20:19:36 -0400
Subject: [PATCH] imhex: use system capstone

---
 srcpkgs/imhex/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 3f7f475038..94a058c2b1 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,18 +1,17 @@
 # Template file for 'imhex'
 pkgname=imhex
 version=1.30.1
-revision=1
+revision=2
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
-# XXX: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
 configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
- -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
 makedepends="libcurl-devel fmt-devel llvm jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra"
+ clang-tools-extra capstone-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-or-later"
-- 
2.41.0

@motorto motorto force-pushed the capstone-5.0 branch 4 times, most recently from 000296a to 37d79ea Compare July 15, 2023 13:17
@XVilka
Copy link
Contributor

XVilka commented Jul 15, 2023

@motorto I see you updated Rizin to use capstone. It is not currently supported for all releases; it requires rizinorg/rizin#3653 to be merged first to fix all tests and mitigate some capstone regressions. We will support capstone starting the next release (0.6.0), which is planned soon (a few weeks or so). While it might compile, the results could sometimes be incorrect. It's better to wait for the next release.

@motorto
Copy link
Contributor Author

motorto commented Jul 15, 2023

@motorto I see you updated Rizin to use capstone. It is not currently supported for all releases; it requires rizinorg/rizin#3653 to be merged first to fix all tests and mitigate some capstone regressions. We will support capstone starting the next release (0.6.0), which is planned soon (a few weeks or so). While it might compile, the results could sometimes be incorrect. It's better to wait for the next release.

Appreciate your insight. We will wait for the rizin release then.

@motorto motorto marked this pull request as draft July 15, 2023 19:35
@XVilka
Copy link
Contributor

XVilka commented Aug 5, 2023

@motorto Rizin 0.6.0 and Cutter 2.3.0 that support capstone 5.0 are out, sorry for the delay.

@motorto
Copy link
Contributor Author

motorto commented Aug 7, 2023

@motorto Rizin 0.6.0 and Cutter 2.3.0 that support capstone 5.0 are out, sorry for the delay.

Hey, thanks for the heads up. No need to apologize we are all doing this in our free time :)

@motorto motorto force-pushed the capstone-5.0 branch 2 times, most recently from da2a670 to 68c6135 Compare August 9, 2023 14:04
@motorto motorto marked this pull request as ready for review August 9, 2023 21:56
@XVilka
Copy link
Contributor

XVilka commented Aug 20, 2023

@motorto rizin bugfix release is out, fixing CVE-2023-40022: https://github.com/rizinorg/rizin/releases/tag/v0.6.1

Corresponding Cutter release was also tagged with updated translations: https://github.com/rizinorg/cutter/releases/tag/v2.3.1

@motorto
Copy link
Contributor Author

motorto commented Aug 20, 2023

@motorto rizin bugfix release is out, fixing CVE-2023-40022: https://github.com/rizinorg/rizin/releases/tag/v0.6.1

Corresponding Cutter release was also tagged with updated translations: https://github.com/rizinorg/cutter/releases/tag/v2.3.1

Thanks !!!

@motorto
Copy link
Contributor Author

motorto commented Aug 22, 2023

@classabbyamp: added checkdepends=cmake on the imhex template. It couldn't find the ctest without it ...

@classabbyamp
Copy link
Member

hm that should probably be reported in #45679

@sgn
Copy link
Member

sgn commented Aug 23, 2023

@motorto Did you rebase on latest void-packages?

@XVilka
Copy link
Contributor

XVilka commented Aug 23, 2023

By the way, there is a bugfix release for capstone, you might want to try switching to it directly: https://github.com/capstone-engine/capstone/releases/tag/5.0.1

@motorto
Copy link
Contributor Author

motorto commented Aug 23, 2023

@motorto Did you rebase on latest void-packages?

Not the latest/latest I would say last week. But will rebase now, make a rebuild and push. Asking because of the cmake build style changes, correct ?

@motorto
Copy link
Contributor Author

motorto commented Aug 23, 2023

By the way, there is a bugfix release for capstone, you might want to try switching to it directly: https://github.com/capstone-engine/capstone/releases/tag/5.0.1

Thanks, for the heads up!

@sgn
Copy link
Member

sgn commented Aug 23, 2023

@motorto Did you rebase on latest void-packages?

Not the latest/latest I would say last week. But will rebase now, make a rebuild and push. Asking because of the cmake build style changes, correct ?

Yes, the check run normally on top of current master.

@motorto
Copy link
Contributor Author

motorto commented Aug 23, 2023

Yes, the check run normally on top of current master.

Yes, can confirm that, removed the checkdepends= line. Thanks for the attention.

@XVilka
Copy link
Contributor

XVilka commented Sep 14, 2023

Meanwhile we updated Cutter and Rizin with new bugfix releases, you could pick them in the same PR:

@classabbyamp classabbyamp merged commit 80a1c49 into void-linux:master Sep 15, 2023
8 checks passed
@motorto motorto deleted the capstone-5.0 branch September 15, 2023 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants