tbb-commits December 2018

tbb-commits@lists.torproject.org

2 participants
85 discussions

[tor-browser-build/maint-8.0] Update NoScript to version 10.2.1
by gk＠torproject.org 30 Dec '18

30 Dec '18

commit b35cea6792f294d0a625fde5595f1c96a8a2a72a Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 30 13:14:50 2018 +0000 Update NoScript to version 10.2.1 The NoScript update fixes #28873 and #28720 on our side. --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1a37ea1..3823552 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -71,9 +71,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 23c7783eecabeb044aa1e38c93d43ce7c41957b1ea031016d39737712729c81d + sha256sum: 3c16519f834863e74711950db386f326501a4bed79b55c24cc731df130443877 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Update NoScript to version 10.1.2
by gk＠torproject.org 30 Dec '18

30 Dec '18

commit b32e182633bba7733b635bc5dd0fcbd55436f4d7 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 30 13:14:50 2018 +0000 Update NoScript to version 10.1.2 The NoScript update fixes #28873 and #28720 on our side. --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 6199954..c4f25ff 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -89,9 +89,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 23c7783eecabeb044aa1e38c93d43ce7c41957b1ea031016d39737712729c81d + sha256sum: 3c16519f834863e74711950db386f326501a4bed79b55c24cc731df130443877 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Bug 28784: Pass --force --delete_unversioned_trees --reset to "gclient sync".
by gk＠torproject.org 20 Dec '18

20 Dec '18

commit 1b7e0de3690364bfdd29889676f5ff8ec6b1cd3b Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 20 03:17:25 2018 +0000 Bug 28784: Pass --force --delete_unversioned_trees --reset to "gclient sync". This is supposed to remove and reset modified or unversioned files. This ought to work around the problem with versioning of src/testing/gmock and src/testing/gtest across upgrades. $ gclient help sync -f, --force force update even for unchanged modules -D, --delete_unversioned_trees Deletes from the working copy any dependencies that have been removed since the last sync, as long as there are no local modifications. When used with --force, such dependencies are removed even if they have local modifications. When used with --reset, all untracked directories are removed from the working copy, excluding those which are explicitly ignored in the repository. -R, --reset resets any local changes before updating (git only) --- projects/webrtc/config | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/projects/webrtc/config b/projects/webrtc/config index 2955095..37b4615 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -102,11 +102,8 @@ steps: git config diff.ignoreSubmodules all cd .. fi - # Delete the unversioned gmock and gtest directories, which cause "gclient sync" - # to fail when upgrading between webrtc branch-heads/58 and branch-heads/64. - rm -rf src/testing/gmock src/testing/gtest # "gclient" is part of depot_tools. This download takes a long time the first time. - gclient sync --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] + gclient sync --force --delete_unversioned_trees --reset --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] cd .. tar --exclude .git -czf [% dest_dir _ '/' _ c('filename') %] webrtc input_files:

1 0

[tor-browser-build/master] Bug 28752: Don't download tor-android-binary resources during build
by gk＠torproject.org 19 Dec '18

19 Dec '18

