radare2: Update from 1.4.0 to 1.5.0

diff --git a/packages/radare2/build.sh b/packages/radare2/build.sh
index c8dd2d0bee85f71ca8e61255e4c212ee89e481ce..63d6702018462f23c0ec1c3a3481e89fe4f4b86e 100644 (file)
--- a/packages/radare2/build.sh
+++ b/packages/radare2/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://rada.re
 TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"
 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_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"
 TERMUX_PKG_FOLDERNAME="radare2-$TERMUX_PKG_VERSION"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-compiler=termux-host"

diff --git a/packages/radare2/libr-core-cconfig.c.patch b/packages/radare2/libr-core-cconfig.c.patch
index 68e8a440c8e386831086a180ebb8e941e4205ac9..4168716c4d888e21d5d30015b1db7aa2afbec861 100644 (file)
--- a/packages/radare2/libr-core-cconfig.c.patch
+++ b/packages/radare2/libr-core-cconfig.c.patch
@@ -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
  #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__
 -#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__
 -#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
  #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__
 -#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__
 -#elif __WINDOWS__
 +#if __WINDOWS__

-       SETPREF("http.root", "www", "http root directory");
+       SETPREF ("http.root", "www", "http root directory");

  #else
  #else

-       SETPREF("http.root", R2_WWWROOT, "http root directory");
+       SETPREF ("http.root", R2_WWWROOT, "http root directory");