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

[tor/master] Keep make check-spaces happy
by andrea＠torproject.org 29 Jul '16

29 Jul '16

commit 1995328a3d0c98f5a8856f532b20099970afecc2 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Jul 29 05:05:12 2016 +0000 Keep make check-spaces happy --- src/common/compat.c | 1 - src/common/compat_time.c | 1 + src/common/timers.h | 3 ++- src/common/util.h | 1 - src/or/control.c | 3 ++- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index e0807e4..b2ed119 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2824,7 +2824,6 @@ compute_num_cpus(void) return num_cpus; } - #if !defined(_WIN32) /** Defined iff we need to add locks when defining fake versions of reentrant * versions of time-related functions. */ diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 7676e3a..3493ea0 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -626,3 +626,4 @@ monotime_coarse_absolute_msec(void) return monotime_coarse_absolute_nsec() / ONE_MILLION; } #endif + diff --git a/src/common/timers.h b/src/common/timers.h index 2c36af1..5f918f8 100644 --- a/src/common/timers.h +++ b/src/common/timers.h @@ -9,7 +9,8 @@ struct monotime_t; typedef struct timeout tor_timer_t; -typedef void (*timer_cb_fn_t)(tor_timer_t *, void *, const struct monotime_t *); +typedef void (*timer_cb_fn_t)(tor_timer_t *, void *, + const struct monotime_t *); tor_timer_t *timer_new(timer_cb_fn_t cb, void *arg); void timer_set_cb(tor_timer_t *t, timer_cb_fn_t cb, void *arg); void timer_schedule(tor_timer_t *t, const struct timeval *delay); diff --git a/src/common/util.h b/src/common/util.h index 9face0c..7a6203a 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -154,7 +154,6 @@ int n_bits_set_u8(uint8_t v); int64_t clamp_double_to_int64(double number); void simplify_fraction64(uint64_t *numer, uint64_t *denom); - /* Compute the CEIL of a divided by b, for nonnegative a * and positive b. Works on integer types only. Not defined if a+b can * overflow. */ diff --git a/src/or/control.c b/src/or/control.c index ec76ecf..64a980d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1865,7 +1865,8 @@ getinfo_helper_dir(control_connection_t *control_conn, const routerinfo_t *ri = NULL; /* XXX Setting 'warn_if_unnamed' here is a bit silly -- the * warning goes to the user, not to the controller. */ - const node_t *node = node_get_by_nickname(question+strlen("desc/name/"), 1); + const node_t *node = + node_get_by_nickname(question+strlen("desc/name/"), 1); if (node) ri = node->ri; if (ri) {

1 0

[torbutton/master] Release preparations for 1.9.6.1
by mikeperry＠torproject.org 29 Jul '16

29 Jul '16

