radare2: Update from 1.4.0 to 1.5.0

This commit is contained in:
Fredrik Fornwall 2017-05-30 19:43:02 +02:00
parent 721744849b
commit 5b7f738393
2 changed files with 18 additions and 18 deletions

View File

@ -1,8 +1,8 @@
TERMUX_PKG_HOMEPAGE=https://rada.re
TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"
TERMUX_PKG_VERSION=1.4.0
TERMUX_PKG_VERSION=1.5.0
TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=fb58417a6d35af4096da9130a041e1d36f900b17e2c2594b405a9b88ce33c7a8
TERMUX_PKG_SHA256=a54a1988527b63299affef0e08b221ef13d6f4a75280231786d554e2bad78085
TERMUX_PKG_FOLDERNAME="radare2-$TERMUX_PKG_VERSION"
TERMUX_PKG_BUILD_IN_SRC="yes"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-compiler=termux-host"

View File

@ -1,25 +1,25 @@
diff -u -r ../radare2-1.1.0/libr/core/cconfig.c ./libr/core/cconfig.c
--- ../radare2-1.1.0/libr/core/cconfig.c 2016-12-19 21:13:05.000000000 -0500
+++ ./libr/core/cconfig.c 2016-12-20 20:28:14.811403257 -0500
@@ -1900,9 +1900,7 @@
diff -u -r ../radare2-1.5.0/libr/core/cconfig.c ./libr/core/cconfig.c
--- ../radare2-1.5.0/libr/core/cconfig.c 2017-05-30 18:46:34.000000000 +0200
+++ ./libr/core/cconfig.c 2017-05-30 19:39:39.339205400 +0200
@@ -2145,9 +2145,7 @@
#endif
SETCB("dir.source", "", &cb_dirsrc, "Path to find source files");
SETPREF("dir.types", "/usr/include", "Default path to look for cparse type files");
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");
- SETPREF ("dir.projects", "/data/data/org.radare.radare2installer/radare2/projects", "Default path for projects");
-#elif __WINDOWS__
+#if __WINDOWS__
SETPREF("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects");
SETPREF ("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects");
#else
SETPREF("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects");
@@ -2036,9 +2034,7 @@
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");
SETPREF ("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects");
@@ -2300,9 +2298,7 @@
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");
- SETPREF ("http.root", "/data/data/org.radare.radare2installer/www", "http root directory");
-#elif __WINDOWS__
+#if __WINDOWS__
SETPREF("http.root", "www", "http root directory");
SETPREF ("http.root", "www", "http root directory");
#else
SETPREF("http.root", R2_WWWROOT, "http root directory");
SETPREF ("http.root", R2_WWWROOT, "http root directory");