- tor-commits - lists.torproject.org

[orbot/master] adding in git submodules info
by n8fr8＠torproject.org 04 May '12

04 May '12

commit 01beff0322bc2298344282074453ffe2c741b2d7 Author: n8fr8 <nathan(a)freitas.net> Date: Thu May 3 14:33:05 2012 -0400 adding in git submodules info --- .gitmodules | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..ccaac46 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "external/openssl-static"] + path = external/openssl-static + url = git://github.com/guardianproject/android-external-openssl-ndk-static.git +[submodule "external/tor"] + path = external/tor + url = git://git.torproject.org/git/tor.git +[submodule "external/libevent"] + path = external/libevent + url = git://github.com/libevent/libevent.git +[submodule "external/jtorctrl"] + path = external/jtorctrl + url = git://git.torproject.org/git/jtorctl +[submodule "external/jtorctl"] + path = external/jtorctl + url = git://git.torproject.org/git/jtorctl

1 0

[orbot/master] switched to release-1.4.14-stable tag
by n8fr8＠torproject.org 04 May '12

04 May '12

commit 00739d5854ee287539e1893bf8d315db1eb81f9a Author: n8fr8 <nathan(a)freitas.net> Date: Thu May 3 14:55:15 2012 -0400 switched to release-1.4.14-stable tag --- external/libevent | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/external/libevent b/external/libevent index 7540103..b3360c1 160000 --- a/external/libevent +++ b/external/libevent @@ -1 +1 @@ -Subproject commit 75401035f019e06b49f9cb51fedbc30ac3d548a4 +Subproject commit b3360c16025760a8751cbbfa31857eeb735861e1

1 0

[orbot/master] updated to platform 15
by n8fr8＠torproject.org 04 May '12

04 May '12

commit 8ba946e1fd973c13405dc20bf3513b81d4815a1d Author: n8fr8 <nathan(a)freitas.net> Date: Thu May 3 15:09:55 2012 -0400 updated to platform 15 --- AndroidManifest.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8790d7f..05491f8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -8,7 +8,7 @@ <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="11"/> + <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="15"/> <application android:name=".OrbotApp" android:icon="@drawable/icon" android:label="@string/app_name" android:configChanges="locale|orientation"

1 0

[orbot/master] checked out tag release-2.0.18-stable
by n8fr8＠torproject.org 04 May '12

04 May '12

commit 3af53507f9a469e43113ef078bf0ba1e0d76b29a Author: n8fr8 <nathan(a)freitas.net> Date: Thu May 3 14:45:28 2012 -0400 checked out tag release-2.0.18-stable --- external/libevent | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/external/libevent b/external/libevent index e0aa086..7540103 160000 --- a/external/libevent +++ b/external/libevent @@ -1 +1 @@ -Subproject commit e0aa08666eecdab5467770ed0753f1f330ced76e +Subproject commit 75401035f019e06b49f9cb51fedbc30ac3d548a4

1 0

[orbot/master] adding in git submodule links
by n8fr8＠torproject.org 04 May '12

04 May '12

commit 408c76593b44c42350c06892469d9f515df51c63 Author: n8fr8 <nathan(a)freitas.net> Date: Thu May 3 14:32:37 2012 -0400 adding in git submodule links --- external/jtorctl | 1 + external/libevent | 1 + external/openssl-static | 1 + external/tor | 1 + 4 files changed, 4 insertions(+), 0 deletions(-) diff --git a/external/jtorctl b/external/jtorctl new file mode 160000 index 0000000..d818f43 --- /dev/null +++ b/external/jtorctl @@ -0,0 +1 @@ +Subproject commit d818f4381e164273aadfcbff131da8e1a2cbc1f8 diff --git a/external/libevent b/external/libevent new file mode 160000 index 0000000..e0aa086 --- /dev/null +++ b/external/libevent @@ -0,0 +1 @@ +Subproject commit e0aa08666eecdab5467770ed0753f1f330ced76e diff --git a/external/openssl-static b/external/openssl-static new file mode 160000 index 0000000..85061d0 --- /dev/null +++ b/external/openssl-static @@ -0,0 +1 @@ +Subproject commit 85061d07ccc04ee40f9cc66cbac86d53196d1f3f diff --git a/external/tor b/external/tor new file mode 160000 index 0000000..c9afd6f --- /dev/null +++ b/external/tor @@ -0,0 +1 @@ +Subproject commit c9afd6f9c5a3cf73340e528818570b4ba5cdf6b2

1 0

[orbot/master] updated makefile to fix path issues
by n8fr8＠torproject.org 04 May '12