commit e403cd883db74649eed86aed0edaf3d101d07fbb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 28 17:03:03 2016 -0700 Release preparations for 1.9.6.1 CHANGELOG update, version bump --- src/CHANGELOG | 7 +++++++ src/install.rdf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index e62bafd..cd5ce27 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +1.9.6.1 + * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client + * Bug 19417: Disable asm.js (but add code to clear on New Identity if enabled) + * Bug 19689: Plugin usage prompt is parented to wrong window + * Bug 19273: Improve external app launch handling and associated warnings + * Bug 8725: Block addon resource and url fingerprinting with nsIContentPolicy + 1.9.6 * Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu * Bug 18905: Hide unusable items from help menu diff --git a/src/install.rdf b/src/install.rdf index db269d5..e33fdb9 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.6</em:version> + <em:version>1.9.6.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-messenger-build/master] Update mozconfig files (enable Tor Browser secure updater)
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit c43aaedd101e997c361fdeb64ae4adbd44e0ceb3 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jul 8 15:20:48 2016 -0400 Update mozconfig files (enable Tor Browser secure updater) --- projects/instantbird/mozconfig-linux-i686 | 5 ++++- projects/instantbird/mozconfig-linux-x86_64 | 5 ++++- projects/instantbird/mozconfig-osx-x86_64 | 5 ++++- projects/instantbird/mozconfig-windows-i686 | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686 index 2887ff9..637f8f5 100644 --- a/projects/instantbird/mozconfig-linux-i686 +++ b/projects/instantbird/mozconfig-linux-i686 @@ -20,10 +20,13 @@ ac_add_options --host=i686-linux-gnu ac_add_options --with-branding=im/branding/messenger -ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --enable-default-toolkit=cairo-gtk2 + +ac_add_options --enable-tor-browser-update +ac_add_options --enable-update-packaging +ac_add_options --disable-verify-mar diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64 index 2f2b8fd..403d3e7 100644 --- a/projects/instantbird/mozconfig-linux-x86_64 +++ b/projects/instantbird/mozconfig-linux-x86_64 @@ -15,10 +15,13 @@ ac_add_options --with-l10n-base=.. ac_add_options --with-branding=im/branding/messenger -ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --enable-default-toolkit=cairo-gtk2 + +ac_add_options --enable-tor-browser-update +ac_add_options --enable-update-packaging +ac_add_options --disable-verify-mar diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64 index 1f999cd..09d5eaa 100644 --- a/projects/instantbird/mozconfig-osx-x86_64 +++ b/projects/instantbird/mozconfig-osx-x86_64 @@ -22,8 +22,11 @@ ac_add_options --with-l10n-base=.. ac_add_options --with-branding=im/branding/messenger -ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --disable-tests ac_add_options --disable-debug + +ac_add_options --enable-tor-browser-update +ac_add_options --enable-update-packaging +ac_add_options --disable-verify-mar diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index 9a9dd0b..e01db11 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -20,10 +20,13 @@ ac_add_options --without-intl-api ac_add_options --with-branding=im/branding/messenger -ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests ac_add_options --disable-signmar ac_add_options --disable-debug + +ac_add_options --enable-tor-browser-update +ac_add_options --enable-update-packaging +ac_add_options --disable-verify-mar

1 0

[tor-messenger-build/master] Update start-tor-messenger.desktop (set Browser directory)
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit a32dbb750289150f25407068b23338614ecf0c1e Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jul 8 19:14:58 2016 -0400 Update start-tor-messenger.desktop (set Browser directory) --- projects/tor-messenger/start-tor-messenger.desktop | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/projects/tor-messenger/start-tor-messenger.desktop b/projects/tor-messenger/start-tor-messenger.desktop index 606cf32..a434ea5 100644 --- a/projects/tor-messenger/start-tor-messenger.desktop +++ b/projects/tor-messenger/start-tor-messenger.desktop @@ -1,19 +1,17 @@ -#!/usr/bin/env ./Messenger/execdesktop +#!/usr/bin/env ./Browser/execdesktop # # This file is a self-modifying .desktop file that can be run from the shell. # It preserves arguments and environment for the start-tor-messenger script. # -# Run './start-tor-messenger.desktop --help' to display the full set of -# options. +# Run './start-tor-messenger.desktop --help' to display the full set of options. # -# When invoked from the shell, this file must always be in a Tor Messenger -# root directory. When run from the file manager or desktop GUI, it is -# relocatable. +# When invoked from the shell, this file must always be in a Tor Messenger root +# directory. When run from the file manager or desktop GUI, it is relocatable. # # After first invocation, it will update itself with the absolute path to the # current TBB location, to support relocation of this .desktop file for GUI -# invocation. You can also add Tor Messenger to your desktop's application -# menu by running './start-tor-messenger.desktop --register-app' +# invocation. You can also add Tor Messenger to your desktop's application menu +# by running './start-tor-messenger.desktop --register-app' # # If you use --register-app, and then relocate your TBB directory, Tor # Messenger will no longer launch from your desktop's app launcher/dock. @@ -30,6 +28,7 @@ Name=Tor Messenger Setup GenericName=Instant Messenger Comment=Tor Messenger is +1 for privacy and -1 for mass surveillance Categories=Network;Chat;Security; -Exec=sh -c '"$(dirname "$*")"/Messenger/start-tor-messenger --detach || ([ ! -x "$(dirname "$*")"/Messenger/start-tor-messenger ] && "$(dirname "$*")"/start-tor-messenger --detach)' dummy %k -X-TorMessenger-ExecShell=./Messenger/start-tor-messenger --detach +Exec=sh -c '"$(dirname "$*")"/Browser/start-tor-messenger --detach || ([ ! -x "$(dirname "$*")"/Browser/start-tor-messenger ] && "$(dirname "$*")"/start-tor-messenger --detach)' dummy %k +X-TorMessenger-ExecShell=./Browser/start-tor-messenger --detach Icon=instant-messenger +StartupWMClass=Tor Messenger

