radare2: update to 5.3.1 (#7010)

This commit is contained in:
Apkunpacker 2021-07-18 03:07:24 +05:30 committed by GitHub
parent 91edc4d9a9
commit 6be1b7c019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 56 deletions

View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://rada.re
TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=5.2.1
TERMUX_PKG_VERSION=5.3.1
TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=1f0a85fd53ebe003ceb94735ecb4c2f7966f6270526bf1461faaf301658c57e9
TERMUX_PKG_SHA256=f95cbbba27f427bc3da41e9296e632c4bba1c47d107a9c911e82a524c136c406
TERMUX_PKG_DEPENDS="libuv"
TERMUX_PKG_BREAKS="radare2-dev"
TERMUX_PKG_REPLACES="radare2-dev"

View File

@ -1,54 +0,0 @@
diff -uNr radare2-5.1.0/libr/core/cconfig.c radare2-5.1.0.mod/libr/core/cconfig.c
--- radare2-5.1.0/libr/core/cconfig.c 2021-01-25 14:41:12.000000000 +0000
+++ radare2-5.1.0.mod/libr/core/cconfig.c 2021-02-07 20:42:14.734203399 +0000
@@ -3070,7 +3070,7 @@
char *h = r_sys_getenv (R_SYS_HOME);
if (h) {
if (!strcmp (h, "/")) {
- r_sys_setenv (R_SYS_HOME, "/data/local/tmp");
+ r_sys_setenv (R_SYS_HOME, "@TERMUX_HOME@");
}
free (h);
}
@@ -3515,7 +3515,7 @@
free (path);
}
SETCB ("dir.source", "", &cb_dirsrc, "Path to find source files");
- SETPREF ("dir.types", "/usr/include", "Default path to look for cparse type files");
+ SETPREF ("dir.types", "@TERMUX_PREFIX@/include", "Default path to look for cparse type files");
SETPREF ("dir.libs", "", "Specify path to find libraries to load when bin.libs=true");
p = r_sys_getenv (R_SYS_HOME);
SETCB ("dir.home", r_str_get_fail (p, "/"), &cb_dirhome, "Path for the home directory");
@@ -3523,11 +3523,7 @@
p = r_sys_getenv (R_SYS_TMP);
SETCB ("dir.tmp", r_str_get (p), &cb_dirtmp, "Path of the tmp directory");
free (p);
-#if __ANDROID__
- SETCB ("dir.projects", "/data/data/org.radare.radare2installer/radare2/projects", &cb_dir_projects, "Default path for projects");
-#else
SETCB ("dir.projects", R_JOIN_2_PATHS ("~", R2_HOME_PROJECTS), &cb_dir_projects, "Default path for projects");
-#endif
SETCB ("dir.zigns", R_JOIN_2_PATHS ("~", R2_HOME_ZIGNS), &cb_dirzigns, "Default path for zignatures (see zo command)");
SETPREF ("stack.reg", "SP", "Which register to use as stack pointer in the visual debug");
SETBPREF ("stack.bytes", "true", "Show bytes instead of words in stack");
@@ -3665,9 +3661,8 @@
#else
if (r_file_exists ("/usr/bin/openURL")) { // iOS ericautils
r_config_set (cfg, "http.browser", "/usr/bin/openURL");
- } else if (r_file_exists ("/system/bin/toolbox")) {
- r_config_set (cfg, "http.browser",
- "LD_LIBRARY_PATH=/system/lib am start -a android.intent.action.VIEW -d");
+ } else if (r_file_exists ("@TERMUX_PREFIX@/bin/termux-open")) {
+ r_config_set (cfg, "http.browser", "@TERMUX_PREFIX@/bin/termux-open");
} else if (r_file_exists ("/usr/bin/xdg-open")) {
r_config_set (cfg, "http.browser", "xdg-open");
} else if (r_file_exists ("/usr/bin/open")) {
@@ -3687,8 +3682,6 @@
SETPREF ("http.root", wwwroot, "http root directory");
free (wwwroot);
}
-#elif __ANDROID__
- SETPREF ("http.root", "/data/data/org.radare.radare2installer/www", "http root directory");
#else
SETPREF ("http.root", R2_WWWROOT, "http root directory");
#endif