04 May '12

commit f7cf202b00dc5290087e50c16247a122c9030652 Author: n8fr8 <nathan(a)freitas.net> Date: Thu May 3 15:07:02 2012 -0400 updated makefile to fix path issues --- Makefile.sh | 68 ++++++++++++++++++++++++---------------------------------- 1 files changed, 28 insertions(+), 40 deletions(-) diff --git a/Makefile.sh b/Makefile.sh index 507deb5..392a73e 100755 --- a/Makefile.sh +++ b/Makefile.sh @@ -1,9 +1,12 @@ #!/bin/sh +export ORBOT_BASE=$PWD + # begin by testing NDK_ROOT if test -z $NDK_ROOT; then echo "NDK_ROOT is not exported, do so by something close to this: export NDK_ROOT=/path/to/android-ndk-r5"; exit; fi #clean +cd $ORBOT_BASE rm -rf native rm res/raw/privoxy rm res/raw/tor @@ -14,17 +17,14 @@ mkdir native mkdir native/lib mkdir native/include mkdir libs -cd native #Build openssl using default ndk-build echo "BUILDING OPENSSL STATIC..." -git clone git://github.com/guardianproject/android-external-openssl-ndk-static.git -cd android-external-openssl-ndk-static - +cd external/openssl-static ndk-build -cp obj/local/armeabi/*.a ../lib -cp -R include/openssl ../include -cd ../.. +cp obj/local/armeabi/*.a $ORBOT_BASE/native/lib +cp -R include/openssl $ORBOT_BASE/native/include +cd $ORBOT_BASE echo "SETTING UP NDK CROSS COMPILER..." # export needed variables @@ -54,68 +54,56 @@ export OBJDUMP=$HOST-objdump export CPPFLAGS="--sysroot=$NDK_TOOLCHAIN/sysroot -I$NDK_TOOLCHAIN/sysroot/usr/include -I$NDK_TOOLCHAIN/include" export LDFLAGS="-L$NDK_TOOLCHAIN/sysroot/usr/lib -L$NDK_TOOLCHAIN/lib" +echo $BUILD #Build libevent echo "BUILDING LIBEVENT..." -mkdir native/libevent -cd native/libevent -svn co https://levent.svn.sourceforge.net/svnroot/levent/tags/release-1.4.13-stabl… . +cd external/libevent ./autogen.sh -./configure --host=arm-linux-eabi --build=$BUILD --prefix=$NDK_TOOLCHAIN -make clean +./configure --host=arm-linux-eabi --prefix=$NDK_TOOLCHAIN make -cp .libs/libevent.a ../lib -cp *.h ../include -cd ../.. +cp .libs/libevent.a $ORBOT_BASE/native/lib +cp *.h $ORBOT_BASE/native/include +cd $ORBOT_BASE #Build Tor echo "BUILDING TOR..." -cd native -git clone git://git.torproject.org/git/tor.git -cd tor/ +cd external/tor ./autogen.sh -./configure --host=arm-linux-eabi --disable-asciidoc --prefix=$NDK_TOOLCHAIN --with-libevent-dir=$PWD/../ --enable-static-libevent --with-openssl-dir=$PWD/../ --enable-static-openssl -make clean +./configure --host=arm-linux-eabi --disable-asciidoc --prefix=$NDK_TOOLCHAIN --with-libevent-dir=$ORBOT_BASE/native --enable-static-libevent --with-openssl-dir=$ORBOT_BASE/native --enable-static-openssl make -cd ../.. +cd $ORBOT_BASE #Build JTorControl echo "BUILDING JTORCTRL..." -cd libs -git clone git://git.torproject.org/git/jtorctl -cd jtorctl +cd external/jtorctl mkdir bin javac net/freehaven/tor/control/TorControlConnection.java -d bin cd bin jar cvf jtorctrl.jar * -cp jtorctrl.jar ../.. -cd ../../.. +cp jtorctrl.jar $ORBOT_BASE/libs +cd $ORBOT_BASE #BUILD privoxy echo "BUILDING PRIVOXY..." -mkdir native/privoxy -cd native/privoxy -rm download* -wget http://sourceforge.net/projects/ijbswa/files/Sources/3.0.12%20%28stable%29/… -tar xzvf download -cd privoxy-3.0.12-stable +cd $ORBOT_BASE/external/privoxy autoheader autoconf #need to disable setpgrp check in configure export ac_cv_func_setpgrp_void=yes -./configure --host=arm-linux-eabi --build=$BUILD --prefix=$NDK_TOOLCHAIN --disable-pthread -make clean +./configure --host=arm-linux-eabi --prefix=$NDK_TOOLCHAIN --disable-pthread make -cd ../../.. + +cd $ORBOT_BASE #create assets folder and put the binaries in it echo "MOVING BINARIES TO ANDROID RESOURCES..." mkdir res/raw -cp native/privoxy/privoxy-3.0.12-stable/privoxy res/raw -cp native/tor/src/or/tor res/raw +cp external/privoxy/privoxy res/raw +cp external/tor/src/or/tor res/raw -echo "READY TO BUILD ANDROID APP" -echo "> android update project --name Orbot --target 9 --path ." -echo "> ant debug" +echo "Setting Android build configuration" +android update project --name Orbot --target 9 --path . +echo "READY TO BUILD ANDROID APP: run 'ant debug'" echo "BUILD COMPLETE"