1 0

[tor-messenger-build/master] Bump Tor Browser to 6.0.2
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit d2a58f2bbeafa1e8a3b7802f3464dac8a5efa37c Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jul 8 19:15:32 2016 -0400 Bump Tor Browser to 6.0.2 --- projects/tor-browser/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index e0fa0f7..55a295c 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 5.5.4 +version: 6.0.2 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0

[tor-messenger-build/master] Update start-tor-messenger (set Browser directory)
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit 50bbad9c6d5a339077c60abc853183fbf78c9342 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jul 8 19:15:17 2016 -0400 Update start-tor-messenger (set Browser directory) --- projects/tor-messenger/start-tor-messenger | 35 +++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/projects/tor-messenger/start-tor-messenger b/projects/tor-messenger/start-tor-messenger index 94624ca..ad0da4a 100755 --- a/projects/tor-messenger/start-tor-messenger +++ b/projects/tor-messenger/start-tor-messenger @@ -238,7 +238,7 @@ fi cp start-tor-messenger.desktop ../ sed -i -e "s,^Name=.*,Name=Tor Messenger,g" ../start-tor-messenger.desktop sed -i -e "s,^Icon=.*,Icon=$PWD/chrome/icons/default/default48.png,g" ../start-tor-messenger.desktop -sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-messenger\" --detach || ([ ! -x \"$PWD/start-tor-messenger\" ] \&\& \"\$(dirname \"\$*\")\"/Messenger/start-tor-messenger --detach)' dummy %k,g" ../start-tor-messenger.desktop +sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-messenger\" --detach || ([ ! -x \"$PWD/start-tor-messenger\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-messenger --detach)' dummy %k,g" ../start-tor-messenger.desktop if [ "$register_desktop_app" -eq 1 ]; then mkdir -p "$HOME/.local/share/applications/" @@ -263,14 +263,14 @@ HOME="${PWD}" export HOME SYSARCHITECTURE=$(getconf LONG_BIT) -TORARCHITECTURE=$(expr "$(file extensions/tor-launcher(a)torproject.org/TorBrowser/Tor/tor)" : '.*ELF $[[:digit:]]*$') +TORARCHITECTURE=$(expr "$(file TorBrowser/Tor/tor)" : '.*ELF $[[:digit:]]*$') if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then complain "Wrong architecture? 32-bit vs. 64-bit." exit 1 fi -LD_LIBRARY_PATH="${HOME}/lib/:${HOME}/extensions/tor-launcher@torproject.org/TorBrowser/Tor:${HOME}/extensions/ctypes-otr@tormessenger/chrome/content" +LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/:${HOME}/TorBrowser/Data/Browser/profile.default/extensions/ctypes-otr@tormessenger/chrome/content" export LD_LIBRARY_PATH function setControlPortPasswd() { @@ -310,14 +310,25 @@ EOF # TOR_CONTROL_PASSWD='"secret"' # # Yes, the variable MUST be double-quoted, then single-quoted, exactly as -# shown. This is used by Tor Launcher to authenticate to Tor's ControlPort, -# and is necessary for using TM with a system-installed Tor. +# shown. This is used by TorButton and Tor Launcher to authenticate to Tor's +# ControlPort, and is necessary for using TB with a system-installed Tor. # # Additionally, if using a system-installed Tor, the following about:config # options should be set (values in <> mean they are the value taken from your # torrc): # # SETTING NAME VALUE +# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> +# extensions.torbutton.block_disk false +# extensions.torbutton.custom.socks_host 127.0.0.1 +# extensions.torbutton.custom.socks_port <SocksPort> +# extensions.torbutton.inserted_button true +# extensions.torbutton.launch_warning false +# extensions.torbutton.loglevel 2 +# extensions.torbutton.logmethod 0 +# extensions.torbutton.settings_method custom +# extensions.torbutton.socks_port <SocksPort> +# extensions.torbutton.use_privoxy false # extensions.torlauncher.control_port <ControlPort> # extensions.torlauncher.loglevel 2 # extensions.torlauncher.logmethod 0 @@ -331,6 +342,10 @@ EOF # your password in the following line where the word “secret” is: setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} +# Set up custom bundled fonts. See fonts-conf(5). +export FONTCONFIG_PATH="${HOME}/TorBrowser/Data/fontconfig" +export FONTCONFIG_FILE="fonts.conf" + cd "${HOME}" # We pass all additional command-line arguments we get to Instantbird. @@ -340,22 +355,22 @@ cd "${HOME}" if [ "$show_usage" -eq 1 ]; then # Display Instantbird help, then our help TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Tor Messenger" \ - -profile TorMessenger/Data/Browser/profile.default --help 2>/dev/null + -profile TorBrowser/Data/Browser/profile.default --help 2>/dev/null tbb_usage elif [ "$detach" -eq 1 ] ; then TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Tor Messenger" \ - -profile TorMessenger/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null & + -profile TorBrowser/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null & disown "$!" elif [ "$log_output" -eq 1 -a "$show_output" -eq 1 ]; then TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Tor Messenger" \ - -profile TorMessenger/Data/Browser/profile.default "${@}" 2>&1 </dev/null | \ + -profile TorBrowser/Data/Browser/profile.default "${@}" 2>&1 </dev/null | \ tee "$logfile" elif [ "$show_output" -eq 1 ]; then TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Tor Messenger" \ - -profile TorMessenger/Data/Browser/profile.default "${@}" < /dev/null + -profile TorBrowser/Data/Browser/profile.default "${@}" < /dev/null else TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Tor Messenger" \ - -profile TorMessenger/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null + -profile TorBrowser/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null fi exit $?

