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

[orbot/master] putting torrc back in
by n8fr8＠torproject.org 17 Nov '14

17 Nov '14

commit ba2619804c017d4a530bb814e34642c8345c8868 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 17 11:59:16 2014 -0500 putting torrc back in --- res/raw/torrc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/res/raw/torrc b/res/raw/torrc new file mode 100644 index 0000000..e5a4c49 --- /dev/null +++ b/res/raw/torrc @@ -0,0 +1,7 @@ +RunAsDaemon 1 +AvoidDiskWrites 1 +ControlPort auto +SOCKSPort 0 +DNSPort 0 +TransPort 0 +CookieAuthentication 1 \ No newline at end of file

1 0

[orbot/master] set values for nonPIE build
by n8fr8＠torproject.org 17 Nov '14

17 Nov '14

commit dbd4efe86ba57a385e2bc75c7b2761968a1f2350 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 17 11:59:49 2014 -0500 set values for nonPIE build --- src/org/torproject/android/service/TorServiceConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index c6c7031..01764ec 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -76,7 +76,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.5.10-openssl1.0.1i"; + public static final String BINARY_TOR_VERSION = "0.2.5.10-openssl1.0.1i-nonPIE"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy

1 0

[orbot/master] version build to ensure nonPIE binaries are installed
by n8fr8＠torproject.org 17 Nov '14

17 Nov '14

commit a7f458758f9809f342f0beb80ef47da31316f89e Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 17 14:10:33 2014 -0500 version build to ensure nonPIE binaries are installed --- src/org/torproject/android/service/TorServiceConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 01764ec..0b64856 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -76,7 +76,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.5.10-openssl1.0.1i-nonPIE"; + public static final String BINARY_TOR_VERSION = "0.2.5.10-openssl1.0.1i-nonPIE-polipofix"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy

1 0

[orbot/master] update to 14.1.1
by n8fr8＠torproject.org 17 Nov '14

17 Nov '14

commit 4df45864761edec6826371bc3cce655bf853f94a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 17 14:10:55 2014 -0500 update to 14.1.1 - also add new support onboot events --- AndroidManifest.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bbfdd6a..4d909b1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.1.0" - android:versionCode="127" + android:versionName="14.1.1" + android:versionCode="128" android:installLocation="auto" > - <uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/> + <uses-sdk android:minSdkVersion="9" android:maxSdkVersion="20" android:targetSdkVersion="19"/> <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" android:protectionLevel="signature"></permission> <uses-permission android:name="android.permission.INTERNET" /> @@ -92,10 +92,11 @@ </intent-filter> </service> - <receiver android:name=".OnBootReceiver"> <intent-filter> <action android:name="android.intent.action.BOOT_COMPLETED" /> + <action android:name="android.intent.action.QUICKBOOT_POWERON" /> + <action android:name="android.intent.action.MEDIA_MOUNTED"/> </intent-filter> </receiver>

1 0

[orbot/master] add support for other onboot events, including external storage mount
by n8fr8＠torproject.org 17 Nov '14

17 Nov '14

commit f180f13d80e3d2f4903d4222a29f70e898c32b35 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 17 14:10:12 2014 -0500 add support for other onboot events, including external storage mount also version up to ensure install for PIE fix --- src/org/torproject/android/OnBootReceiver.java | 45 ++++++++++++------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/org/torproject/android/OnBootReceiver.java b/src/org/torproject/android/OnBootReceiver.java index 652e5c9..2876a26 100644 --- a/src/org/torproject/android/OnBootReceiver.java +++ b/src/org/torproject/android/OnBootReceiver.java @@ -7,40 +7,39 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.util.Log; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; +import android.os.Build.VERSION; public class OnBootReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - - //Log.i(TorService.TAG,"got boot receiver event"); - if (intent.getAction() != null - && Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) - { + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(context.getApplicationContext()); + + boolean startOnBoot = prefs.getBoolean("pref_start_boot",true); - //Log.i(TorService.TAG,"boot is completed"); - - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(context.getApplicationContext()); - - boolean startOnBoot = prefs.getBoolean("pref_start_boot",true); - - // Log.i(TorService.TAG,"start on boot: " + startOnBoot); - - - if (startOnBoot) - { - Intent torService = new Intent(context.getApplicationContext(), TorService.class); - torService.setAction(Intent.ACTION_BOOT_COMPLETED); - context.getApplicationContext().startService(torService); - - } + if (startOnBoot) + { + startService("init",context); + startService("start",context); } + + } + + private void startService (String action, Context context) + { + Intent torService = new Intent(context, TorService.class); + torService.setAction(action); + context.startService(torService); + + } - }

1 0

[orbot/master] make sure polipo is really cleaned; add only PIE flags for polipo
by n8fr8＠torproject.org 17 Nov '14

17 Nov '14