1 0

[orbot/master] new external dependency (tor, privoxy) makefile
by n8fr8＠torproject.org 04 May '12

04 May '12

commit 45892573668441ffa00cdf6cea14c3bb36025db4 Author: n8fr8 <nathan(a)freitas.net> Date: Thu May 3 18:29:28 2012 -0400 new external dependency (tor, privoxy) makefile --- external/Makefile | 192 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 192 insertions(+), 0 deletions(-) diff --git a/external/Makefile b/external/Makefile new file mode 100644 index 0000000..1f6e7aa --- /dev/null +++ b/external/Makefile @@ -0,0 +1,192 @@ +# Please install the following prerequisites (instructions for each follows): +# Android OS SDK: http://source.android.com/download +# +# Install and prepare the Android OS SDK ( http://source.android.com/download ) +# on Debian or Ubuntu + +### these modify the calling shell +# point pkg-config to the .pc files generated from these builds +export PKG_CONFIG_PATH=$(LOCAL)/lib/pkgconfig +# workaround for cross-compiling bug in autoconf +export ac_cv_func_malloc_0_nonnull=yes +export ac_cv_func_setpgrp_void=yes + +CWD = $(shell pwd) +PROJECT_ROOT = $(CWD)/.. +EXTERNAL_ROOT = $(PROJECT_ROOT)/external + +# Android NDK setup: +NDK_BASE ?= /usr/local/android-ndk +NDK_PLATFORM_LEVEL ?= 8 +NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-arm +NDK_UNAME=`uname -s | tr '[A-Z]' '[a-z]'` +NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$(NDK_UNAME)-x86 + +# to use the real HOST tag, you need the latest libtool files: +# http://stackoverflow.com/questions/4594736/configure-does-not-recognize-and… +#HOST := arm-none-linux-gnueabi +HOST := arm-linux-androideabi + +# install root for built files +DESTDIR = $(EXTERNAL_ROOT) +# TODO try adding the Android-style /data/app.name here +prefix = /data/data/org.torproject.android +LOCAL := $(DESTDIR)$(prefix) + +export PATH := ${PATH}:$(NDK_TOOLCHAIN)/bin:$(LOCAL)/bin + +CC := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-gcc --sysroot=$(NDK_SYSROOT) +CXX := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-g++ +CPP := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-cpp +LD := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-ld +AR := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-ar +RANLIB := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-ranlib +STRIP := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-strip \ + --strip-unneeded -R .note -R .comment + +CFLAGS = -DANDROID -I$(LOCAL)/include +LDFLAGS = -L$(LOCAL)/lib + +# build as small as possible, mostly useful for static binaries +CFLAGS += -fdata-sections -ffunction-sections -Os +LDFLAGS += -Wl,--gc-sections + +all: openssl-static libevent tor privoxy + +#------------------------------------------------------------------------------# +# openssl-static + +openssl-static/obj/local/armeabi/libcrypto.a: + cd openssl-static && \ + ndk-build + +openssl-static/obj/local/armeabi/libssl.a: + cd openssl-static && \ + ndk-build + +openssl-static-build-stamp: openssl-static/obj/local/armeabi/libcrypto.a openssl-static/obj/local/armeabi/libssl.a + touch openssl-static-build-stamp + +openssl-static: openssl-static-build-stamp + test -d lib || mkdir lib + test -d include || mkdir include + cp openssl-static/obj/local/armeabi/libcrypto.a lib + cp openssl-static/obj/local/armeabi/libssl.a lib + cp -R openssl-static/include/openssl include + +openssl-static-clean: + -cd openssl-static && \ + ndk-build clean + -rm openssl-static/openssl-static-build-stamp + -rm lib/libcrypto.a + -rm lib/libssl.a + +#------------------------------------------------------------------------------# +# libevent + +libevent/configure: + cd libevent && ./autogen.sh + +libevent/Makefile: libevent/configure + cd libevent && \ + CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + ./configure \ + --host=$(HOST) \ + --prefix=$(NDK_TOOLCHAIN) + +libevent-build-stamp: libevent/Makefile + $(MAKE) -C libevent + touch libevent-build-stamp + +libevent: libevent-build-stamp + test -d lib || mkdir lib + test -d include || mkdir include + cp libevent/.libs/libevent.a lib + cp libevent/*.h include + +libevent-clean: + -rm -f include/*.h + -rm -f lib/libevent.a + -rm -f libevent-build-stamp + -rm -f libevent/config.status + -rm -f libevent/config.log + -rm -f libevent/Makefile + +#------------------------------------------------------------------------------# +# tor + +tor/configure: + cd tor && \ + ./autogen.sh + +tor/Makefile: tor/configure + cd tor && \ + CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + ./configure \ + --host=$(HOST) \ + --prefix=$(NDK_TOOLCHAIN) \ + --disable-asciidoc \ + --with-libevent-dir=$(EXTERNAL_ROOT) --enable-static-libevent \ + --with-openssl-dir=$(EXTERNAL_ROOT) --enable-static-openssl + +tor-build-stamp: tor/Makefile + $(MAKE) -C tor + touch tor-build-stamp + +tor: tor-build-stamp libevent openssl-static + test -d bin || mkdir bin + cp tor/src/or/tor bin + +tor-clean: + -rm -f bin/tor + -rm -f tor-build-stamp + -rm -f tor/config.status + -rm -f tor/config.log + -rm -f tor/Makefile + +#------------------------------------------------------------------------------# +# privoxy + +privoxy/configure: + cd privoxy && \ + ./autoheader + ./autoconf + +privoxy/Makefile: privoxy/configure + cd privoxy && \ + CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + ./configure \ + --host=arm-linux-eabi --disable-pthread + +privoxy-build-stamp: privoxy/Makefile + $(MAKE) -C privoxy + touch privoxy-build-stamp + +privoxy: privoxy-build-stamp + test -d bin || mkdir bin + cp privoxy/privoxy bin + +privoxy-clean: + -rm -f bin/privoxy + -rm -f privoxy-build-stamp + -rm -f privoxy/config.status + -rm -f privoxy/config.log + -rm -f privoxy/Makefile + + +#------------------------------------------------------------------------------# +# JTorControl library + +jtorctrl: + test -d jtorctl/bin || mkdir jtorctl/bin + cd jtorctl && \ + javac net/freehaven/tor/control/TorControlConnection.java -d bin + jar cvf bin/jtorctrl.jar jtorctl/bin/* + +jtorctrl-clean: + -rm bin/jtorctrl.jar + +#------------------------------------------------------------------------------# +# cleanup, cleanup, put the toys away + +clean: openssl-static-clean libevent-clean tor-clean privoxy-clean

