radare2: update patch

This commit is contained in:
Lucy Phipps 2021-08-22 05:15:19 +01:00
parent 24384b8297
commit fa14e970de
No known key found for this signature in database
GPG Key ID: 8F688A3DB7869BFE
2 changed files with 8 additions and 12 deletions

View File

@ -3,7 +3,7 @@ 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=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=21ddae80a18d5ceef4bcd3a7cae1ba09d14b510d68ac9134681e1e9967123b23
TERMUX_PKG_DEPENDS="libuv"

View File

@ -1,4 +1,4 @@
diff -Nuar -ruN radare2-5.4.0/libr/include/r_util/r_file.h radare2-5.4.0.mod/libr/include/r_util/r_file.h
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
@@ -8,7 +8,7 @@
@ -10,10 +10,10 @@ diff -Nuar -ruN radare2-5.4.0/libr/include/r_util/r_file.h radare2-5.4.0.mod/lib
#endif
#ifndef TERMUX_PREFIX
diff -Nuar -ruN radare2-5.4.0/libr/socket/run.c radare2-5.4.0.mod/libr/socket/run.c
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,16 +1205,8 @@ R_API int r_run_start(RRunProfile *p) {
@@ -1205,12 +1205,8 @@ R_API int r_run_start(RRunProfile *p) {
#if __UNIX__
close (0);
close (1);
@ -23,12 +23,8 @@ diff -Nuar -ruN radare2-5.4.0/libr/socket/run.c radare2-5.4.0.mod/libr/socket/ru
- : r_file_path ("sh");
- // Honor $SHELL ?
- if (R_STR_ISNOTEMPTY (bin_sh)) {
- exit (execl (bin_sh, bin_sh, "-c", p->_system, NULL));
- } else {
- exit (r_sys_cmd (p->_system));
- }
+ char *bin_sh = r_file_binsh ();
+ exit (execl (bin_sh, bin_sh, "-c", p->_system, NULL));
free (bin_sh);
#else
exit (r_sys_cmd (p->_system));
+ if (bin_sh != NULL) {
exit (execl (bin_sh, bin_sh, "-c", p->_system, NULL));
} else {
exit (r_sys_cmd (p->_system));