lukechilds
/
termux-packages
mirror of https://github.com/lukechilds/termux-packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

radare2: Update from 2.5.0 to 2.6.0

android-5
Fredrik Fornwall 7 years ago
parent
115333a400
commit
013a89fa6a
4 changed files with 61 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      packages/radare2/build.sh
  2. 55
      packages/radare2/fix-hardcoded-paths.patch
  3. 45
      packages/radare2/libr-core-cconfig.c.patch
  4. 12
      packages/radare2/libr-include-r_magic.h.patch

6
packages/radare2/build.sh
View File

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://rada.re TERMUX_PKG_HOMEPAGE=https://rada.re
TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor" TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"
TERMUX_PKG_VERSION=2.5.0 TERMUX_PKG_VERSION=2.6.0
TERMUX_PKG_SHA256=c795c2062c01dbb6ca91d44812cdd8600fc502264ab87ce864a97769227db796 TERMUX_PKG_SHA256=c4722519e53bbb03289e3b98e89e637e2d1f401d02cf78a198e42c2e92aeb820
TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_BUILD_IN_SRC="yes" TERMUX_PKG_BUILD_IN_SRC="yes"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-compiler=termux-host" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-compiler=termux-host"
@ -15,6 +15,8 @@ termux_step_pre_configure() {
# If this variable is not set, then build will fail on linking with 'pthread' # If this variable is not set, then build will fail on linking with 'pthread'
export ANDROID=1 export ANDROID=1
export OBJCOPY=$TERMUX_HOST_PLATFORM-objcopy
# Remove old libs which may mess with new build: # Remove old libs which may mess with new build:
rm -f $TERMUX_PREFIX/lib/libr_* rm -f $TERMUX_PREFIX/lib/libr_*
} }

55
packages/radare2/fix-hardcoded-paths.patch
View File

@ -1,55 +0,0 @@
diff -uNr radare2-2.0.0/libr/core/cconfig.c radare2-2.0.0.mod/libr/core/cconfig.c
--- radare2-2.0.0/libr/core/cconfig.c 2017-10-09 18:05:53.000000000 +0300
+++ radare2-2.0.0.mod/libr/core/cconfig.c 2017-10-11 16:22:54.521006895 +0300
@@ -2383,10 +2383,8 @@
SETPREF ("dir.plugins", R2_LIBDIR"/radare2/"R2_VERSION"/", "Path to plugin files to be loaded at startup");
#endif
SETCB ("dir.source", "", &cb_dirsrc, "Path to find source files");
- SETPREF ("dir.types", "/usr/include", "Default path to look for cparse type files");
-#if __ANDROID__
- SETPREF ("dir.projects", "/data/data/org.radare.radare2installer/radare2/projects", "Default path for projects");
-#elif __WINDOWS__
+ SETPREF ("dir.types", "@TERMUX_PREFIX@/include", "Default path to look for cparse type files");
+#if __WINDOWS__
SETPREF ("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects");
#else
SETPREF ("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects");
@@ -2528,6 +2526,9 @@
#if __WINDOWS__
r_config_set (cfg, "http.browser", "start");
#else
+#ifdef __ANDROID__
+ r_config_set (cfg, "http.browser", "xdg-open");
+#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")) {
@@ -2540,14 +2541,13 @@
} else {
r_config_set (cfg, "http.browser", "firefox");
}
+#endif
r_config_desc (cfg, "http.browser", "Command to open HTTP URLs");
#endif
SETI ("http.maxsize", 0, "Maximum file size for upload");
SETPREF ("http.bind", "localhost", "Server address");
SETPREF ("http.homeroot", "~/.config/radare2/www", "http home root directory");
-#if __ANDROID__
- SETPREF ("http.root", "/data/data/org.radare.radare2installer/www", "http root directory");
-#elif __WINDOWS__
+#if __WINDOWS__
SETPREF ("http.root", "www", "http root directory");
#else
SETPREF ("http.root", R2_WWWROOT, "http root directory");
diff -uNr radare2-2.0.0/libr/include/r_magic.h radare2-2.0.0.mod/libr/include/r_magic.h
--- radare2-2.0.0/libr/include/r_magic.h 2017-10-09 18:05:53.000000000 +0300
+++ radare2-2.0.0.mod/libr/include/r_magic.h 2017-10-11 16:23:00.721073712 +0300
@@ -12,7 +12,7 @@
R_LIB_VERSION_HEADER(r_magic);
#ifndef MAGICFILE
-#define MAGICFILE "/etc/magic"
+#define MAGICFILE "@TERMUX_PREFIX@/etc/magic"
#endif
#define R_MAGIC_PATH R2_PREFIX "/share/radare2/" R2_VERSION "/magic"

