- tor-commits - lists.torproject.org

[orbot/master] update ndk-builds to NDK 4.8 toolchain
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 5fb4e9b80e6aae52b264dbd6e969c6707369ca90 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 21 14:56:35 2016 -0500 update ndk-builds to NDK 4.8 toolchain --- jni/Application.mk | 2 +- libs/armeabi-v7a/libtun2socks.so | Bin 125316 -> 121288 bytes libs/armeabi-v7a/pdnsd | Bin 149168 -> 149136 bytes libs/armeabi/libtun2socks.so | Bin 129408 -> 129472 bytes libs/armeabi/pdnsd | Bin 0 -> 157320 bytes libs/mips/libtun2socks.so | Bin 283888 -> 284056 bytes libs/mips/pdnsd | Bin 334636 -> 334616 bytes libs/x86/libtun2socks.so | Bin 195160 -> 199016 bytes libs/x86/pdnsd | Bin 0 -> 206460 bytes 9 files changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/Application.mk b/jni/Application.mk index a17746e..7d4d00d 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,4 +1,4 @@ APP_ABI := armeabi armeabi-v7a arm64-v8a mips x86 APP_PLATFORM := android-16 APP_STL := stlport_static -NDK_TOOLCHAIN_VERSION := 4.6 +NDK_TOOLCHAIN_VERSION := 4.8 diff --git a/libs/armeabi-v7a/libtun2socks.so b/libs/armeabi-v7a/libtun2socks.so index 02db968..e29ca51 100755 Binary files a/libs/armeabi-v7a/libtun2socks.so and b/libs/armeabi-v7a/libtun2socks.so differ diff --git a/libs/armeabi-v7a/pdnsd b/libs/armeabi-v7a/pdnsd index 38eb74c..04a3ad1 100755 Binary files a/libs/armeabi-v7a/pdnsd and b/libs/armeabi-v7a/pdnsd differ diff --git a/libs/armeabi/libtun2socks.so b/libs/armeabi/libtun2socks.so index d43f63b..bce43d4 100755 Binary files a/libs/armeabi/libtun2socks.so and b/libs/armeabi/libtun2socks.so differ diff --git a/libs/armeabi/pdnsd b/libs/armeabi/pdnsd new file mode 100755 index 0000000..429bc35 Binary files /dev/null and b/libs/armeabi/pdnsd differ diff --git a/libs/mips/libtun2socks.so b/libs/mips/libtun2socks.so index 1c49467..4808813 100755 Binary files a/libs/mips/libtun2socks.so and b/libs/mips/libtun2socks.so differ diff --git a/libs/mips/pdnsd b/libs/mips/pdnsd index acd2c6b..bd5a398 100755 Binary files a/libs/mips/pdnsd and b/libs/mips/pdnsd differ diff --git a/libs/x86/libtun2socks.so b/libs/x86/libtun2socks.so index be3b8f7..23b8873 100755 Binary files a/libs/x86/libtun2socks.so and b/libs/x86/libtun2socks.so differ diff --git a/libs/x86/pdnsd b/libs/x86/pdnsd new file mode 100755 index 0000000..8d6e493 Binary files /dev/null and b/libs/x86/pdnsd differ

1 0

[orbot/master] use symlinks to provide alternate folders for Hebrew and Indonesian
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit a6ac016a842a37e6c5433e17599f422ba19bd842 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Mon Sep 21 12:05:24 2015 +0200 use symlinks to provide alternate folders for Hebrew and Indonesian These two languages must be included twice (iw/he and id/in) For a full discussion of why, see: https://gitlab.com/fdroid/fdroidclient/issues/139 https://stackoverflow.com/questions/5074769/cyanogenmod-translate-a-project… https://stackoverflow.com/questions/8393771/android-not-using-finding-my-he… --- res/values-he | 1 + res/values-id | 1 + 2 files changed, 2 insertions(+) diff --git a/res/values-he b/res/values-he new file mode 120000 index 0000000..6fe8b49 --- /dev/null +++ b/res/values-he @@ -0,0 +1 @@ +values-iw \ No newline at end of file diff --git a/res/values-id b/res/values-id new file mode 120000 index 0000000..3e5fb5a --- /dev/null +++ b/res/values-id @@ -0,0 +1 @@ +values-in-rID \ No newline at end of file

1 0

