April 2014 - tor-commits - lists.torproject.org

[orbot/master] Fix building of openssl on newer systems
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit 57ef1c3f612e62300a41f2e241be6540f312a67d Author: Daniel Martí <mvdan(a)mvdan.cc> Date: Tue Mar 25 19:44:54 2014 +0100 Fix building of openssl on newer systems Forcing CC when running make works around this problem. Signed-off-by: Nathan Freitas <nathan(a)freitas.net> --- external/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/external/Makefile b/external/Makefile index 93d279d..bce8d83 100644 --- a/external/Makefile +++ b/external/Makefile @@ -84,17 +84,15 @@ all: assets lib/libcrypto.a: cd openssl && \ - CC="$(CC)" \ ./Configure android -DL_ENDIAN && \ - ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm/usr make build_libs + make CC="$(CC)" ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm /usr build_libs lib/libssl.a: cp config.sub openssl cp config.guess openssl cd openssl && \ - CC="$(CC)"\ ./Configure android -DL_ENDIAN && \ - ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm/usr make build_libs + make CC="$(CC)" ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm /usr build_libs openssl-build-stamp: lib/libcrypto.a lib/libssl.a touch openssl-build-stamp

1 0

[orbot/master] 13.0.6 minor UI updates, Tor version update
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit d311f71ebf027e86ed79693ce6c4729dc31c732c Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 3 10:38:32 2014 -0500 13.0.6 minor UI updates, Tor version update --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f4b44c7..44ff3bd 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="13.0.5" - android:versionCode="70" + android:versionName="13.0.6" + android:versionCode="71" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0

[orbot/master] updated to only build tor binary and not tests, etc
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit 06b46f1a358e44fee2104ff69d7b6249b933cadd Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 24 14:18:23 2014 -0400 updated to only build tor binary and not tests, etc --- external/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/external/Makefile b/external/Makefile index 71b2a73..1b273cf 100644 --- a/external/Makefile +++ b/external/Makefile @@ -195,7 +195,7 @@ tor/Makefile: tor/configure --disable-linker-hardening --disable-gcc-hardening tor-build-stamp: tor/Makefile - $(MAKE) -C tor + $(MAKE) -C tor all-am touch tor-build-stamp tor: libevent openssl tor-build-stamp @@ -252,7 +252,8 @@ obfsclient/Makefile: cp config.sub obfsclient cp config.guess obfsclient cd obfsclient && \ - CPP="$(CPP)" AR="$(AR)" RANLIB=$(RANLIB) CPPFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow" LDFLAGS="$(LDFLAGS)" \ + CPP="$(CPP)" CXX="$(CXX)" AR="$(AR)" RANLIB=$(RANLIB) CPPFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow" CXXFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow" LDFLAGS="$(LDFLAGS)" \ + LIBS="-L$(EXTERNAL_ROOT)/lib" CFLAGS="-I$(EXTERNAL_ROOT)/include -I$(EXTERNAL_ROOT)/include/event2" \ ./configure \ --host=$(HOST) \

1 0

[orbot/master] updated makefile
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit 1a346cf25edff4d7c821bfd1f841573ca3fbd88d Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 24 14:34:20 2014 -0400 updated makefile --- external/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/external/Makefile b/external/Makefile index 1b273cf..1d893b7 100644 --- a/external/Makefile +++ b/external/Makefile @@ -23,7 +23,10 @@ endif # Android NDK setup NDK_BASE ?= /opt/android-ndk +NDK_PLATFORM_LEVEL ?= 5 NDK_ABI=arm +NDK_COMPILER_VERSION = 4.7 +NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) APP_ABI=armeabi # NDK platform level, aka APP_PLATFORM, is equivalent to minSdkVersion APP_PLATFORM := android-$(shell sed -n 's,.*android:minSdkVersion="$[0-9][0-9]*$".*,\1,p' \

1 0

[orbot/master] updated obfsclient external
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit 02c389cf2870100b15771c569bfb3c004c2bb1fa Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 24 14:20:36 2014 -0400 updated obfsclient external --- external/obfsclient | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/obfsclient b/external/obfsclient index 39e1dd2..1f5f2a3 160000 --- a/external/obfsclient +++ b/external/obfsclient @@ -1 +1 @@ -Subproject commit 39e1dd27000b6aecb074c55afaafab58b86e933a +Subproject commit 1f5f2a358e9cce67184a250553b82e48f1cbd82e

1 0