1 0

[tor-messenger-build/master] Update tor-messenger.nsi (set Browser directory)
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit c99394a243b435d4de14ffedc9a17cc61e965dde Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jul 8 19:14:22 2016 -0400 Update tor-messenger.nsi (set Browser directory) --- projects/tor-messenger/tor-messenger.nsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/tor-messenger/tor-messenger.nsi b/projects/tor-messenger/tor-messenger.nsi index eabe6f3..d0aede3 100644 --- a/projects/tor-messenger/tor-messenger.nsi +++ b/projects/tor-messenger/tor-messenger.nsi @@ -130,15 +130,15 @@ Section "Tor Messenger" SecTBB SetOutPath "$INSTDIR" File /r "${TBBSOURCE}\*.*" - SetOutPath "$INSTDIR\Messenger" - CreateShortCut "$INSTDIR\Start Tor Messenger.lnk" "$INSTDIR\Messenger\instantbird.exe" + SetOutPath "$INSTDIR\Browser" + CreateShortCut "$INSTDIR\Start Tor Messenger.lnk" "$INSTDIR\Browser\instantbird.exe" SectionEnd Function CreateShortcuts - CreateShortCut "$SMPROGRAMS\Start Tor Messenger.lnk" "$INSTDIR\Messenger\instantbird.exe" - CreateShortCut "$DESKTOP\Start Tor Messenger.lnk" "$INSTDIR\Messenger\instantbird.exe" + CreateShortCut "$SMPROGRAMS\Start Tor Messenger.lnk" "$INSTDIR\Browser\instantbird.exe" + CreateShortCut "$DESKTOP\Start Tor Messenger.lnk" "$INSTDIR\Browser\instantbird.exe" FunctionEnd ;--------------------------------

1 0

[tor-messenger-build/master] Bump Tor Launcher to 0.2.9.3
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit 478cb67bbf692c6a266d154929bcaf9912625798 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jul 8 19:15:56 2016 -0400 Bump Tor Launcher to 0.2.9.3 --- projects/tor-launcher/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 25c26b5..5b108b7 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.7.7 +version: 0.2.9.3 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: gk.gpg

1 0

