From 88e73ad5335fd07384e8d165d29656a5fab6710e Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 20 Dec 2016 20:33:12 -0500
Subject: [PATCH] radare2: Update from 1.0.2 to 1.1.0

Fixes #603.
---
 packages/radare2/build.sh                  |  4 ++--
 packages/radare2/libr-core-cconfig.c.patch | 25 +++++++++++++++++++++++++
 packages/radare2/paths.patch               | 25 -------------------------
 3 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 packages/radare2/libr-core-cconfig.c.patch

diff --git a/packages/radare2/build.sh b/packages/radare2/build.sh
index 191331b2..0b85e371 100644
--- a/packages/radare2/build.sh
+++ b/packages/radare2/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=http://rada.re
 TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"
-TERMUX_PKG_VERSION=1.0.2
+TERMUX_PKG_VERSION=1.1.0
 TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=58693bc93d07f8e4678bf96e149f736a29194869c6d08e8ed2696e953ecf1098
+TERMUX_PKG_SHA256=2ecc46f3906975b52d6c4cc2cc33e3bac771f9b5451ceea1854344ab4f45d06a
 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
new file mode 100644
index 00000000..68e8a440
--- /dev/null
+++ b/packages/radare2/libr-core-cconfig.c.patch
@@ -0,0 +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 @@
+ #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__
++#if __WINDOWS__
+ 	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");
+-#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 --git a/packages/radare2/paths.patch b/packages/radare2/paths.patch
index 39b95e67..2eb4c810 100644
--- a/packages/radare2/paths.patch
+++ b/packages/radare2/paths.patch
@@ -1,28 +1,3 @@
-diff -u -r ../radare2-1.0/libr/core/config.c ./libr/core/config.c
---- ../radare2-1.0/libr/core/config.c	2016-11-08 21:10:46.000000000 -0500
-+++ ./libr/core/config.c	2016-11-10 07:40:51.899121470 -0500
-@@ -1835,9 +1835,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");
--#if __ANDROID__
--	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");
- #else
- 	SETPREF("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects");
-@@ -1970,9 +1968,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");
--#elif __WINDOWS__
-+#if __WINDOWS__
- 	SETPREF("http.root", "www", "http root directory");
- #else
- 	SETPREF("http.root", R2_WWWROOT, "http root directory");
 diff -u -r ../radare2-1.0/libr/util/file.c ./libr/util/file.c
 --- ../radare2-1.0/libr/util/file.c	2016-11-08 21:10:46.000000000 -0500
 +++ ./libr/util/file.c	2016-11-10 07:42:18.409808792 -0500
-- 
2.11.0