[orbot/master] Signed-off-by: Nathan Freitas <nathan@freitas.net>
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit 75a0d34e2886ac771cc19c564d0757c7cdcc95f8 Author: Daniel Martí <mvdan(a)mvdan.cc> Date: Thu Mar 27 13:46:34 2014 -0400 Signed-off-by: Nathan Freitas <nathan(a)freitas.net> --- external/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index bce8d83..7a9f637 100644 --- a/external/Makefile +++ b/external/Makefile @@ -116,6 +116,8 @@ openssl-clean: # libevent libevent/Makefile: + sed -i 's@$SUBDIRS = . include$ sample test@\1@' libevent/Makefile.am + sed -i 's@$AC_OUTPUT(Makefile include/Makefile$ test/Makefile sample/Makefile)@\1)@' libevent/configure.in cd libevent && ./autogen.sh cp config.sub libevent cp config.guess libevent @@ -126,7 +128,7 @@ libevent/Makefile: --disable-shared libevent-build-stamp: libevent/Makefile - $(MAKE) -C libevent all-am + $(MAKE) -C libevent ./include/event2/event-config.h all-am touch libevent-build-stamp libevent: openssl libevent-build-stamp

1 0

[orbot/master] updated binaries from new build script
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit e5fdf28aa68ba7faad7d0cc31b4ff70e6fbecde5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 26 11:54:28 2014 -0400 updated binaries from new build script --- libs/armeabi/libprivoxy.so | Bin 700376 -> 593040 bytes libs/armeabi/libtor.so | Bin 4666632 -> 4593236 bytes libs/jtorctl.jar | Bin 14742 -> 14742 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/armeabi/libprivoxy.so b/libs/armeabi/libprivoxy.so index 3468cd5..d9fe933 100755 Binary files a/libs/armeabi/libprivoxy.so and b/libs/armeabi/libprivoxy.so differ diff --git a/libs/armeabi/libtor.so b/libs/armeabi/libtor.so index 02678fc..493cf5b 100755 Binary files a/libs/armeabi/libtor.so and b/libs/armeabi/libtor.so differ diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar index 3a47122..9309e9b 100755 Binary files a/libs/jtorctl.jar and b/libs/jtorctl.jar differ

1 0

[orbot/master] updates ant build for new actionbarcompat
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit 445f63f0e29574cf98d738b753e683dc5a3f6154 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 3 22:22:32 2014 -0400 updates ant build for new actionbarcompat --- update-ant-build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/update-ant-build.sh b/update-ant-build.sh index f819eb7..e7d92e2 100755 --- a/update-ant-build.sh +++ b/update-ant-build.sh @@ -2,5 +2,4 @@ # make sure your Android SDK tools path is set in SDK_BASE android update project --path . --name Orbot --subprojects -android update project --path external/ActionBarSherlock/actionbarsherlock -t android-17 - +android update project --path external/appcompat

1 0

[orbot/master] updated graphic
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit 765a3bfec406cb542c2f0e94a5cf9d2afafbedba Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 3 21:56:06 2014 -0400 updated graphic --- docs/onionroots.xcf | Bin 0 -> 1748142 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/onionroots.xcf b/docs/onionroots.xcf new file mode 100644 index 0000000..eac39c7 Binary files /dev/null and b/docs/onionroots.xcf differ

1 0

[orbot/master] remove binary apps/libs
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit b59bd1a156d3c1fc4ea4d8c6285c8fa8aacab473 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 3 22:24:18 2014 -0400 remove binary apps/libs --- libs/armeabi/libobfsproxy.so | Bin 996900 -> 0 bytes libs/armeabi/libprivoxy.so | Bin 593040 -> 0 bytes libs/armeabi/libtor.so | Bin 4593236 -> 0 bytes libs/armeabi/libxtables.so | Bin 462140 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/armeabi/libobfsproxy.so b/libs/armeabi/libobfsproxy.so deleted file mode 100755 index 5bdab95..0000000 Binary files a/libs/armeabi/libobfsproxy.so and /dev/null differ diff --git a/libs/armeabi/libprivoxy.so b/libs/armeabi/libprivoxy.so deleted file mode 100755 index d9fe933..0000000 Binary files a/libs/armeabi/libprivoxy.so and /dev/null differ diff --git a/libs/armeabi/libtor.so b/libs/armeabi/libtor.so deleted file mode 100755 index 493cf5b..0000000 Binary files a/libs/armeabi/libtor.so and /dev/null differ diff --git a/libs/armeabi/libxtables.so b/libs/armeabi/libxtables.so deleted file mode 100755 index c8955b4..0000000 Binary files a/libs/armeabi/libxtables.so and /dev/null differ

1 0