[tor-messenger-build/master] Rebase patch for #9173
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit cb04c40fd39d9654eb2e2df7f05d169a354bb28c Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jul 8 15:42:45 2016 -0400 Rebase patch for #9173 --- ...e-the-default-Firefox-profile-director.mozpatch | 118 ++++++++++----------- 1 file changed, 57 insertions(+), 61 deletions(-) diff --git a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch index a0e76ea..4447c70 100644 --- a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch +++ b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch @@ -1,19 +1,14 @@ -From 64c1b7b7756ba9f68bb84a33d77ae8bd31a209c5 Mon Sep 17 00:00:00 2001 +From 48068e88b66ba37c725850331d099f10f9d34c90 Mon Sep 17 00:00:00 2001 From: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri, 18 Oct 2013 15:20:06 -0400 -Subject: [PATCH] Bug #9173: Change the default Firefox profile directory to be +Subject: Bug #9173: Change the default Firefox profile directory to be TBB-relative. -This should eliminate our need to rely on a wrapper script that sets $HOME and -launches Firefox with -profile. ---- - toolkit/xre/nsXREDirProvider.cpp | 161 +++++++-------------------------- - toolkit/xre/nsXREDirProvider.h | 10 +- - xpcom/io/moz.build | 4 + - xpcom/io/nsAppFileLocationProvider.cpp | 96 ++++++++------------ - 4 files changed, 79 insertions(+), 192 deletions(-) +This should eliminate our need to rely on a wrapper script that +sets $HOME and launches Firefox with -profile. diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp +index a828d33..831a373 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -32,6 +32,7 @@ @@ -24,7 +19,7 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp #include "mozilla/Services.h" #include "mozilla/Omnijar.h" #include "mozilla/Preferences.h" -@@ -200,9 +201,6 @@ nsXREDirProvider::GetUserProfilesRootDir +@@ -200,9 +201,6 @@ nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult, aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -34,7 +29,7 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -225,9 +223,6 @@ nsXREDirProvider::GetUserProfilesLocalDi +@@ -225,9 +223,6 @@ nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult, aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -73,7 +68,7 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp - nsCOMPtr<nsILocalFileMac> dirFileMac = do_QueryInterface(localDir); - NS_ENSURE_TRUE(dirFileMac, NS_ERROR_UNEXPECTED); -+ int levelsToRemove = 0; ++ int levelsToRemove = 0; // In FF21+, appDir points to browser subdirectory. +#if defined(XP_MACOSX) + levelsToRemove += 1; +#endif @@ -85,23 +80,12 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp + bool didRemove = !removedName.Equals("."); - rv = dirFileMac->InitWithFSRef(&fsRef); +- NS_ENSURE_SUCCESS(rv, rv); + // Remove a directory component. + nsCOMPtr<nsIFile> parentDir; + rv = localDir->GetParent(getter_AddRefs(parentDir)); + NS_ENSURE_SUCCESS(rv, rv); + localDir = parentDir; -+ -+ if (didRemove) -+ --levelsToRemove; -+ } -+ -+ if (!localDir) -+ return NS_ERROR_FAILURE; -+ -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" -+ XPCOM_FILE_PATH_SEPARATOR "Data" -+ XPCOM_FILE_PATH_SEPARATOR "Browser")); - NS_ENSURE_SUCCESS(rv, rv); - localDir = do_QueryInterface(dirFileMac, &rv); -#elif defined(XP_IOS) @@ -110,10 +94,7 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp - rv = NS_NewNativeLocalFile(userDir, true, getter_AddRefs(localDir)); - } else { - rv = NS_ERROR_FAILURE; -+ if (aLocal) { -+ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); -+ NS_ENSURE_SUCCESS(rv, rv); - } +- } - NS_ENSURE_SUCCESS(rv, rv); -#elif defined(XP_WIN) - nsString path; @@ -128,9 +109,11 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp - if (!aLocal) - rv = GetRegWindowsAppDataFolder(aLocal, path); - } -- } ++ if (didRemove) ++ --levelsToRemove; + } - NS_ENSURE_SUCCESS(rv, rv); -- + - rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir)); -#elif defined(MOZ_WIDGET_GONK) - rv = NS_NewNativeLocalFile(NS_LITERAL_CSTRING("/data/b2g"), true, @@ -138,13 +121,18 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -#elif defined(XP_UNIX) - const char* homeDir = getenv("HOME"); - if (!homeDir || !*homeDir) -- return NS_ERROR_FAILURE; -- ++ if (!localDir) + return NS_ERROR_FAILURE; + -#ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */ - aLocal = false; -#endif -- -- if (aLocal) { ++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorBrowser" ++ XPCOM_FILE_PATH_SEPARATOR "Data" ++ XPCOM_FILE_PATH_SEPARATOR "Browser")); ++ NS_ENSURE_SUCCESS(rv, rv); + + if (aLocal) { - // If $XDG_CACHE_HOME is defined use it, otherwise use $HOME/.cache. - const char* cacheHome = getenv("XDG_CACHE_HOME"); - if (cacheHome && *cacheHome) { @@ -159,14 +147,16 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp - } else { - rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, - getter_AddRefs(localDir)); -- } ++ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); ++ NS_ENSURE_SUCCESS(rv, rv); + } -#else -#error "Don't know how to get product dir on your platform" -#endif NS_IF_ADDREF(*aFile = localDir); return rv; -@@ -1541,48 +1491,25 @@ nsXREDirProvider::AppendProfilePath(nsIF +@@ -1541,48 +1491,25 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, } nsAutoCString profile; @@ -218,7 +208,7 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp #elif defined(ANDROID) // The directory used for storing profiles -@@ -1594,12 +1521,6 @@ nsXREDirProvider::AppendProfilePath(nsIF +@@ -1594,12 +1521,6 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, rv = aFile->AppendNative(nsDependentCString("mozilla")); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) @@ -231,7 +221,7 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp if (!profile.IsEmpty()) { // Skip any leading path characters const char* profileStart = profile.get(); -@@ -1608,31 +1529,17 @@ nsXREDirProvider::AppendProfilePath(nsIF +@@ -1608,31 +1529,17 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, // On the off chance that someone wanted their folder to be hidden don't // let it become ".." @@ -268,6 +258,7 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp #else #error "Don't know how to get profile path on your platform" diff --git a/toolkit/xre/nsXREDirProvider.h b/toolkit/xre/nsXREDirProvider.h +index eb27ed2..1985f66 100644 --- a/toolkit/xre/nsXREDirProvider.h +++ b/toolkit/xre/nsXREDirProvider.h @@ -56,16 +56,16 @@ public: @@ -302,18 +293,20 @@ diff --git a/toolkit/xre/nsXREDirProvider.h b/toolkit/xre/nsXREDirProvider.h static nsresult GetSystemExtensionsDirectory(nsIFile** aFile); #endif diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build +index 45732e4..bc62f71 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build -@@ -134,4 +134,8 @@ FINAL_LIBRARY = 'xul' +@@ -134,4 +134,7 @@ FINAL_LIBRARY = 'xul' if CONFIG['OS_ARCH'] == 'Linux' and 'lib64' in CONFIG['libdir']: DEFINES['HAVE_USR_LIB64_DIR'] = True +-LOCAL_INCLUDES += ['!..'] +LOCAL_INCLUDES += [ -+ '../build' ++ '!..', ++ '../build', +] -+ - LOCAL_INCLUDES += ['!..'] diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp +index 1211c39..039a89e 100644 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp @@ -15,6 +15,7 @@ @@ -324,19 +317,19 @@ diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocation #if defined(MOZ_WIDGET_COCOA) #include <Carbon/Carbon.h> -@@ -281,9 +282,8 @@ nsAppFileLocationProvider::CloneMozBinDi +@@ -281,9 +282,8 @@ nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) //---------------------------------------------------------------------------------------- // GetProductDirectory - Gets the directory which contains the application data folder // -// UNIX : ~/.mozilla/ -// WIN : <Application Data folder on user's machine>\Mozilla -// Mac : :Documents:Mozilla: -+// UNIX and WIN : <App Folder>/TorMessenger/Data/Browser -+// Mac : <App Folder>/../TorMessenger/Data/Browser ++// UNIX and WIN : <App Folder>/TorBrowser/Data/Browser ++// Mac : <App Folder>/../../TorBrowser/Data/Browser //---------------------------------------------------------------------------------------- NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, -@@ -297,48 +297,45 @@ nsAppFileLocationProvider::GetProductDir +@@ -297,48 +297,45 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, bool exists; nsCOMPtr<nsIFile> localDir; @@ -350,7 +343,7 @@ diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocation + rv = CloneMozBinDirectory(getter_AddRefs(localDir)); + NS_ENSURE_SUCCESS(rv, rv); + -+ int levelsToRemove = 0; ++ int levelsToRemove = 0; // In FF21+, bin dir points to browser subdirectory. +#if defined(XP_MACOSX) + levelsToRemove += 1; +#endif @@ -380,16 +373,7 @@ diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocation - rv = localDirMac->InitWithFSRef(&fsRef); - if (NS_FAILED(rv)) { - return rv; -+ -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" -+ XPCOM_FILE_PATH_SEPARATOR "Data" -+ XPCOM_FILE_PATH_SEPARATOR "Browser")); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (aLocal) { -+ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); -+ NS_ENSURE_SUCCESS(rv, rv); - } +- } -#elif defined(XP_WIN) - nsCOMPtr<nsIProperties> directoryService = - do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); @@ -414,11 +398,20 @@ diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocation - rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR); - if (NS_FAILED(rv)) { - return rv; -- } ++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorBrowser" ++ XPCOM_FILE_PATH_SEPARATOR "Data" ++ XPCOM_FILE_PATH_SEPARATOR "Browser")); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ if (aLocal) { ++ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); ++ NS_ENSURE_SUCCESS(rv, rv); + } ++ rv = localDir->Exists(&exists); if (NS_SUCCEEDED(rv) && !exists) { -@@ -357,10 +354,6 @@ nsAppFileLocationProvider::GetProductDir +@@ -357,10 +354,6 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, //---------------------------------------------------------------------------------------- // GetDefaultUserProfileRoot - Gets the directory which contains each user profile dir @@ -429,7 +422,7 @@ diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocation //---------------------------------------------------------------------------------------- NS_METHOD nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile, -@@ -378,23 +371,6 @@ nsAppFileLocationProvider::GetDefaultUse +@@ -378,23 +371,6 @@ nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile, return rv; } @@ -453,3 +446,6 @@ diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocation localDir.forget(aLocalFile); return rv; +-- +cgit v0.10.2 +