commit 16d87310a3a0f8a07a3bd1fd8f5f680c52c06a15 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 17 14:11:17 2014 -0500 make sure polipo is really cleaned; add only PIE flags for polipo --- external/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index 4af1016..999c24d 100644 --- a/external/Makefile +++ b/external/Makefile @@ -281,7 +281,7 @@ obfsclient-clean: # polipo polipo-build-stamp: - CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) -C polipo + CC="$(CC)" CFLAGS="$(PIEFLAGS)" LDFLAGS="$(PIEFLAGS)" $(MAKE) -C polipo touch polipo-build-stamp polipo: polipo-build-stamp @@ -289,6 +289,7 @@ polipo: polipo-build-stamp cp polipo/polipo bin polipo-clean: + -rm -f polipo/polipo -rm -f bin/polipo -rm -f polipo-build-stamp

1 0

[orbot/master] Merge branch 'build_nonPIE'
by n8fr8＠torproject.org 17 Nov '14

17 Nov '14

commit d70a36f64d51e20f6517b8cd11c35bd2bc9f25d4 Merge: 4fa49b3 16d8731 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 17 14:12:13 2014 -0500 Merge branch 'build_nonPIE' Conflicts: AndroidManifest.xml AndroidManifest.xml | 9 ++-- external/Makefile | 3 +- res/raw/torrc | 7 +++ src/org/torproject/android/OnBootReceiver.java | 45 ++++++++++---------- .../android/service/TorServiceConstants.java | 2 +- 5 files changed, 37 insertions(+), 29 deletions(-)

1 0

[orbot/master] setting target to 21 to fix build
by n8fr8＠torproject.org 17 Nov '14

17 Nov '14

commit 9d841857dfe02201d0fd71c2cb6536116c0a25b9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Nov 14 12:48:31 2014 -0500 setting target to 21 to fix build --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f8cd7ba..cdc1e16 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -6,7 +6,7 @@ android:installLocation="auto" > - <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="19"/> + <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21"/> <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" android:protectionLevel="signature"></permission> <uses-permission android:name="android.permission.INTERNET" />

1 0

[orbot/master] update to target 21
by n8fr8＠torproject.org 17 Nov '14

17 Nov '14

commit 4fa49b3cc73b3c61ed97894e34dcd5a9c5f5415f Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Nov 14 12:48:50 2014 -0500 update to target 21 --- update-ant-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-ant-build.sh b/update-ant-build.sh index dcab100..47126be 100755 --- a/update-ant-build.sh +++ b/update-ant-build.sh @@ -1,6 +1,6 @@ #!/bin/sh # make sure your Android SDK tools path is set in SDK_BASE -android update project -t android-19 --path . --name Orbot --subprojects +android update project -t android-21 --path . --name Orbot --subprojects android update lib-project -t android-19 --path external/appcompat android update lib-project -t android-19 --path external/superuser-commands/RootCommands-Library/

1 0

[tor-messenger-build/master] Add ControlPort patch for Tor Launcher
by sukhbir＠torproject.org 17 Nov '14

17 Nov '14

commit 4955fae9bac8a15f4bc5d4c18aa5fe5f5d7c49c4 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Nov 17 23:23:20 2014 +0530 Add ControlPort patch for Tor Launcher --- projects/tor-launcher/build | 1 + projects/tor-launcher/config | 1 + projects/tor-launcher/controlport.patch | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index f9b509e..d42b784 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -3,5 +3,6 @@ set -e tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] patch -d src -p1 < ../topdir.patch +patch -d src -p1 < ../controlport.patch make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 14734be..eae7385 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -6,3 +6,4 @@ tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: - filename: topdir.patch + - filename: controlport.patch diff --git a/projects/tor-launcher/controlport.patch b/projects/tor-launcher/controlport.patch new file mode 100644 index 0000000..7c9b904 --- /dev/null +++ b/projects/tor-launcher/controlport.patch @@ -0,0 +1,25 @@ +From 08800fd6f225b05817e134fa465d1b83fb42be8e Mon Sep 17 00:00:00 2001 +From: Sukhbir Singh <sukhbir(a)torproject.org> +Date: Mon, 17 Nov 2014 22:50:47 +0530 +Subject: [PATCH 1/1] Set ControlPort to 9153 + +--- + src/defaults/preferences/prefs.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js +index 34bf1a7..b95b00f 100644 +--- a/src/defaults/preferences/prefs.js ++++ b/src/defaults/preferences/prefs.js +@@ -3,7 +3,7 @@ pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=deb + pref("extensions.torlauncher.max_tor_log_entries", 1000); + + pref("extensions.torlauncher.control_host", "127.0.0.1"); +-pref("extensions.torlauncher.control_port", 9151); ++pref("extensions.torlauncher.control_port", 9153); + + pref("extensions.torlauncher.start_tor", true); + pref("extensions.torlauncher.prompt_at_startup", true); +-- +2.1.3 +

1 0