commit 9b0b7b5159e670e04d5705350f33f8b2aa056634 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Dec 16 12:57:25 2018 -0800 Bug 28752: Don't download tor-android-binary resources during build --- projects/firefox/build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index da82862..b9d9d5a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -99,9 +99,14 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% IF c("var/android") %] export GRADLE_MAVEN_REPOSITORIES="file:///var/tmp/gradle-dependencies" + gradle_repo=/var/tmp/gradle-dependencies # Move Gradle Repo to hard-coded location. This location is embedded in the file # chrome/toolkit/content/global/buildconfig.html so needs to be standard for reproducibility - mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] /var/tmp/gradle-dependencies + mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo + # The download script assumes the artifact package name is the complete URL path. + # In some cases this is incorrect, so copy those artifacts to the correct location + cp -r $gradle_repo/guardianproject/gpmaven/master/* $gradle_repo + # Move orbot files so they will be included in the apk during the build cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app # Prepare building the multi-locale .apk mkdir -p /var/tmp/dist/locales

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640: Reload distribution preferences when a new version of the app is installed"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 8b78836cdad4d4b81f2b76c5ac4d62c42fda8049 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 19:59:33 2018 +0000 Revert "Bug 28640: Reload distribution preferences when a new version of the app is installed" This reverts commit 35d8c07dbf9a8f4e78a00513374d97267b90958c. --- .../base/java/org/mozilla/gecko/distribution/Distribution.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java index 93c325e451bd..ea9534bfd741 100644 --- a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java +++ b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java @@ -43,9 +43,7 @@ import org.mozilla.gecko.EventDispatcher; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoApplication; import org.mozilla.gecko.GeckoSharedPrefs; -import org.mozilla.gecko.preferences.DistroSharedPrefsImport; import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.preferences.GeckoPreferences; import org.mozilla.gecko.util.FileUtils; import org.mozilla.gecko.util.GeckoBundle; import org.mozilla.gecko.util.HardwareUtils; @@ -248,7 +246,6 @@ public class Distribution { final String preferencesJSON = FileUtils.readStringFromFile(descFile); data = new GeckoBundle(1); data.putString("preferences", preferencesJSON); - DistroSharedPrefsImport.importPreferences(distribution.context, distribution); } catch (IOException e) { Log.e(LOGTAG, "Error getting distribution descriptor file.", e); @@ -501,13 +498,6 @@ public class Distribution { // We've done the work once; don't do it again. if (this.state == STATE_SET) { - // If this is a new version of the app, then copy the - // distribution files from the APK - if (!AppConstants.MOZ_APP_BUILDID.equals(settings.getString(GeckoPreferences.PREFS_APP_UPDATE_LAST_BUILD_ID, null))) { - Log.i(LOGTAG, "Copying APK distribution file because the build ID changed."); - copyAndCheckAPKDistribution(); - } - // Note that we don't compute the distribution directory. // Call `ensureDistributionDir` if you need it. runReadyQueue();

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 28640 - Uninstall torbutton in the user profile on Android
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit b2148509da11c2f9188e609edbeca386880f61cc Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Nov 29 20:33:05 2018 +0000 Bug 28640 - Uninstall torbutton in the user profile on Android --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index ddd337038659..c9b01bdc7395 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1603,6 +1603,16 @@ var XPIStates = { for (let [id, file] of location.getAddonLocations(true)) { knownIds.delete(id); + // Uninstall torbutton if it is installed in the user profile on Android + if (AppConstants.platform === "android" && + id === "torbutton(a)torproject.org" && + location.name === KEY_APP_PROFILE) { + logger.debug("Uninstalling torbutton from user profile."); + location.uninstallAddon(id); + changed = true; + continue; + } + let xpiState = loc.get(id); if (!xpiState) { logger.debug("New add-on ${id} in ${location}", {id, location: location.name});

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 28640 - Reload distribution preferences on update
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 3c43ec1e862040767030bb5104c41265823ec8a5 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Nov 29 20:33:14 2018 +0000 Bug 28640 - Reload distribution preferences on update --- .../mozilla/gecko/distribution/Distribution.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java index ea9534bfd741..2e2d07d58914 100644 --- a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java +++ b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java @@ -43,7 +43,9 @@ import org.mozilla.gecko.EventDispatcher; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoApplication; import org.mozilla.gecko.GeckoSharedPrefs; +import org.mozilla.gecko.preferences.DistroSharedPrefsImport; import org.mozilla.gecko.Telemetry; +import org.mozilla.gecko.preferences.GeckoPreferences; import org.mozilla.gecko.util.FileUtils; import org.mozilla.gecko.util.GeckoBundle; import org.mozilla.gecko.util.HardwareUtils; @@ -247,6 +249,18 @@ public class Distribution { data = new GeckoBundle(1); data.putString("preferences", preferencesJSON); + // Only overwrite the current preferences if we upgraded. + // This isn't the best behavior because if the user + // changed one of the preferences, then this overwrites + // it. What we really want is a feature where we can + // set a new preference if the current value wasn't + // user-modified. This implementation doesn't support + // something like that. #28842 + final SharedPreferences settings = distribution.getSharedPreferences(); + if (!AppConstants.MOZ_APP_BUILDID.equals(settings.getString(GeckoPreferences.PREFS_APP_UPDATE_LAST_BUILD_ID, null))) { + DistroSharedPrefsImport.importPreferences(distribution.context, distribution); + } + } catch (IOException e) { Log.e(LOGTAG, "Error getting distribution descriptor file.", e); } @@ -498,6 +512,13 @@ public class Distribution { // We've done the work once; don't do it again. if (this.state == STATE_SET) { + // If this is a new version of the app, then copy the + // distribution files from the APK + if (!AppConstants.MOZ_APP_BUILDID.equals(settings.getString(GeckoPreferences.PREFS_APP_UPDATE_LAST_BUILD_ID, null))) { + Log.i(LOGTAG, "Copying APK distribution file because the build ID changed."); + copyAndCheckAPKDistribution(); + } + // Note that we don't compute the distribution directory. // Call `ensureDistributionDir` if you need it. runReadyQueue();

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640: Do not load Torbutton from the user's profile (only on Android)"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 394819bf1afed389183714579d3d7ebafea0c0c0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 19:58:24 2018 +0000 Revert "Bug 28640: Do not load Torbutton from the user's profile (only on Android)" This reverts commit 228b36c63fa089ce37d2713fc7b095dacdb9b338. --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 11 ----------- toolkit/mozapps/extensions/internal/moz.build | 5 +---- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 41391d2d6c51..ddd337038659 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1603,17 +1603,6 @@ var XPIStates = { for (let [id, file] of location.getAddonLocations(true)) { knownIds.delete(id); -#if defined(TOR_BROWSER_VERSION) && defined(ANDROID) - // Remove Torbutton if it is installed in the user profile - if (id === "torbutton(a)torproject.org" && - location.name === KEY_APP_PROFILE) { - logger.debug("Uninstalling Torbutton from user profile."); - location.uninstallAddon(id); - changed = true; - continue; - } -#endif - let xpiState = loc.get(id); if (!xpiState) { logger.debug("New add-on ${id} in ${location}", {id, location: location.name}); diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build index 32b75a5cef68..8661ef7125dd 100644 --- a/toolkit/mozapps/extensions/internal/moz.build +++ b/toolkit/mozapps/extensions/internal/moz.build @@ -15,11 +15,8 @@ EXTRA_JS_MODULES.addons += [ 'ProductAddonChecker.jsm', 'SpellCheckDictionaryBootstrap.js', 'XPIInstall.jsm', - 'XPIProviderUtils.js', -] - -EXTRA_PP_JS_MODULES.addons += [ 'XPIProvider.jsm', + 'XPIProviderUtils.js', ] TESTING_JS_MODULES += [

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640: Try showing the homepage after the distribution loads"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 955bb4e6e38b83a474600a112182ac64ed6aba56 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 20:04:06 2018 +0000 Revert "Bug 28640: Try showing the homepage after the distribution loads" This reverts commit ae00e455712e51453730ced526dc71dac9893344. --- .../base/java/org/mozilla/gecko/BrowserApp.java | 23 ---------------------- 1 file changed, 23 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 9330a6ba9838..814b46f24295 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3155,29 +3155,6 @@ public class BrowserApp extends GeckoApp // Don't show any onFinish actions when hiding from this Activity. mFirstrunAnimationContainer.registerOnFinishListener(null); mFirstrunAnimationContainer.hide(); - - // This is a little hacky, but this ensures about:tor (or whichever homepage - // is configured) shows when the user closes the FirstRun panels. - String homepageUrl = Tabs.getHomepage(BrowserApp.this); - - // If the homepage is already open in one of the tabs, then switch to that tab. - int homepage_index = Tabs.getInstance().isOpen(homepageUrl); - if (homepage_index != Tabs.INVALID_TAB_ID) { - Tabs.getInstance().selectTab(homepage_index); - return true; - } - - // Open in the currently selected tab by default - int tab_flags = Tabs.LOADURL_NONE; - - // If there's more than one tab open, then the user opened at least one of them. - // Don't modify their tabs and open a new tab for the homepage. - if (Tabs.getInstance().getDisplayCount() > 1) { - tab_flags = Tabs.LOADURL_NEW_TAB; - } - - Tabs.getInstance().loadUrl(homepageUrl, tab_flags); - return true; }

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640 - Push notifications are disabled, so don't clear them"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 0b36c3e8a59bf675ac6bd1ae36d38f16c4748884 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 20:05:58 2018 +0000 Revert "Bug 28640 - Push notifications are disabled, so don't clear them" This reverts commit 1d5d94a68d95f675c108f377a1b9e02ee16b15bb. --- mobile/android/modules/Sanitizer.jsm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/mobile/android/modules/Sanitizer.jsm b/mobile/android/modules/Sanitizer.jsm index 2940dd81b217..3782c92172f9 100644 --- a/mobile/android/modules/Sanitizer.jsm +++ b/mobile/android/modules/Sanitizer.jsm @@ -124,23 +124,18 @@ Sanitizer.prototype = { sss.clearAll(); // Clear push subscriptions - // Avoid throwing an error because nsIPushService isn't implemented yield new Promise((resolve, reject) => { - reject(new Error("Error clearing push subscriptions")); + let push = Cc["@mozilla.org/push/Service;1"] + .getService(Ci.nsIPushService); + push.clearForDomain("*", status => { + if (Components.isSuccessCode(status)) { + resolve(); + } else { + reject(new Error("Error clearing push subscriptions: " + + status)); + } + }); }); - - //yield new Promise((resolve, reject) => { - // let push = Cc["@mozilla.org/push/Service;1"] - // .getService(Ci.nsIPushService); - // push.clearForDomain("*", status => { - // if (Components.isSuccessCode(status)) { - // resolve(); - // } else { - // reject(new Error("Error clearing push subscriptions: " + - // status)); - // } - // }); - //}); TelemetryStopwatch.finish("FX_SANITIZE_SITESETTINGS", refObj); }),

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits December 2018