radare2: update to 5.4.2 (#7584)

This commit is contained in:
Claudemirovsky 2021-09-22 02:46:26 -03:00 committed by GitHub
parent 58d5da409e
commit 29b1221835
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 24 deletions

View File

@ -2,10 +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.4.0
TERMUX_PKG_REVISION=4
TERMUX_PKG_VERSION=5.4.2
TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=21ddae80a18d5ceef4bcd3a7cae1ba09d14b510d68ac9134681e1e9967123b23
TERMUX_PKG_SHA256=d3c337e893d7d1e7d5af8b527af3d4469c92898f0249f1b6263ea3325c9455b9
TERMUX_PKG_DEPENDS="libuv"
TERMUX_PKG_BREAKS="radare2-dev"
TERMUX_PKG_REPLACES="radare2-dev"

View File

@ -1,6 +1,6 @@
diff -ruN radare2-5.4.0/libr/include/r_util/r_file.h radare2-5.4.0.mod/libr/include/r_util/r_file.h
--- radare2-5.4.0/libr/include/r_util/r_file.h 2021-08-20 09:25:10.617372300 -0300
+++ radare2-5.4.0.mod/libr/include/r_util/r_file.h 2021-08-20 10:48:00.361368745 -0300
diff -ruN radare2-5.4.2/libr/include/r_util/r_file.h radare2-5.4.2.mod/libr/include/r_util/r_file.h
--- radare2-5.4.2/libr/include/r_util/r_file.h 2021-09-21 19:21:18.729361958 -0300
+++ radare2-5.4.2.mod/libr/include/r_util/r_file.h 2021-09-21 19:21:55.053361932 -0300
@@ -8,7 +8,7 @@
#include <r_util/r_mem.h>
@ -10,21 +10,3 @@ diff -ruN radare2-5.4.0/libr/include/r_util/r_file.h radare2-5.4.0.mod/libr/incl
#endif
#ifndef TERMUX_PREFIX
diff -ruN radare2-5.4.0/libr/socket/run.c radare2-5.4.0.mod/libr/socket/run.c
--- radare2-5.4.0/libr/socket/run.c 2021-08-20 09:25:10.705372300 -0300
+++ radare2-5.4.0.mod/libr/socket/run.c 2021-08-20 10:46:52.221368794 -0300
@@ -1205,12 +1205,8 @@ R_API int r_run_start(RRunProfile *p) {
#if __UNIX__
close (0);
close (1);
- char *shell_env = r_sys_getenv ("SHELL");
- char *bin_sh = (R_STR_ISNOTEMPTY (shell_env) && r_file_exists (shell_env))
- ? shell_env
- : r_file_path ("sh");
- // Honor $SHELL ?
- if (R_STR_ISNOTEMPTY (bin_sh)) {
+ char *bin_sh = r_file_binsh ();
+ if (bin_sh != NULL) {
exit (execl (bin_sh, bin_sh, "-c", p->_system, NULL));
} else {
exit (r_sys_cmd (p->_system));