45
packages/radare2/libr-core-cconfig.c.patch
View File

@ -0,0 +1,45 @@
diff -u -r ../radare2-2.6.0/libr/core/cconfig.c ./libr/core/cconfig.c
--- ../radare2-2.6.0/libr/core/cconfig.c 2018-05-21 03:18:13.000000000 +0200
+++ ./libr/core/cconfig.c 2018-05-22 16:08:13.832239788 +0200
@@ -2649,12 +2649,8 @@
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");
-#if __ANDROID__
- SETPREF ("dir.projects", "/data/data/org.radare.radare2installer/radare2/projects", "Default path for projects");
-#else
+ SETPREF ("dir.types", "@TERMUX_PREFIX@/include", "Default path to look for cparse type files");
SETPREF ("dir.projects", R_JOIN_2_PATHS ("~", R2_HOME_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.bytes", "true", "Show bytes instead of words in stack");
SETPREF ("stack.anotated", "false", "Show anotated hexdump in visual debug");
@@ -2773,6 +2769,9 @@
#if __WINDOWS__
r_config_set (cfg, "http.browser", "start");
#else
+#ifdef __ANDROID__
+ r_config_set (cfg, "http.browser", "xdg-open");
+#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")) {
@@ -2785,16 +2784,13 @@
} else {
r_config_set (cfg, "http.browser", "firefox");
}
+#endif
r_config_desc (cfg, "http.browser", "Command to open HTTP URLs");
#endif
SETI ("http.maxsize", 0, "Maximum file size for upload");
SETPREF ("http.bind", "localhost", "Server address");
SETPREF ("http.homeroot", R_JOIN_2_PATHS ("~", R2_HOME_WWWROOT), "http home root directory");
-#if __ANDROID__
- SETPREF ("http.root", "/data/data/org.radare.radare2installer/www", "http root directory");
-#else
SETPREF ("http.root", R2_WWWROOT, "http root directory");
-#endif
SETPREF ("http.port", "9090", "HTTP server port");
SETPREF ("http.maxport", "9999", "Last HTTP server port");
SETPREF ("http.ui", "m", "Default webui (enyo, m, p, t)");

12
packages/radare2/libr-include-r_magic.h.patch
View File

@ -0,0 +1,12 @@
diff -uNr radare2-2.0.0/libr/include/r_magic.h radare2-2.0.0.mod/libr/include/r_magic.h
--- radare2-2.0.0/libr/include/r_magic.h 2017-10-09 18:05:53.000000000 +0300
+++ radare2-2.0.0.mod/libr/include/r_magic.h 2017-10-11 16:23:00.721073712 +0300
@@ -12,7 +12,7 @@
R_LIB_VERSION_HEADER(r_magic);
#ifndef MAGICFILE
-#define MAGICFILE "/etc/magic"
+#define MAGICFILE "@TERMUX_PREFIX@/etc/magic"
#endif
#define R_MAGIC_PATH R2_PREFIX "/share/radare2/" R2_VERSION "/magic"
Write Preview
Loading…
Cancel
Save