commit 51cb3530f64be4e4770e0ef25f73f4e66c8db66c Author: n8fr8 nathan@freitas.net Date: Fri May 4 17:38:37 2012 -0400

removes default compiler hardening flags that break Android --- external/Makefile | 5 ++++- external/obfsproxy_android_no_hardening.patch | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/external/Makefile b/external/Makefile index c2c33ed..aec1c67 100644 --- a/external/Makefile +++ b/external/Makefile @@ -154,8 +154,11 @@ tor-clean:

obfsproxy/Makefile: + cp obfsproxy_android_no_hardening.patch obfsproxy cd obfsproxy && \ - ./autogen.sh + patch -N -p1 --reject-file=- < obfsproxy_android_no_hardening.patch + cd obfsproxy && \ + ./autogen.sh cp config.sub obfsproxy cp config.guess obfsproxy cd obfsproxy && \ diff --git a/external/obfsproxy_android_no_hardening.patch b/external/obfsproxy_android_no_hardening.patch new file mode 100644 index 0000000..58425be --- /dev/null +++ b/external/obfsproxy_android_no_hardening.patch @@ -0,0 +1,19 @@ +commit d42eec7683ce9d47fc846e511e815ec1b2950c27 +Author: n8fr8 nathan@freitas.net +Date: Fri May 4 17:32:51 2012 -0400 + + remove hardening for android + +diff --git a/configure.ac b/configure.ac +index facd3c6..ad405ea 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,7 +24,7 @@ AC_CHECK_HEADERS([sys/types.h]) + AC_CHECK_HEADERS([netinet/in.h]) + + ### Compiler Hardening ### +-AX_ENABLE_HARDENING ++##AX_ENABLE_HARDENING + + ### Libraries ### +