[orbot/master] change VPN mode DNS to use Google's 8.8.8.8
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 9af00fe26323569641cde93a0b87be8604eae386 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 20 14:11:48 2016 -0500 change VPN mode DNS to use Google's 8.8.8.8 --- src/org/torproject/android/vpn/OrbotVpnService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 9b039bc..0520f57 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -75,8 +75,8 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { private final static boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; - private final static String DEFAULT_ACTUAL_DNS = "208.67.222.222"; - + //this is the actual DNS server we talk with over TCP/IP + private final static String DEFAULT_ACTUAL_DNS = "8.8.8.8";//use Google here, or 8.8.4.4 as backup? private boolean isRestart = false;

1 0

[orbot/master] build jtorctl directly, using a symlink to point to its source code
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 72eab39a95794fa5f7a6ff73e7b38abc185c6454 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Thu Jan 14 20:57:30 2016 +0100 build jtorctl directly, using a symlink to point to its source code This builds the jtorctl java with the rest of Orbot's java. The process of making a jar breaks when external/Makefile is run with frozen time using faketime. That is needed to get reproducible native bits. --- external/Makefile | 31 ++++--------------------------- src/net | 1 + 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/external/Makefile b/external/Makefile index ae7db87..e25cd0d 100644 --- a/external/Makefile +++ b/external/Makefile @@ -199,7 +199,7 @@ iptables/Makefile: cp config.sub iptables cp config.guess iptables cd iptables && \ - CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \ + CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \ ./configure --host=$(HOST) --disable-shared --enable-static iptables-build-stamp: iptables/Makefile @@ -291,34 +291,12 @@ pluto-clean: # -rm -rf pluto/bin #------------------------------------------------------------------------------# -# JTorControl library - -jtorctl/bin/jtorctl.jar: - test -d jtorctl/bin || mkdir jtorctl/bin - cd jtorctl && \ - javac -source 1.6 -target 1.6 net/freehaven/tor/control/TorControlConnection.java -d bin - cd jtorctl/bin && \ - jar cvf jtorctl.jar * - -jtorctl-build-stamp: jtorctl/bin/jtorctl.jar - touch jtorctl-build-stamp - -jtorctl: jtorctl-build-stamp - test -d bin || mkdir bin - cp jtorctl/bin/jtorctl.jar bin - -jtorctl-clean: - -rm -rf jtorctl/bin - -rm jtorctl-build-stamp - -#------------------------------------------------------------------------------# #create and clean assets: FYI - tor is stored as a ZIP file with an mp3 extension #in order to stop Android OS (older devices) from trying to compress/decompress it #this is related to a bug in compression of assets and resources > 1MB -assets: tor polipo jtorctl iptables pluto +assets: tor polipo iptables pluto install -d ../libs - install bin/jtorctl.jar ../libs install -d ../assets/$(APP_ABI) -$(STRIP) bin/polipo -zip ../assets/$(APP_ABI)/polipo.mp3 bin/polipo @@ -341,13 +319,12 @@ assets-clean: -rm ../assets/$(APP_ABI)/meek-client.mp3 -rm ../assets/$(APP_ABI)/obfs4proxy.mp3 -rm ../assets/$(APP_ABI)/pdnsd.mp3 - -rm ../libs/jtorctl.jar #------------------------------------------------------------------------------# # cleanup, cleanup, put the toys away -##clean: openssl-clean libevent-clean tor-clean polipo-clean jtorctl-clean assets-clean -clean: openssl-clean libevent-clean tor-clean polipo-clean iptables-clean jtorctl-clean pluto-clean +##clean: openssl-clean libevent-clean tor-clean polipo-clean assets-clean +clean: openssl-clean libevent-clean tor-clean polipo-clean iptables-clean pluto-clean #------------------------------------------------------------------------------# # debugging stuff diff --git a/src/net b/src/net new file mode 120000 index 0000000..ab37141 --- /dev/null +++ b/src/net @@ -0,0 +1 @@ +../external/jtorctl/net/ \ No newline at end of file

1 0

[orbot/master] make-release-build: use strip-nondeterminism to get reproducible build
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 58d53ea347d2c923d781aed450bbb922b3888210 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Thu Jan 14 20:59:17 2016 +0100 make-release-build: use strip-nondeterminism to get reproducible build strip-nondeterminism sets the timestamps in the zip based on the timestamp of the git commit. --- make-release-build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/make-release-build b/make-release-build index 3c18ce0..2d5947a 100755 --- a/make-release-build +++ b/make-release-build @@ -71,6 +71,14 @@ faketime -f "$TIMESTAMP_5" ant release apk=$projectroot/bin/$projectname-v$describe.apk +# standardize timestamps in ZIP headers, requires strip-nondeterminism 0.014 +if which strip-nondeterminism > /dev/null; then + strip-nondeterminism -t zip -T $(git log -n1 --format=format:%at) $apk +fi + +# echo the checksum to build logs +sha256sum $apk + if which gpg > /dev/null; then if [ -z "`gpg --list-secret-keys`" ]; then echo "No GPG secret keys found, not signing APK"

