November 2016 - tor-commits - lists.torproject.org

[orbot/master] don't need to store this binary in the repo
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit 37cd0241e5485a086073b00411f2af25fbffaada Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Nov 2 15:00:08 2016 -0400 don't need to store this binary in the repo --- orbotservice/src/main/jniLibs/armeabi/libtun2socks.so | Bin 129472 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/orbotservice/src/main/jniLibs/armeabi/libtun2socks.so b/orbotservice/src/main/jniLibs/armeabi/libtun2socks.so deleted file mode 100755 index 74d7c34..0000000 Binary files a/orbotservice/src/main/jniLibs/armeabi/libtun2socks.so and /dev/null differ

1 0

[orbot/master] update gitignore to ignore binaries
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit e9ece471b70b32fc46e724e056d35fde0519e54e Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Nov 2 15:00:28 2016 -0400 update gitignore to ignore binaries --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index e47272e..8b28d8a 100644 --- a/.gitignore +++ b/.gitignore @@ -65,4 +65,6 @@ obj app/src/main/jniLibs/ app/src/main/libs/ orbotservice/src/main/libs/ +orbotservice/src/main/jniLibs/ orbotservice/src/main/assets/armeabi/ +orbotservice/src/main/assets/x86/

1 0

[orbot/master] use PIEFLAGS
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit 5ac21be984164a5145d46d2578c852c7483b1a41 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 11:00:12 2016 -0400 use PIEFLAGS --- external/Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/external/Makefile b/external/Makefile index 850e92c..319b99e 100644 --- a/external/Makefile +++ b/external/Makefile @@ -23,11 +23,14 @@ endif # Android NDK setup ANDROID_NDK_HOME ?= /opt/android-ndk -NDK_PLATFORM_LEVEL ?= 16 -NDK_TOOLCHAIN_VERSION=4.8 +NDK_PLATFORM_LEVEL ?= 21 +NDK_TOOLCHAIN_VERSION=4.9 APP_ABI ?= armeabi NDK_ABI ?= $(APP_ABI) -PIE_MODE ?= pie + +# PIEFLAGS for SDK 16/Android L must be set to -fPIE -pie, but can override for earlier targets +PIEFLAGS ?= -fPIE -pie + ifneq ($(filter arm%, $(APP_ABI)),) NDK_ABI := arm endif @@ -71,11 +74,6 @@ RANLIB := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ranlib STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip \ --strip-unneeded -R .note -R .comment --strip-debug -# PIEFLAGS for SDK 16/Android L must be set to -fPIE -pie, but can override for earlier targets -PIEFLAGS ?= -fPIE -pie -ifeq ($(PIEMODE),nopie) - PIEFLAGS = -endif CFLAGS = -DANDROID $(TARGET_CFLAGS) $(PIEFLAGS) LDFLAGS = -llog $(TARGET_LDFLAGS) $(PIEFLAGS)

1 0

[orbot/master] update JNI targets
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit 0050bfeb950c09f897345a4d114feb03dcfef557 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 10:38:10 2016 -0400 update JNI targets --- orbotservice/src/main/jni/Application.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orbotservice/src/main/jni/Application.mk b/orbotservice/src/main/jni/Application.mk index a356ed7..abc185b 100644 --- a/orbotservice/src/main/jni/Application.mk +++ b/orbotservice/src/main/jni/Application.mk @@ -1,4 +1,4 @@ APP_ABI := armeabi -APP_PLATFORM := android-16 +APP_PLATFORM := android-23 APP_STL := stlport_static -NDK_TOOLCHAIN_VERSION := 4.8 +NDK_TOOLCHAIN_VERSION := 4.9

1 0