1 0

[tor-messenger-build/master] Remove redundant TorButton config options
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit 813b1c5ba350af93ff346477b31c79c33e818ee1 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 11 12:18:00 2016 -0400 Remove redundant TorButton config options --- projects/tor-messenger/start-tor-messenger | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/projects/tor-messenger/start-tor-messenger b/projects/tor-messenger/start-tor-messenger index ad0da4a..a1bbb05 100755 --- a/projects/tor-messenger/start-tor-messenger +++ b/projects/tor-messenger/start-tor-messenger @@ -310,25 +310,14 @@ EOF # TOR_CONTROL_PASSWD='"secret"' # # Yes, the variable MUST be double-quoted, then single-quoted, exactly as -# shown. This is used by TorButton and Tor Launcher to authenticate to Tor's -# ControlPort, and is necessary for using TB with a system-installed Tor. +# shown. This is used by Tor Launcher to authenticate to Tor's ControlPort, +# and is necessary for using TM with a system-installed Tor. # # Additionally, if using a system-installed Tor, the following about:config # options should be set (values in <> mean they are the value taken from your # torrc): # # SETTING NAME VALUE -# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> -# extensions.torbutton.block_disk false -# extensions.torbutton.custom.socks_host 127.0.0.1 -# extensions.torbutton.custom.socks_port <SocksPort> -# extensions.torbutton.inserted_button true -# extensions.torbutton.launch_warning false -# extensions.torbutton.loglevel 2 -# extensions.torbutton.logmethod 0 -# extensions.torbutton.settings_method custom -# extensions.torbutton.socks_port <SocksPort> -# extensions.torbutton.use_privoxy false # extensions.torlauncher.control_port <ControlPort> # extensions.torlauncher.loglevel 2 # extensions.torlauncher.logmethod 0

1 0