commit 7557ad5d7122d31d28389f60ae48017dcf14bfa3 Author: Nathan Freitas nathan@freitas.net Date: Wed Mar 18 21:20:39 2015 -0400

update external dependencies, add patch for tor build --- external/fix_android_0.2.6.4rc_build.patch | 77 ++++++++++++++++++++++++++++ external/liballium | 1 - external/libevent | 2 +- external/obfsclient | 1 - external/tor | 2 +- 5 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/external/fix_android_0.2.6.4rc_build.patch b/external/fix_android_0.2.6.4rc_build.patch new file mode 100644 index 0000000..b7cb1cd --- /dev/null +++ b/external/fix_android_0.2.6.4rc_build.patch @@ -0,0 +1,77 @@ +From ed6a98b39661a204eb0186267bf406469b4e51ba Mon Sep 17 00:00:00 2001 +From: n8fr8 nathan@freitas.net +Date: Wed, 18 Mar 2015 17:07:49 -0400 +Subject: [PATCH 1/2] disable setting of MONOTONIC time on Android (it doesn't + work) + +--- + src/common/compat_pthreads.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c +index f4a6cad..ccacef1 100644 +--- a/src/common/compat_pthreads.c ++++ b/src/common/compat_pthreads.c +@@ -181,6 +181,7 @@ tor_cond_init(tor_cond_t *cond) + return -1; + } + ++#ifndef __ANDROID_API__ + #if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) + /* Use monotonic time so when we timedwait() on it, any clock adjustment + * won't affect the timeout value. */ +@@ -188,6 +189,7 @@ tor_cond_init(tor_cond_t *cond) + return -1; + } + #endif ++#endif + if (pthread_cond_init(&cond->cond, &condattr)) { + return -1; + } +-- +1.9.1 + + +From 4257a9f1fbbc05413077b7b70215622099f667df Mon Sep 17 00:00:00 2001 +From: n8fr8 nathan@freitas.net +Date: Wed, 18 Mar 2015 17:08:14 -0400 +Subject: [PATCH 2/2] you must explicitly include limits.h on Android + +--- + src/ext/trunnel/trunnel.c | 1 + + src/trunnel/trunnel-local.h | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c +index 7353237..1d4403c 100644 +--- a/src/ext/trunnel/trunnel.c ++++ b/src/ext/trunnel/trunnel.c +@@ -13,6 +13,7 @@ + #include <stdlib.h> + #include <string.h> + #include "trunnel-impl.h" ++#include "limits.h" + + #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ + __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +diff --git a/src/trunnel/trunnel-local.h b/src/trunnel/trunnel-local.h +index b7c2ab9..e55cf3c 100644 +--- a/src/trunnel/trunnel-local.h ++++ b/src/trunnel/trunnel-local.h +@@ -5,6 +5,7 @@ + #include "util.h" + #include "compat.h" + #include "crypto.h" ++#include "limits.h" + + #define trunnel_malloc tor_malloc + #define trunnel_calloc tor_calloc +@@ -15,4 +16,5 @@ + #define trunnel_assert tor_assert + #define trunnel_memwipe(mem, len) memwipe((mem), 0, (len)) + ++ + #endif +-- +1.9.1 + diff --git a/external/liballium b/external/liballium deleted file mode 160000 index 5272de7..0000000 --- a/external/liballium +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5272de7361897ee6b5c969fd1eec6609d64ac13a diff --git a/external/libevent b/external/libevent index 6417777..c51b159 160000 --- a/external/libevent +++ b/external/libevent @@ -1 +1 @@ -Subproject commit 64177777165d9684bafbfa946abd126f7ebff11f +Subproject commit c51b159cff9f5e86696f5b9a4c6f517276056258 diff --git a/external/obfsclient b/external/obfsclient deleted file mode 160000 index 9c164b2..0000000 --- a/external/obfsclient +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9c164b2afb666d0bcd26ba3eeb6da07a9fff551c diff --git a/external/tor b/external/tor index 42b4260..0c2e4ae 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit 42b42605f8d8eac25361be229354f6393967df4f +Subproject commit 0c2e4aec7b8b2024a93c2ee5a7d97bdc45501f70