mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
rizin/cutter, bump versions (#13811)
This commit is contained in:
@@ -7,15 +7,14 @@ engineers for reverse engineers."
|
||||
HOMEPAGE="https://github.com/rizinorg/cutter"
|
||||
COPYRIGHT="2021 xarkes, thestr4ng3r, ballessay, Hugo Teso"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="$HOMEPAGE/archive/refs/tags/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="5dc07d6a4903ccdb6c031310a85377793edf24dc0b8990e70a8f5c94af06a2a2"
|
||||
CHECKSUM_SHA256="91c5fbd79d496b48dec6ac72b7ac166dd307fa905d4f1bc38dbcb2603b956eed"
|
||||
SOURCE_FILENAME="cutter-$portVersion.tar.gz"
|
||||
srcGitRev_2="8358f174d519bbf0d6cf4e1ccbe586308c009f85"
|
||||
SOURCE_URI_2="https://github.com/rizinorg/cutter-translations/archive/$srcGitRev_2.tar.gz"
|
||||
CHECKSUM_SHA256_2="923d5703b481509576a0a1b3e396b8d8ac3b214b3e4db7b87325f7615ca408cd"
|
||||
SOURCE_FILENAME_2="translations-$srcGitRev_2.tar.gz"
|
||||
PATCHES="cutter-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="cutter.rdef.in"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -23,7 +22,7 @@ SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
cutter$secondaryArchSuffix = $portVersion
|
||||
app:Cutter = $portVersion
|
||||
app:Cutter$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -36,8 +35,8 @@ REQUIRES="
|
||||
lib:libQt6Gui$secondaryArchSuffix
|
||||
lib:libQt6Svg$secondaryArchSuffix
|
||||
lib:libQt6Widgets$secondaryArchSuffix
|
||||
lib:librz_analysis$secondaryArchSuffix
|
||||
lib:librz_asm$secondaryArchSuffix
|
||||
# lib:librz_analysis$secondaryArchSuffix
|
||||
lib:librz_arch$secondaryArchSuffix
|
||||
lib:librz_bin$secondaryArchSuffix
|
||||
lib:librz_bp$secondaryArchSuffix
|
||||
lib:librz_config$secondaryArchSuffix
|
||||
@@ -53,7 +52,7 @@ REQUIRES="
|
||||
lib:librz_lang$secondaryArchSuffix
|
||||
lib:librz_magic$secondaryArchSuffix
|
||||
lib:librz_main$secondaryArchSuffix
|
||||
lib:librz_parse$secondaryArchSuffix
|
||||
# lib:librz_parse$secondaryArchSuffix
|
||||
lib:librz_reg$secondaryArchSuffix
|
||||
lib:librz_search$secondaryArchSuffix
|
||||
lib:librz_socket$secondaryArchSuffix
|
||||
@@ -70,7 +69,7 @@ REQUIRES="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libcapstone$secondaryArchSuffix >= 5.0
|
||||
devel:libcapstone$secondaryArchSuffix
|
||||
devel:libgvc$secondaryArchSuffix
|
||||
devel:libpython3.10$secondaryArchSuffix
|
||||
devel:libQt6Core5Compat$secondaryArchSuffix
|
||||
@@ -81,8 +80,8 @@ BUILD_REQUIRES="
|
||||
devel:libQt6Network$secondaryArchSuffix
|
||||
devel:libQt6Svg$secondaryArchSuffix
|
||||
devel:libQt6Widgets$secondaryArchSuffix
|
||||
devel:librz_analysis$secondaryArchSuffix
|
||||
devel:librz_asm$secondaryArchSuffix
|
||||
# devel:librz_analysis$secondaryArchSuffix
|
||||
devel:librz_arch$secondaryArchSuffix
|
||||
devel:librz_bin$secondaryArchSuffix
|
||||
devel:librz_bp$secondaryArchSuffix
|
||||
devel:librz_config$secondaryArchSuffix
|
||||
@@ -98,7 +97,7 @@ BUILD_REQUIRES="
|
||||
devel:librz_lang$secondaryArchSuffix
|
||||
devel:librz_magic$secondaryArchSuffix
|
||||
devel:librz_main$secondaryArchSuffix
|
||||
devel:librz_parse$secondaryArchSuffix
|
||||
# devel:librz_parse$secondaryArchSuffix
|
||||
devel:librz_reg$secondaryArchSuffix
|
||||
devel:librz_search$secondaryArchSuffix
|
||||
devel:librz_socket$secondaryArchSuffix
|
||||
@@ -116,11 +115,11 @@ BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:lrelease$secondaryArchSuffix >= 5
|
||||
# cmd:lrelease$secondaryArchSuffix >= 5
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:python3
|
||||
cmd:qmake$secondaryArchSuffix >= 5
|
||||
# cmd:qmake$secondaryArchSuffix >= 5
|
||||
"
|
||||
|
||||
BUILD()
|
||||
@@ -133,8 +132,8 @@ BUILD()
|
||||
-DCUTTER_ENABLE_PYTHON=ON \
|
||||
-DCUTTER_USE_BUNDLED_RIZIN=OFF \
|
||||
-DCUTTER_QT6=ON \
|
||||
-DCMAKE_CXX_FLAGS="-fpermissive" \
|
||||
-Wno-dev
|
||||
-DCUTTER_ENABLE_GRAPHVIZ=OFF \
|
||||
-DCMAKE_CXX_FLAGS="-fpermissive"
|
||||
|
||||
make -C build $jobArgs
|
||||
}
|
||||
@@ -1,154 +0,0 @@
|
||||
From d782d9a56bd143224d49388b6c7c9ffaebe61633 Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Tue, 23 May 2023 10:06:48 +0200
|
||||
Subject: Fix build and detection for rizin
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a6bfdb5..6b3cda5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -75,8 +75,8 @@ if(CUTTER_USE_BUNDLED_RIZIN)
|
||||
include(BundledRizin)
|
||||
set(RIZIN_TARGET Rizin)
|
||||
else()
|
||||
- find_package(Rizin COMPONENTS Core REQUIRED)
|
||||
- set(RIZIN_TARGET Rizin::Core)
|
||||
+ find_package(Rizin REQUIRED)
|
||||
+ set(RIZIN_TARGET Rizin::librz)
|
||||
endif()
|
||||
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
diff --git a/cmake/FindRizin.cmake b/cmake/FindRizin.cmake
|
||||
new file mode 100644
|
||||
index 0000000..8a17b6b
|
||||
--- /dev/null
|
||||
+++ b/cmake/FindRizin.cmake
|
||||
@@ -0,0 +1,124 @@
|
||||
+# - Find Rizin (librz)
|
||||
+#
|
||||
+# This module provides the following imported targets, if found:
|
||||
+#
|
||||
+# Rizin::librz
|
||||
+#
|
||||
+# This will define the following variables:
|
||||
+# (but don't use them if you don't know what you are doing, use Rizin::librz)
|
||||
+#
|
||||
+# Rizin_FOUND - True if librz has been found.
|
||||
+# Rizin_INCLUDE_DIRS - librz include directory
|
||||
+# Rizin_LIBRARIES - List of libraries when using librz.
|
||||
+# Rizin_LIBRARY_DIRS - librz library directories
|
||||
+#
|
||||
+# If librz was found using find_library and not pkg-config, the following variables will also be set:
|
||||
+# Rizin_LIBRARY_<name> - Path to library rz_<name>
|
||||
+
|
||||
+if(HAIKU)
|
||||
+ find_path(Rizin_INCLUDE_DIRS
|
||||
+ NAMES rz_core.h rz_bin.h rz_util.h
|
||||
+ HINTS
|
||||
+ "$ENV{HOME}/bin/prefix/rizin/include/librz"
|
||||
+ /usr/local/include/libr
|
||||
+ /usr/include/librz
|
||||
+ /system/develop/headers/x86/librz
|
||||
+ /system/develop/headers/librz)
|
||||
+ find_path(SDB_INCLUDE_DIR
|
||||
+ NAMES sdb.h sdbht.h sdb_version.h
|
||||
+ HINTS
|
||||
+ "$ENV{HOME}/bin/prefix/rizin/include/librz/sdb"
|
||||
+ /usr/local/include/librz/sdb
|
||||
+ /usr/include/librz/sdb
|
||||
+ /system/develop/headers/x86/librz/sdb
|
||||
+ /system/develop/headers/librz/sdb)
|
||||
+
|
||||
+ list(APPEND Rizin_INCLUDE_DIRS ${SDB_INCLUDE_DIR})
|
||||
+
|
||||
+ set(Rizin_LIBRARY_NAMES
|
||||
+ core
|
||||
+ config
|
||||
+ cons
|
||||
+ io
|
||||
+ util
|
||||
+ flag
|
||||
+ asm
|
||||
+ debug
|
||||
+ hash
|
||||
+ bin
|
||||
+ lang
|
||||
+ io
|
||||
+ analysis
|
||||
+ parse
|
||||
+ bp
|
||||
+ egg
|
||||
+ reg
|
||||
+ search
|
||||
+ sign
|
||||
+ syscall
|
||||
+ socket
|
||||
+ magic
|
||||
+ crypto
|
||||
+ type)
|
||||
+
|
||||
+ set(Rizin_LIBRARIES "")
|
||||
+ set(Rizin_LIBRARIES_VARS "")
|
||||
+ foreach(libname ${Rizin_LIBRARY_NAMES})
|
||||
+ find_library(Rizin_LIBRARY_${libname}
|
||||
+ rz_${libname}
|
||||
+ HINTS
|
||||
+ "$ENV{HOME}/bin/prefix/rizin/lib"
|
||||
+ /usr/local/lib
|
||||
+ /usr/lib
|
||||
+ /system/lib/x86
|
||||
+ /system/lib)
|
||||
+
|
||||
+ list(APPEND Rizin_LIBRARIES ${Rizin_LIBRARY_${libname}})
|
||||
+ list(APPEND Rizin_LIBRARIES_VARS "Rizin_LIBRARY_${libname}")
|
||||
+ endforeach()
|
||||
+
|
||||
+ set(Rizin_LIBRARY_DIRS "")
|
||||
+
|
||||
+ add_library(Rizin::librz UNKNOWN IMPORTED)
|
||||
+ set_target_properties(Rizin::librz PROPERTIES
|
||||
+ IMPORTED_LOCATION "${Rizin_LIBRARY_core}"
|
||||
+ IMPORTED_LINK_INTERFACE_LIBRARIES "${Rizin_LIBRARIES}"
|
||||
+ INTERFACE_LINK_DIRECTORIES "${Rizin_LIBRARY_DIRS}"
|
||||
+ INTERFACE_INCLUDE_DIRECTORIES "${Rizin_INCLUDE_DIRS}")
|
||||
+ set(Rizin_TARGET Rizin::librz)
|
||||
+else()
|
||||
+ # support installation locations used by rizin scripts like sys/user.sh and sys/install.sh
|
||||
+ if(CUTTER_USE_ADDITIONAL_RIZIN_PATHS)
|
||||
+ set(Rizin_CMAKE_PREFIX_PATH_TEMP ${CMAKE_PREFIX_PATH})
|
||||
+ list(APPEND CMAKE_PREFIX_PATH "$ENV{HOME}/bin/prefix/rizin") # sys/user.sh
|
||||
+ list(APPEND CMAKE_PREFIX_PATH "/usr/local") # sys/install.sh
|
||||
+ endif()
|
||||
+
|
||||
+ find_package(PkgConfig REQUIRED)
|
||||
+ if(CMAKE_VERSION VERSION_LESS "3.6")
|
||||
+ pkg_search_module(Rizin REQUIRED rz_core)
|
||||
+ else()
|
||||
+ pkg_search_module(Rizin IMPORTED_TARGET REQUIRED rz_core)
|
||||
+ endif()
|
||||
+
|
||||
+ # reset CMAKE_PREFIX_PATH
|
||||
+ if(CUTTER_USE_ADDITIONAL_RIZIN_PATHS)
|
||||
+ set(CMAKE_PREFIX_PATH ${Rizin_CMAKE_PREFIX_PATH_TEMP})
|
||||
+ endif()
|
||||
+
|
||||
+ if((TARGET PkgConfig::Rizin) AND (NOT CMAKE_VERSION VERSION_LESS "3.11.0"))
|
||||
+ set_target_properties(PkgConfig::Rizin PROPERTIES IMPORTED_GLOBAL ON)
|
||||
+ add_library(Rizin::librz ALIAS PkgConfig::Rizin)
|
||||
+ set(Rizin_TARGET Rizin::librz)
|
||||
+ elseif(Rizin_FOUND)
|
||||
+ add_library(Rizin::librz INTERFACE IMPORTED)
|
||||
+ set_target_properties(Rizin::librz PROPERTIES
|
||||
+ INTERFACE_INCLUDE_DIRECTORIES "${Rizin_INCLUDE_DIRS}")
|
||||
+ set_target_properties(Rizin::librz PROPERTIES
|
||||
+ INTERFACE_LINK_LIBRARIES "${Rizin_LIBRARIES}")
|
||||
+ set(Rizin_TARGET Rizin::librz)
|
||||
+ endif()
|
||||
+endif()
|
||||
+
|
||||
+include(FindPackageHandleStandardArgs)
|
||||
+find_package_handle_standard_args(Rizin REQUIRED_VARS Rizin_TARGET Rizin_LIBRARIES Rizin_INCLUDE_DIRS)
|
||||
--
|
||||
2.43.2
|
||||
|
||||
303
dev-util/rizin/patches/5149.patch
Normal file
303
dev-util/rizin/patches/5149.patch
Normal file
@@ -0,0 +1,303 @@
|
||||
From 9108f5a92f67b5d9bf8100dbd596b3f99145d02d Mon Sep 17 00:00:00 2001
|
||||
From: wargio <deroad@kumo.xn--q9jyb4c>
|
||||
Date: Sat, 17 May 2025 17:06:07 +0800
|
||||
Subject: [PATCH 1/7] Fix sys.c unused variable.
|
||||
|
||||
---
|
||||
librz/util/sys.c | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/librz/util/sys.c b/librz/util/sys.c
|
||||
index f27b9614e3d..4522a13bd31 100644
|
||||
--- a/librz/util/sys.c
|
||||
+++ b/librz/util/sys.c
|
||||
@@ -1229,12 +1229,11 @@ RZ_API char *rz_sys_pid_to_path(int pid) {
|
||||
}
|
||||
return rz_str_dup(pathbuf);
|
||||
#else
|
||||
- int ret;
|
||||
#if __FreeBSD__ || __DragonFly__
|
||||
char pathbuf[PATH_MAX];
|
||||
size_t pathbufl = sizeof(pathbuf);
|
||||
int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid };
|
||||
- ret = sysctl(mib, 4, pathbuf, &pathbufl, NULL, 0);
|
||||
+ int ret = sysctl(mib, 4, pathbuf, &pathbufl, NULL, 0);
|
||||
if (ret != 0) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -1245,7 +1244,7 @@ RZ_API char *rz_sys_pid_to_path(int pid) {
|
||||
size_t len;
|
||||
|
||||
pathbuf[0] = '\0';
|
||||
- ret = sysctl(mib, 4, NULL, &len, NULL, 0);
|
||||
+ int ret = sysctl(mib, 4, NULL, &len, NULL, 0);
|
||||
if (ret < 0) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -1310,7 +1309,7 @@ RZ_API char *rz_sys_pid_to_path(int pid) {
|
||||
#else
|
||||
char buf[128], pathbuf[1024];
|
||||
snprintf(buf, sizeof(buf), "/proc/%d/exe", pid);
|
||||
- ret = readlink(buf, pathbuf, sizeof(pathbuf) - 1);
|
||||
+ int ret = readlink(buf, pathbuf, sizeof(pathbuf) - 1);
|
||||
if (ret < 1) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
From 394884ca32cb8c029c6bbd801a95b87f4ade3797 Mon Sep 17 00:00:00 2001
|
||||
From: wargio <deroad@kumo.xn--q9jyb4c>
|
||||
Date: Sat, 17 May 2025 17:08:09 +0800
|
||||
Subject: [PATCH 2/7] Add native/unsupported.c
|
||||
|
||||
---
|
||||
librz/debug/p/debug_native.c | 6 +++++-
|
||||
librz/debug/p/native/unsupported.c | 16 ++++++++++++++++
|
||||
2 files changed, 21 insertions(+), 1 deletion(-)
|
||||
create mode 100644 librz/debug/p/native/unsupported.c
|
||||
|
||||
diff --git a/librz/debug/p/debug_native.c b/librz/debug/p/debug_native.c
|
||||
index a35a0c0be86..83798dfdcf7 100644
|
||||
--- a/librz/debug/p/debug_native.c
|
||||
+++ b/librz/debug/p/debug_native.c
|
||||
@@ -30,6 +30,7 @@ static int rz_debug_native_reg_write(RzDebug *dbg, int type, const ut8 *buf, int
|
||||
#warning "Unsupported debugging platform"
|
||||
#undef DEBUGGER
|
||||
#define DEBUGGER 0
|
||||
+#include "native/unsupported.c"
|
||||
#endif
|
||||
|
||||
#elif __ANDROID__
|
||||
@@ -43,6 +44,7 @@ static int rz_debug_native_reg_write(RzDebug *dbg, int type, const ut8 *buf, int
|
||||
#warning "Unsupported debugging platform"
|
||||
#undef DEBUGGER
|
||||
#define DEBUGGER 0
|
||||
+#include "native/unsupported.c"
|
||||
#endif
|
||||
|
||||
#elif __linux__
|
||||
@@ -74,6 +76,7 @@ static int rz_debug_native_reg_write(RzDebug *dbg, int type, const ut8 *buf, int
|
||||
#warning "Unsupported debugging platform"
|
||||
#undef DEBUGGER
|
||||
#define DEBUGGER 0
|
||||
+#include "native/unsupported.c"
|
||||
#endif
|
||||
|
||||
#elif __sun
|
||||
@@ -81,11 +84,12 @@ static int rz_debug_native_reg_write(RzDebug *dbg, int type, const ut8 *buf, int
|
||||
#undef DEBUGGER
|
||||
#define DEBUGGER 0
|
||||
#warning "No debugger support for SunOS yet"
|
||||
-
|
||||
+#include "native/unsupported.c"
|
||||
#else
|
||||
#warning "Unsupported debugging platform"
|
||||
#undef DEBUGGER
|
||||
#define DEBUGGER 0
|
||||
+#include "native/unsupported.c"
|
||||
#endif // Native OS & Arch
|
||||
|
||||
#if DEBUGGER
|
||||
diff --git a/librz/debug/p/native/unsupported.c b/librz/debug/p/native/unsupported.c
|
||||
new file mode 100644
|
||||
index 00000000000..42972559a0a
|
||||
--- /dev/null
|
||||
+++ b/librz/debug/p/native/unsupported.c
|
||||
@@ -0,0 +1,16 @@
|
||||
+// SPDX-FileCopyrightText: 2025 RizinOrg <info@rizin.re>
|
||||
+// SPDX-FileCopyrightText: 2025 deroad <wargio@libero.it>
|
||||
+// SPDX-License-Identifier: LGPL-3.0-only
|
||||
+
|
||||
+/**
|
||||
+ * \file This is a file with dummy debugger functions for when
|
||||
+ * the native debugger is unsupported.
|
||||
+ */
|
||||
+
|
||||
+RZ_API ut64 rz_debug_get_tls(RZ_NONNULL RzDebug *dbg, int tid) {
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+RZ_API RZ_OWN RzList /*<RzDebugPid *>*/ *rz_debug_native_threads(RzDebug *dbg, int pid) {
|
||||
+ return rz_list_new();
|
||||
+}
|
||||
|
||||
From 18e21493ace939cc3b1c82ebf8f2a0c439677345 Mon Sep 17 00:00:00 2001
|
||||
From: wargio <deroad@kumo.xn--q9jyb4c>
|
||||
Date: Sat, 17 May 2025 17:08:44 +0800
|
||||
Subject: [PATCH 3/7] Clean rz_debug.h from comments and functions which does
|
||||
not exists
|
||||
|
||||
---
|
||||
librz/include/rz_debug.h | 28 ----------------------------
|
||||
1 file changed, 28 deletions(-)
|
||||
|
||||
diff --git a/librz/include/rz_debug.h b/librz/include/rz_debug.h
|
||||
index d638a0cefd1..8628bb6b217 100644
|
||||
--- a/librz/include/rz_debug.h
|
||||
+++ b/librz/include/rz_debug.h
|
||||
@@ -472,10 +472,6 @@ RZ_API int rz_debug_continue_pass_exception(RzDebug *dbg);
|
||||
|
||||
/* process/thread handling */
|
||||
RZ_API bool rz_debug_select(RzDebug *dbg, int pid, int tid);
|
||||
-// RZ_API int rz_debug_pid_add(RzDebug *dbg);
|
||||
-// RZ_API int rz_debug_pid_add_thread(RzDebug *dbg);
|
||||
-// RZ_API int rz_debug_pid_del(RzDebug *dbg);
|
||||
-// RZ_API int rz_debug_pid_del_thread(RzDebug *dbg);
|
||||
RZ_API RzDebugPid *rz_debug_pid_new(const char *path, int pid, int uid, char status, ut64 pc);
|
||||
RZ_API RzDebugPid *rz_debug_pid_free(RzDebugPid *pid);
|
||||
RZ_API RzList /*<RzDebugPid *>*/ *rz_debug_pids(RzDebug *dbg, int pid);
|
||||
@@ -502,8 +498,6 @@ RZ_API int rz_debug_signal_set(RzDebug *dbg, int num, ut64 addr);
|
||||
RZ_API bool rz_debug_can_kill(RzDebug *dbg);
|
||||
RZ_API int rz_debug_kill(RzDebug *dbg, int pid, int tid, int sig);
|
||||
RZ_API RzList /*<void *>*/ *rz_debug_kill_list(RzDebug *dbg);
|
||||
-// XXX: must be uint64 action
|
||||
-RZ_API int rz_debug_kill_setup(RzDebug *dbg, int sig, int action);
|
||||
|
||||
/* handle.c */
|
||||
RZ_API void rz_debug_plugin_init(RzDebug *dbg);
|
||||
@@ -531,7 +525,6 @@ RZ_API int rz_debug_desc_dup(RzDebug *dbg, int fd, int newfd);
|
||||
RZ_API int rz_debug_desc_read(RzDebug *dbg, int fd, ut64 addr, int len);
|
||||
RZ_API int rz_debug_desc_seek(RzDebug *dbg, int fd, ut64 addr); // TODO: whence?
|
||||
RZ_API int rz_debug_desc_write(RzDebug *dbg, int fd, ut64 addr, int len);
|
||||
-RZ_API int rz_debug_desc_list(RzDebug *dbg, int rad);
|
||||
|
||||
/* registers */
|
||||
RZ_API bool rz_debug_reg_profile_sync(RzDebug *dbg);
|
||||
@@ -588,7 +581,6 @@ RZ_API int rz_debug_esil_watch_empty(RzDebug *dbg);
|
||||
RZ_API void rz_debug_esil_prestep(RzDebug *d, int p);
|
||||
|
||||
/* record & replay */
|
||||
-// RZ_API ut8 rz_debug_get_byte(RzDebug *dbg, ut32 cnum, ut64 addr);
|
||||
RZ_API bool rz_debug_add_checkpoint(RzDebug *dbg);
|
||||
RZ_API bool rz_debug_session_add_reg_change(RzDebugSession *session, int arena, ut64 offset, ut64 data);
|
||||
RZ_API bool rz_debug_session_add_mem_change(RzDebugSession *session, ut64 addr, ut8 data);
|
||||
@@ -637,23 +629,3 @@ static inline void *rz_debug_ptrace_func(RzDebug *dbg, void *(*func)(void *), vo
|
||||
#endif
|
||||
|
||||
#endif
|
||||
-
|
||||
-/* regset */
|
||||
-// RZ_API struct rz_regset_t* rz_regset_diff(struct rz_regset_t *a, struct rz_regset_t *b);
|
||||
-// RZ_API int rz_regset_set(struct rz_regset_t *r, int idx, const char *name, ut64 value);
|
||||
-// RZ_API struct rz_regset_t *rz_regset_new(int size);
|
||||
-// RZ_API void rz_regset_free(struct rz_regset_t *r);
|
||||
-
|
||||
-#if 0
|
||||
-Missing callbacks
|
||||
-=================
|
||||
- - alloc
|
||||
- - dealloc
|
||||
- - list maps (memory regions)
|
||||
- - change memory protections
|
||||
- - touchtrace
|
||||
- - filedescriptor set/get/mod..
|
||||
- - get/set signals
|
||||
- - get regs, set regs
|
||||
-
|
||||
-#endif
|
||||
|
||||
From 3d8f699977ba07b7ad0a88437b08dc0ee171563d Mon Sep 17 00:00:00 2001
|
||||
From: wargio <deroad@kumo.xn--q9jyb4c>
|
||||
Date: Sat, 17 May 2025 17:14:17 +0800
|
||||
Subject: [PATCH 4/7] Add fall-thru comment for haiku os case
|
||||
|
||||
---
|
||||
librz/cons/input.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/librz/cons/input.c b/librz/cons/input.c
|
||||
index b77788aab37..8bd9fd6cf55 100644
|
||||
--- a/librz/cons/input.c
|
||||
+++ b/librz/cons/input.c
|
||||
@@ -103,6 +103,7 @@ RZ_API int rz_cons_arrow_to_hjkl(int ch) {
|
||||
ch = 0xf1 + (ch & 0xf);
|
||||
break;
|
||||
}
|
||||
+ // fall-thru
|
||||
case '[': // 0x5b function keys (2)
|
||||
/* Haiku need ESC + [ for PageUp and PageDown */
|
||||
if (ch < 'A' || ch == '[') {
|
||||
|
||||
From 7487aac45006072238d9d9f37dd0260c7ea58dc8 Mon Sep 17 00:00:00 2001
|
||||
From: wargio <deroad@kumo.xn--q9jyb4c>
|
||||
Date: Sat, 17 May 2025 17:17:24 +0800
|
||||
Subject: [PATCH 5/7] Fix warning: "MIN" redefined
|
||||
|
||||
/boot/system/develop/headers/posix/sys/param.h:18: note: this is the location of the previous definition
|
||||
18 | # define MIN(a,b) (((a) < (b)) ? (a) : (b))
|
||||
---
|
||||
librz/arch/isa/tricore/tricore_il.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/librz/arch/isa/tricore/tricore_il.c b/librz/arch/isa/tricore/tricore_il.c
|
||||
index 6a991c3d21d..995cfaf18c7 100644
|
||||
--- a/librz/arch/isa/tricore/tricore_il.c
|
||||
+++ b/librz/arch/isa/tricore/tricore_il.c
|
||||
@@ -2588,10 +2588,10 @@ static RzILOpEffect *e_BS(RzAsmTriCoreContext *ctx, unsigned b, FUNC_BS f) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
-#define MIN(x, y) ITE(UGT(x, y), DUP(x), DUP(y))
|
||||
+#define IL_MIN(x, y) ITE(UGT(x, y), DUP(x), DUP(y))
|
||||
#define CRC_32_GENERATOR 0xEDB88320
|
||||
static RzILOpPure *crc_div(RzILOpPure *c, RzILOpPure *g, RzILOpPure *crc_width, RzILOpPure *data_width) {
|
||||
- return LET("shift", MIN(crc_width, data_width),
|
||||
+ return LET("shift", IL_MIN(crc_width, data_width),
|
||||
MOD(SHIFTL0(c, VARLP("shift")), LOGOR(g, SHIFTL0(U32(1), DUP(crc_width)))));
|
||||
}
|
||||
|
||||
|
||||
From 6d11e8a9ae18ba592edcba2dcab0a23573b6803c Mon Sep 17 00:00:00 2001
|
||||
From: wargio <deroad@kumo.xn--q9jyb4c>
|
||||
Date: Sat, 17 May 2025 17:22:20 +0800
|
||||
Subject: [PATCH 6/7] Fix declared 'static' but never defined when unsupported
|
||||
OS
|
||||
|
||||
---
|
||||
librz/debug/p/native/unsupported.c | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/librz/debug/p/native/unsupported.c b/librz/debug/p/native/unsupported.c
|
||||
index 42972559a0a..057e83776ee 100644
|
||||
--- a/librz/debug/p/native/unsupported.c
|
||||
+++ b/librz/debug/p/native/unsupported.c
|
||||
@@ -14,3 +14,17 @@ RZ_API ut64 rz_debug_get_tls(RZ_NONNULL RzDebug *dbg, int tid) {
|
||||
RZ_API RZ_OWN RzList /*<RzDebugPid *>*/ *rz_debug_native_threads(RzDebug *dbg, int pid) {
|
||||
return rz_list_new();
|
||||
}
|
||||
+
|
||||
+static int rz_debug_native_continue(RzDebug *dbg, int pid, int tid, int sig) {
|
||||
+ return -1;
|
||||
+}
|
||||
+
|
||||
+static int rz_debug_native_reg_read(RzDebug *dbg, int type, ut8 *buf, int size) {
|
||||
+ // TODO: this is returning a boolean, but for some reasons we have int
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+static int rz_debug_native_reg_write(RzDebug *dbg, int type, const ut8 *buf, int size) {
|
||||
+ // TODO: this is returning a boolean, but for some reasons we have int
|
||||
+ return false;
|
||||
+}
|
||||
|
||||
From e0a53b27cd3580d625b2e37293b95fc61c8af287 Mon Sep 17 00:00:00 2001
|
||||
From: wargio <deroad@kumo.xn--q9jyb4c>
|
||||
Date: Sat, 17 May 2025 17:30:39 +0800
|
||||
Subject: [PATCH 7/7] Fix formatting
|
||||
|
||||
---
|
||||
librz/arch/isa/tricore/tricore_il.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/librz/arch/isa/tricore/tricore_il.c b/librz/arch/isa/tricore/tricore_il.c
|
||||
index 995cfaf18c7..a061029b613 100644
|
||||
--- a/librz/arch/isa/tricore/tricore_il.c
|
||||
+++ b/librz/arch/isa/tricore/tricore_il.c
|
||||
@@ -2588,7 +2588,7 @@ static RzILOpEffect *e_BS(RzAsmTriCoreContext *ctx, unsigned b, FUNC_BS f) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
-#define IL_MIN(x, y) ITE(UGT(x, y), DUP(x), DUP(y))
|
||||
+#define IL_MIN(x, y) ITE(UGT(x, y), DUP(x), DUP(y))
|
||||
#define CRC_32_GENERATOR 0xEDB88320
|
||||
static RzILOpPure *crc_div(RzILOpPure *c, RzILOpPure *g, RzILOpPure *crc_width, RzILOpPure *data_width) {
|
||||
return LET("shift", IL_MIN(crc_width, data_width),
|
||||
@@ -16,10 +16,11 @@ LICENSE="Apache v2
|
||||
MPL v1.1
|
||||
NCSA
|
||||
RSA-MD"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/rizinorg/rizin/archive/refs/tags/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="b56af761d04914d59b7c78fafd357f2356f4fe2955c23f7dcb61e62d7af7a22a"
|
||||
CHECKSUM_SHA256="7dc451968f426e846c04430f7d6d45f1402db8eed1afa902f0631c03f19bc22e"
|
||||
SOURCE_FILENAME="rizin-v$portVersion.tar.gz"
|
||||
PATCHES="5149.patch"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
@@ -49,8 +50,7 @@ PROVIDES="
|
||||
cmd:rz_run$commandSuffix
|
||||
cmd:rz_sign$commandSuffix
|
||||
cmd:rz_test$commandSuffix
|
||||
lib:librz_analysis$secondaryArchSuffix = $libVersionCompat
|
||||
lib:librz_asm$secondaryArchSuffix = $libVersionCompat
|
||||
lib:librz_arch$secondaryArchSuffix = $libVersionCompat
|
||||
lib:librz_bin$secondaryArchSuffix = $libVersionCompat
|
||||
lib:librz_bp$secondaryArchSuffix = $libVersionCompat
|
||||
lib:librz_config$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -68,7 +68,6 @@ PROVIDES="
|
||||
lib:librz_lang$secondaryArchSuffix = $libVersionCompat
|
||||
lib:librz_magic$secondaryArchSuffix = $libVersionCompat
|
||||
lib:librz_main$secondaryArchSuffix = $libVersionCompat
|
||||
lib:librz_parse$secondaryArchSuffix = $libVersionCompat
|
||||
lib:librz_reg$secondaryArchSuffix = $libVersionCompat
|
||||
lib:librz_search$secondaryArchSuffix = $libVersionCompat
|
||||
lib:librz_sign$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -98,8 +97,7 @@ REQUIRES="
|
||||
|
||||
PROVIDES_devel="
|
||||
rizin${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:librz_analysis$secondaryArchSuffix = $libVersionCompat
|
||||
devel:librz_asm$secondaryArchSuffix = $libVersionCompat
|
||||
devel:librz_arch$secondaryArchSuffix = $libVersionCompat
|
||||
devel:librz_bin$secondaryArchSuffix = $libVersionCompat
|
||||
devel:librz_bp$secondaryArchSuffix = $libVersionCompat
|
||||
devel:librz_config$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -117,7 +115,6 @@ PROVIDES_devel="
|
||||
devel:librz_lang$secondaryArchSuffix = $libVersionCompat
|
||||
devel:librz_magic$secondaryArchSuffix = $libVersionCompat
|
||||
devel:librz_main$secondaryArchSuffix = $libVersionCompat
|
||||
devel:librz_parse$secondaryArchSuffix = $libVersionCompat
|
||||
devel:librz_reg$secondaryArchSuffix = $libVersionCompat
|
||||
devel:librz_search$secondaryArchSuffix = $libVersionCompat
|
||||
devel:librz_sign$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -150,8 +147,8 @@ BUILD_REQUIRES="
|
||||
devel:liblzma$secondaryArchSuffix
|
||||
devel:libmagic$secondaryArchSuffix
|
||||
devel:libmspack$secondaryArchSuffix
|
||||
devel:libpcre2_8$secondaryArchSuffix >= 0.12.0
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libpcre2_8$secondaryArchSuffix >= 0.14.0
|
||||
devel:libssl$secondaryArchSuffix >= 3
|
||||
devel:libtree_sitter$secondaryArchSuffix
|
||||
devel:libuv$secondaryArchSuffix
|
||||
devel:libxxhash$secondaryArchSuffix
|
||||
@@ -205,7 +202,7 @@ BUILD()
|
||||
-D enable_rz_test=false \
|
||||
-D subprojects_check=false
|
||||
|
||||
ninja -v -C build
|
||||
ninja -C build
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
@@ -213,8 +210,7 @@ INSTALL()
|
||||
ninja -C build install
|
||||
|
||||
prepareInstalledDevelLibs \
|
||||
librz_analysis \
|
||||
librz_asm \
|
||||
librz_arch \
|
||||
librz_bin \
|
||||
librz_bp \
|
||||
librz_config \
|
||||
@@ -232,7 +228,6 @@ INSTALL()
|
||||
librz_lang \
|
||||
librz_magic \
|
||||
librz_main \
|
||||
librz_parse \
|
||||
librz_reg \
|
||||
librz_search \
|
||||
librz_sign \
|
||||
Reference in New Issue
Block a user