1 0

[orbot/master] make-release-build: remove faketime from `ant release`
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 735b2985f72fbabe7d6a080636a48842933c07ac Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Thu Jan 14 21:42:59 2016 +0100 make-release-build: remove faketime from `ant release` It is too problematic and there are other ways to make those final parts of the APK reproducible. --- make-release-build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/make-release-build b/make-release-build index 23aa5e2..19dc5b7 100755 --- a/make-release-build +++ b/make-release-build @@ -51,9 +51,6 @@ projectname=`sed -n 's,.*name="app_name">$.*$<.*,\1,p' res/values/strings.xml` export TZ=UTC TIMESTAMP=`printf '%(%Y-%m-%d %H:%M:%S)T' \ $(git log -n1 --format=format:%at)` -# run the clock at 5% speed, ant requires a moving clock -TIMESTAMP_5=`printf '@%(%Y-%m-%d %H:%M:%S)T x0.05' \ - $(git log -n1 --format=format:%at)` git reset --hard git clean -fdx @@ -76,7 +73,7 @@ faketime "$TIMESTAMP" make -C external ./setup-ant -faketime -f "$TIMESTAMP_5" ant release +ant release apk=$projectroot/bin/$projectname-v$describe.apk

1 0

[orbot/master] make-release-build: make sure tag signers exist before verifying tags
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 5ce1f5f91ad6ae98e0388243126313328c971e35 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Thu Jan 14 20:57:57 2016 +0100 make-release-build: make sure tag signers exist before verifying tags --- make-release-build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/make-release-build b/make-release-build index b28dcd8..3c18ce0 100755 --- a/make-release-build +++ b/make-release-build @@ -16,6 +16,9 @@ else echo "" echo "" echo "Checking git tag signature for release build:" + gpg --list-key 9F0FE587374BBE81 || gpg --recv-key 9F0FE587374BBE81 + gpg --list-key E9E28DEA00AA5556 || gpg --recv-key E9E28DEA00AA5556 + gpg --list-key A801183E69B37AA9 || gpg --recv-key A801183E69B37AA9 git tag -v $versionName echo "" echo ""

1 0

[orbot/master] make-release-build: make sure ndk-build can be found
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 5c86b5cc7ea9ee84c4dc6d84d8acaff955e21eb6 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Thu Jan 14 21:08:46 2016 +0100 make-release-build: make sure ndk-build can be found --- make-release-build | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/make-release-build b/make-release-build index 2d5947a..ee48d17 100755 --- a/make-release-build +++ b/make-release-build @@ -35,6 +35,15 @@ if [ -z $ANDROID_HOME ]; then fi fi +if [ -z $ANDROID_NDK_HOME ]; then + if which ndk-build 2>&1 /dev/null; then + ANDROID_NDK_HOME=`which ndk-build | sed 's,/ndk-build,,'` + else + echo "ANDROID_NDK_HOME not set and 'ndk-build' not in PATH" + exit + fi +fi + projectroot=`pwd` projectname=`sed -n 's,.*name="app_name">$.*$<.*,\1,p' res/values/strings.xml` @@ -61,7 +70,7 @@ else echo "skipping release ant.properties" fi -ndk-build +$ANDROID_NDK_HOME/ndk-build faketime "$TIMESTAMP" make -C external

1 0

[orbot/master] make-release-build: freeze time when running ndk-build
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 461e35dc5163501ef936ed4ec6afcfbe1f41ee56 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Thu Jan 14 21:09:45 2016 +0100 make-release-build: freeze time when running ndk-build This aides reproducibility. --- make-release-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make-release-build b/make-release-build index ee48d17..23aa5e2 100755 --- a/make-release-build +++ b/make-release-build @@ -70,7 +70,7 @@ else echo "skipping release ant.properties" fi -$ANDROID_NDK_HOME/ndk-build +faketime "$TIMESTAMP" $ANDROID_NDK_HOME/ndk-build faketime "$TIMESTAMP" make -C external

1 0

[orbot/master] Merge pull request #21 from eighthave/master
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 0bbe5d5f51f0deb429c7552c6187f465b10e1ae7 Merge: 5fb4e9b 735b298 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 22 19:07:28 2016 -0500 Merge pull request #21 from eighthave/master work towards a reproducible build external/Makefile | 31 ++++--------------------------- make-release-build | 27 ++++++++++++++++++++++----- res/values-he | 1 + res/values-id | 1 + src/net | 1 + 5 files changed, 29 insertions(+), 32 deletions(-)

1 0