1 0

[orbot/master] updated project to 15
by n8fr8＠torproject.org 04 May '12

04 May '12

commit 94e60283b46f38f5f3562553b557d6dde91399ec Author: n8fr8 <nathan(a)freitas.net> Date: Thu May 3 15:19:18 2012 -0400 updated project to 15 --- project.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/project.properties b/project.properties index 9aa0dfa..8da376a 100644 --- a/project.properties +++ b/project.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=Google Inc.:Google APIs:15 +target=android-15

1 0

[orbot/master] removed old sdk file
by n8fr8＠torproject.org 04 May '12

04 May '12

commit d3a82e87600f42c542cc16f7928214112f817507 Author: n8fr8 <nathan(a)freitas.net> Date: Thu May 3 18:31:01 2012 -0400 removed old sdk file --- default.properties | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/default.properties b/default.properties deleted file mode 100644 index fd4c7f0..0000000 --- a/default.properties +++ /dev/null @@ -1 +0,0 @@ -proguard.config=proguard.cfg

1 0

[orbot/master] updated changelog
by n8fr8＠torproject.org 04 May '12

04 May '12

commit 24ecd39e8254d3dc5250ac17e54ccca86e0f6a92 Author: n8fr8 <nathan(a)freitas.net> Date: Thu May 3 18:46:36 2012 -0400 updated changelog --- CHANGELOG | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d3997ad..5f7d382 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 1.0.8 (includes 1.0.7.3 and 1.0.7.2) +- new external/Makefile and git submodules - fixed tor control port cookie file path lookup related to #5305 - updated strings - adding in manual locale selection

1 0