[orbot/master] update the build to target all arm types
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit 5927fb0123fcaf1e6d498c7a3b938aa85372a334 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 12:17:23 2016 -0400 update the build to target all arm types --- orbotservice/src/main/jni/Application.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/jni/Application.mk b/orbotservice/src/main/jni/Application.mk index abc185b..146bb44 100644 --- a/orbotservice/src/main/jni/Application.mk +++ b/orbotservice/src/main/jni/Application.mk @@ -1,4 +1,4 @@ -APP_ABI := armeabi +APP_ABI := armeabi armeabi-v7a arm64-v8a APP_PLATFORM := android-23 APP_STL := stlport_static NDK_TOOLCHAIN_VERSION := 4.9

1 0

[orbot/master] update to latest badvpn for new torservice package
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit f5f544c2d362d703862454768f99a0af0670298b Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 12:19:24 2016 -0400 update to latest badvpn for new torservice package --- external/badvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/badvpn b/external/badvpn index 24a97f2..fbc279c 160000 --- a/external/badvpn +++ b/external/badvpn @@ -1 +1 @@ -Subproject commit 24a97f2101abaf0569b78ee430d62eb2543d3ec2 +Subproject commit fbc279c3c6999f8357666f4b85969dfd29764465

1 0

[orbot/master] make sure tun2socks is loaded properly
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit f21f14bf5b2d2fa3cbe037dd4eccfc76656fd296 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 12:18:20 2016 -0400 make sure tun2socks is loaded properly --- .../main/java/org/torproject/android/service/vpn/OrbotVpnManager.java | 2 ++ .../src/main/java/org/torproject/android/service/vpn/Tun2Socks.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index 1b4cca0..ea07250 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -93,6 +93,8 @@ public class OrbotVpnManager implements Handler.Callback { File fileBinHome = mService.getDir(TorServiceConstants.DIRECTORY_TOR_BINARY, Application.MODE_PRIVATE); filePdnsd = new File(fileBinHome,TorServiceConstants.PDNSD_ASSET_KEY); + Tun2Socks.init(); + } //public int onStartCommand(Intent intent, int flags, int startId) { diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java index cff4c1c..ff1ac94 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java @@ -57,6 +57,8 @@ public class Tun2Socks // than one instance due to the use of global state (the lwip // module, etc.) in the native code. + public static void init () {} + public static void Start( ParcelFileDescriptor vpnInterfaceFileDescriptor, int vpnInterfaceMTU,

1 0

[orbot/master] make sure the binaries are cleanly installed (bump version number)
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit 89f3fcacf22014d057c47a27bd18ded8f5071977 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 12:21:54 2016 -0400 make sure the binaries are cleanly installed (bump version number) --- .../main/java/org/torproject/android/service/TorServiceConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java index bcaaf86..767f17a 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -134,7 +134,7 @@ public interface TorServiceConstants { public static final String CMD_SET_EXIT = "setexit"; - public static final String BINARY_TOR_VERSION = "0.2.8.9"; + public static final String BINARY_TOR_VERSION = "0.2.8.9a"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy

1 0

[orbot/master] make sure Tun2Socks native library gets loaded
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit 460f365b4ae73612c514ab5ebffa51800fb1e509 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 12:17:55 2016 -0400 make sure Tun2Socks native library gets loaded --- .../src/main/java/org/torproject/android/service/TorService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 0dab480..47af4ac 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -246,9 +246,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } mNotifyBuilder.setOngoing(Prefs.persistNotifications()); - mNotifyBuilder.setPriority(Notification.PRIORITY_LOW); - mNotifyBuilder.setCategory(Notification.CATEGORY_SERVICE); + if (!Prefs.persistNotifications()) + mNotifyBuilder.setPriority(Notification.PRIORITY_LOW); + + mNotifyBuilder.setCategory(Notification.CATEGORY_SERVICE); mNotification = mNotifyBuilder.build();

1 0

[orbot/master] update manifest for 15.2.0-RC-4
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit 6b2679cac16782a7a36a79f90f2dd0d8e330742f Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 12:23:22 2016 -0400 update manifest for 15.2.0-RC-4 --- app/src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d25f5b7..1c63803 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/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="15.2.0-RC-3" - android:versionCode="15200050" + android:versionName="15.2.0-RC-4" + android:versionCode="15204000" android:installLocation="auto" > <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>

1 0