- tbb-commits - lists.torproject.org

[torbutton/maint-2.1] Bug 31616: Fix JIT related crashes on aarch64
by gk＠torproject.org 08 Sep '19

08 Sep '19

commit 7d292d774a3605673c912b2d3a248b95c6fabcb1 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 7 20:19:56 2019 +0000 Bug 31616: Fix JIT related crashes on aarch64 Patch by sysrqb. --- src/modules/security-prefs.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index fb465a05..a0a4ad4d 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -47,9 +47,11 @@ const kCustomPref = "extensions.torbutton.security_custom"; var write_setting_to_prefs = function (settingIndex) { Object.keys(kSecuritySettings).forEach( prefName => { - // Bug 31140 - Do not enable IonMonkey on AARCH64. + // Bug 31140 and 31616 - Do not enable JIT on aarch64. if (XPCOMABI.split("-")[0] == "aarch64" && - prefName == "javascript.options.ion") { + (prefName == "javascript.options.ion" || + prefName == "javascript.options.baselinejit" || + prefName == "javascript.options.native_regexp")) { setBoolPref(prefName, false); return; }

1 0

[torbutton/master] Bug 31562: Fix circuit display for error pages
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit bb975009a65ab9039641d03b11023fe6c52f5b7a Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Sep 5 17:56:08 2019 +0200 Bug 31562: Fix circuit display for error pages --- chrome/content/torbutton.js | 2 +- modules/utils.js | 49 +++++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 9d6a5c48..94206ea5 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -850,7 +850,7 @@ function torbutton_send_ctrl_cmd(command) { // Bug 1506 P4: Needed for New IP Address function torbutton_new_circuit() { - let firstPartyDomain = getDomainForBrowser(gBrowser); + let firstPartyDomain = getDomainForBrowser(gBrowser.selectedBrowser); let domainIsolator = Cc["@torproject.org/domain-isolator;1"] .getService(Ci.nsISupports).wrappedJSObject; diff --git a/modules/utils.js b/modules/utils.js index ea41fce9..0caf475f 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -4,9 +4,6 @@ // ### Import Mozilla Services const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -// ### About firstPartyDomain literal -const k_tb_about_uri_first_party_domain = "about.ef2a7dd5-93bc-417f-a698-142c3116864f.mozilla"; - // ## Pref utils // __prefs__. A shortcut to Mozilla Services.prefs. @@ -212,30 +209,34 @@ var show_torbrowser_manual = () => { return availableLocales.indexOf(shortLocale) >= 0; } +var getFPDFromHost = (hostname) => { + try { + return Services.eTLD.getBaseDomainFromHost(hostname); + } catch (e) { + if (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS || + e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS) { + return hostname; + } + } + return null; +} + +// Assuming this is called with gBrowser.selectedBrowser var getDomainForBrowser = (browser) => { - let firstPartyDomain = browser.contentPrincipal.originAttributes.firstPartyDomain; - // Bug 22538: For neterror or certerror, get firstPartyDomain causing it from the u param - if (firstPartyDomain === k_tb_about_uri_first_party_domain) { - let knownErrors = ["about:neterror", "about:certerror"]; - let origin = browser.contentPrincipal.origin || ''; - if (knownErrors.some(x => origin.startsWith(x))) { - try { - let urlOrigin = new URL(origin); - let { hostname } = new URL(urlOrigin.searchParams.get('u')); - if (hostname) { - try { - firstPartyDomain = Services.eTLD.getBaseDomainFromHost(hostname); - } catch (e) { - if (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS || - e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS) { - firstPartyDomain = hostname; - } - } - } - } catch (e) {} + let fpd = browser.contentPrincipal.originAttributes.firstPartyDomain; + // Bug 31562: For neterror or certerror, get the original URL from + // browser.currentURI and use it to calculate the firstPartyDomain. + let knownErrors = ["about:neterror", "about:certerror"]; + let documentURI = browser.documentURI; + if (documentURI && documentURI.schemeIs('about') && + knownErrors.some(x => documentURI.spec.startsWith(x))) { + let knownSchemes = ["http", "https", "ftp"]; + let currentURI = browser.currentURI; + if (currentURI && knownSchemes.some(x => currentURI.schemeIs(x))) { + fpd = getFPDFromHost(currentURI.host) || fpd; } } - return firstPartyDomain; + return fpd; }; // Export utility functions for external use.

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31457: disable per-installation profiles
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 31d00e2f9c23184c2378d125c11a4e1219a8b59e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Sep 4 08:23:19 2019 -0400 Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. --- browser/moz.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/moz.configure b/browser/moz.configure index 3057a5040c5f..43bc0c1fe59b 100644 --- a/browser/moz.configure +++ b/browser/moz.configure @@ -7,7 +7,7 @@ imply_option('MOZ_PLACES', True) imply_option('MOZ_SERVICES_HEALTHREPORT', True) imply_option('MOZ_SERVICES_SYNC', True) -imply_option('MOZ_DEDICATED_PROFILES', True) +imply_option('MOZ_DEDICATED_PROFILES', False) imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) with only_when(target_is_linux & compile_environment):

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Pick up Torbutton changes for onboarding
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 936ea93a3e8dc9846c2e738096a3ad8a0fe90325 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 6 10:02:40 2019 +0000 Pick up Torbutton changes for onboarding --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 1edfec57049a..d796dd27d128 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 1edfec57049a76052fda8eb17b6e3b8f281e3361 +Subproject commit d796dd27d12850bd176a85e160002755bfccfab2

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 28822: Convert onboarding to webextension
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit b4e8db514df16856b567be1e13cb9af11a7de6e5 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 12:06:24 2019 +0200 fixup! Bug 28822: Convert onboarding to webextension --- browser/extensions/onboarding/content/Onboarding.jsm | 2 +- extensions/permissions/nsPermissionManager.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 33777dd27d6e..059701f78960 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -8,7 +8,7 @@ var EXPORTED_SYMBOLS = ["Onboarding"]; -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const ONBOARDING_CSS_URL = "resource://onboarding/onboarding.css"; const TORBUTTON_BUNDLE_URI = "chrome://torbutton/locale/browserOnboarding.properties"; diff --git a/extensions/permissions/nsPermissionManager.cpp b/extensions/permissions/nsPermissionManager.cpp index 1a652bef4222..2e23d48623e8 100644 --- a/extensions/permissions/nsPermissionManager.cpp +++ b/extensions/permissions/nsPermissionManager.cpp @@ -125,6 +125,9 @@ static const nsLiteralCString kPreloadPermissions[] = { NS_LITERAL_CSTRING("cookie"), NS_LITERAL_CSTRING("trackingprotection"), NS_LITERAL_CSTRING("trackingprotection-pb"), + // Bug 28822: Make sure uitour permissions are preloaded in content processes. + NS_LITERAL_CSTRING("uitour"), + USER_INTERACTION_PERM}; // NOTE: nullptr can be passed as aType - if it is this function will return

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 29768: Introduce new features to users
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 535d41fd820d5b94caf43f3e403dc74b3566c837 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 11:45:55 2019 +0200 fixup! Bug 29768: Introduce new features to users Fixes bug 30560 --- .../content/img/figure_tor-security-level.png | Bin 10888 -> 11263 bytes .../content/img/figure_tor-toolbar-layout.png | Bin 5837 -> 10569 bytes .../extensions/onboarding/content/onboarding.css | 8 ++------ 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/browser/extensions/onboarding/content/img/figure_tor-security-level.png b/browser/extensions/onboarding/content/img/figure_tor-security-level.png index 4f940ea008ef..9a5c221c8d8e 100644 Binary files a/browser/extensions/onboarding/content/img/figure_tor-security-level.png and b/browser/extensions/onboarding/content/img/figure_tor-security-level.png differ diff --git a/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png b/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png index 0a8161087827..624ef6514d39 100644 Binary files a/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png and b/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png differ diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index 7373e0da53fc..f71ec1d13789 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -27,7 +27,7 @@ padding: 16px 0 0 0; position: fixed; top: 4px; - offset-inline-start: 12px; + inset-inline-start: 12px; } /* @@ -41,7 +41,7 @@ width: 20px; height: 20px; top: -8px; - offset-inline-start: -16px; + inset-inline-start: -16px; background-color: #00E2B1; border-radius: 50%; animation: pulsate 2.0s ease-out; @@ -61,11 +61,7 @@ } #onboarding-overlay-button { - padding: 10px 0 0 0; - position: fixed; cursor: pointer; - top: 4px; - inset-inline-start: 12px; border: none; /* Set to none so no grey contrast background in the high-contrast mode */ background: none;

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 26962 - implement new features onboarding (part 1).
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 915d521a2fae009509a229bdaeb1d3a95a17b8c1 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 12:12:18 2019 +0200 fixup! Bug 26962 - implement new features onboarding (part 1). --- browser/app/permissions | 2 -- browser/themes/shared/UITour.inc.css | 1 - 2 files changed, 3 deletions(-) diff --git a/browser/app/permissions b/browser/app/permissions index c9feba65b69f..fa17e78db211 100644 --- a/browser/app/permissions +++ b/browser/app/permissions @@ -9,8 +9,6 @@ # UITour # DuckDuckGo .onion (used for circuit display onboarding). origin uitour 1 https://3g2upl4pq6kufc4m.onion -origin uitour 1 about:home -origin uitour 1 about:newtab origin uitour 1 about:tor # Remote troubleshooting diff --git a/browser/themes/shared/UITour.inc.css b/browser/themes/shared/UITour.inc.css index bfc782c68c5f..235e4d898e78 100644 --- a/browser/themes/shared/UITour.inc.css +++ b/browser/themes/shared/UITour.inc.css @@ -132,7 +132,6 @@ padding-right: 10px; } -/* The primary button gets the same color as the customize button. */ #UITourTooltipButtons > button.button-primary { background-color: #420C5D; color: white;

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs"
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 5d0ffb6cea1e3eca56884f087120f2b40aa2926b Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 12:48:36 2019 +0200 Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs" This reverts commit 057fe36fc6f3e93e265505c7dcc703a0941778e2. --- browser/components/BrowserGlue.jsm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 7503ca7037e6..a99a29a014ad 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -3086,17 +3086,6 @@ BrowserGlue.prototype = { ); } - if (currentUIVersion < 76) { - // Clear old onboarding prefs from profile (bug 1462415) - let onboardingPrefs = Services.prefs.getBranch("browser.onboarding."); - if (onboardingPrefs) { - let onboardingPrefsArray = onboardingPrefs.getChildList(""); - for (let item of onboardingPrefsArray) { - Services.prefs.clearUserPref("browser.onboarding." + item); - } - } - } - if (currentUIVersion < 77) { // Remove currentset from all the toolbars let toolbars = [

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 26961: New user onboarding.
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit e1ad91f3031dd08a0591d0f9d472cb49e015ad75 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 12:20:00 2019 +0200 fixup! Bug 26961: New user onboarding. --- browser/components/uitour/UITour.jsm | 2 +- browser/extensions/onboarding/api.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm index 6eba73a8f51a..2a4c81d69374 100644 --- a/browser/components/uitour/UITour.jsm +++ b/browser/components/uitour/UITour.jsm @@ -789,7 +789,7 @@ var UITour = { let securityLevelButton = window.document.getElementById("security-level-button"); if (securityLevelButton) - securityLevelButton.doCommand(); + securityLevelButton.click(); break; } diff --git a/browser/extensions/onboarding/api.js b/browser/extensions/onboarding/api.js index db10a6d16248..d11e525b9f8c 100644 --- a/browser/extensions/onboarding/api.js +++ b/browser/extensions/onboarding/api.js @@ -8,7 +8,6 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { OnboardingTourType: "resource://onboarding/modules/OnboardingTourType.jsm", - OnboardingTelemetry: "resource://onboarding/modules/OnboardingTelemetry.jsm", Services: "resource://gre/modules/Services.jsm", UIState: "resource://services-sync/UIState.jsm", });

1 0

[torbutton/master] Bug 28822: Change about:tor CSP so that UITour-lib.js can be loaded
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit d796dd27d12850bd176a85e160002755bfccfab2 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 3 13:09:35 2019 +0200 Bug 28822: Change about:tor CSP so that UITour-lib.js can be loaded --- chrome/content/aboutTor/aboutTor.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index 80716e5f..b146fb1b 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -20,7 +20,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <meta http-equiv="Content-Security-Policy" content="default-src chrome: resource:; script-src chrome: 'unsafe-inline';" /> + <meta http-equiv="Content-Security-Policy" content="default-src chrome: resource:; script-src chrome: resource: 'unsafe-inline';" /> <meta name="viewport" content="width=device-width, initial-scale=1"/> <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all"

1 0

[tor-browser-build/master] Bug 30384: Use 64bit containers to build 32bit Windows Tor Browser
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 34626bda99acdcc94d45e7095313d6d3882cdd32 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 30 18:45:23 2019 +0200 Bug 30384: Use 64bit containers to build 32bit Windows Tor Browser --- projects/cbindgen/build | 9 ++------- projects/debootstrap-image/config | 7 ------- projects/firefox/build | 5 +---- projects/firefox/config | 6 +++++- projects/firefox/mozconfig-windows-i686 | 3 --- projects/gcc/build | 1 - projects/gcc/config | 1 - projects/go/build | 1 - projects/go/config | 1 - projects/mingw-w64-clang/build | 4 +--- projects/mingw-w64/config | 1 - projects/rust/build | 3 +-- projects/rust/config | 5 +---- projects/webrtc/build | 1 - rbm.conf | 14 ++------------ 15 files changed, 13 insertions(+), 49 deletions(-) diff --git a/projects/cbindgen/build b/projects/cbindgen/build index 402a216..429f567 100644 --- a/projects/cbindgen/build +++ b/projects/cbindgen/build @@ -22,13 +22,8 @@ replace-with = "vendored-sources" directory = "/var/tmp/build/cbindgen/vendor" EOF -[% IF ! c("var/windows-i686") -%] - target=x86_64 -[% ELSE -%] - target=i686 -[% END -%] -cargo build --release --frozen --target $target-unknown-linux-gnu -mv target/$target-unknown-linux-gnu/release/cbindgen $distdir/[% project %] +cargo build --release --frozen --target x86_64-unknown-linux-gnu +mv target/x86_64-unknown-linux-gnu/release/cbindgen $distdir/[% project %] cd $distdir [% c('tar', { diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index cad9c77..a50cbf1 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -65,13 +65,6 @@ targets: suite: stretch arch: amd64 - stretch-i386: - var: - minimal_apt_version: 1.4.9 - container: - suite: stretch - arch: i386 - input_files: - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' diff --git a/projects/firefox/build b/projects/firefox/build index 1450576..87f8532 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -1,5 +1,4 @@ #!/bin/bash -[% c("var/setarch") -%] [% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] @@ -11,9 +10,7 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/fxc2') %] export PATH="/var/tmp/dist/fxc2/bin:$PATH" # fxc2 requires Wine. - [% IF c("var/windows-x86_64") %] - export WINEARCH=win64 - [% END %] + export WINEARCH=[% IF c("var/windows-x86_64") %]win64[% ELSE %]win32[% END %] export HOME=/var/tmp/home mkdir -p $HOME WINEROOT=$HOME/.wine/drive_c diff --git a/projects/firefox/config b/projects/firefox/config index b13635c..334a1a8 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -111,11 +111,15 @@ targets: arch_deps: - wine pre_pkginst: | + [% IF c("var/windows-i686") -%] + # We need this to install wine32 + dpkg --add-architecture i386 + [% END -%] echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list post_pkginst: | # We need to have at least 3.0.3 which Mozilla is using in the # mingw-w64/clang build process - apt-get -y -t stretch-backports install wine + apt-get -y -t stretch-backports install wine[% IF c("var/windows-i686") %]32[% END %] compiler: mingw-w64-clang windows-i686: diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 5538bc1..eaa704f 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -24,9 +24,6 @@ export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug -# Until we build on a 64bit host we need to hack around linker errors due to -# memory constraints -ac_add_options --disable-debug-symbols ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --enable-official-branding diff --git a/projects/gcc/build b/projects/gcc/build index 1d055b4..bd7e837 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -1,6 +1,5 @@ #!/bin/sh [% c("var/set_default_env") -%] -[% c("var/setarch") -%] [% IF c("var/linux") -%] # Config options for hardening-wrapper export DEB_BUILD_HARDENING=1 diff --git a/projects/gcc/config b/projects/gcc/config index 9fef3c4..d776a2c 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -8,7 +8,6 @@ var: - build-essential - libmpc-dev setup: | - [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/gcc/bin:$PATH" diff --git a/projects/go/build b/projects/go/build index b9057a5..4945c88 100644 --- a/projects/go/build +++ b/projects/go/build @@ -1,6 +1,5 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% c("var/setarch") -%] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist diff --git a/projects/go/config b/projects/go/config index fd96bb6..ffe07ea 100644 --- a/projects/go/config +++ b/projects/go/config @@ -8,7 +8,6 @@ var: use_container: 1 setup: | - [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("go_tarfile") %] export GOOS=[% c("var/GOOS") %] diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 820346d..b63a87f 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -24,9 +24,7 @@ tar -xf $rootdir/[% c('input_files_by_name/llvm-mingw') %] # Adding the wrappers and symlinks we need cd $distdir/bin exception_flags="" -target="" [% IF c("var/windows-i686") %] - target="--target=i686-linux-gnu" exception_flags="-fsjlj-exceptions" [% END -%] compiler_flags="--sysroot \$DIR/../[% c("arch") %]-w64-mingw32 -rtlib=compiler-rt -stdlib=libc++ -fuse-ld=lld $exception_flags -fuse-cxa-atexit -Qunused-arguments" @@ -49,7 +47,7 @@ ln -s llvm-nm [% c("arch") %]-w64-mingw32-nm ln -s llvm-strip [% c("arch") %]-w64-mingw32-strip ln -s llvm-readobj [% c("arch") %]-w64-mingw32-readobj ln -s llvm-objcopy [% c("arch") %]-w64-mingw32-objcopy -./clang $builddir/llvm-mingw/wrappers/windres-wrapper.c $target -O2 -Wl,-s -o [% c("arch") %]-w64-mingw32-windres +./clang $builddir/llvm-mingw/wrappers/windres-wrapper.c -O2 -Wl,-s -o [% c("arch") %]-w64-mingw32-windres # Building mingw-w64 export PATH="$distdir/bin:/var/tmp/dist/cmake/bin:$PATH" diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 3bb1dda..658c83d 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -12,7 +12,6 @@ var: - build-essential - libmpc-dev setup: | - [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/mingw-w64/bin:$PATH" diff --git a/projects/rust/build b/projects/rust/build index ce039ea..9a6b54a 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -1,12 +1,11 @@ #!/bin/bash -[% c('var/setarch') %] [% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir -p $distdir tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] -cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('var/rust_arch') %]-unknown-linux-gnu +cd /var/tmp/dist/rust-[% c('var/prev_version') %]-x86_64-unknown-linux-gnu ./install.sh --prefix=$distdir-rust-old export PATH="$distdir-rust-old/bin:$PATH" diff --git a/projects/rust/config b/projects/rust/config index 106c709..dbde815 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -4,14 +4,12 @@ version: 1.34.2 var: prev_version: 1.33.0 - rust_arch: '[% c("arch") %]' container: use_container: 1 targets: android: var: - rust_arch: x86_64 arch_deps: - libssl-dev - pkg-config @@ -30,7 +28,6 @@ targets: linux: var: - rust_arch: x86_64 deps: - libc6-dev-i386 - lib32stdc++6 @@ -98,7 +95,7 @@ input_files: sig_ext: asc file_gpg_id: 1 gpg_keyring: rust.gpg - - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-[% c("var/rust_arch") %]-unknown-linux-gnu.tar.xz' + - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-x86_64-unknown-linux-gnu.tar.xz' name: prev_rust sig_ext: asc file_gpg_id: 1 diff --git a/projects/webrtc/build b/projects/webrtc/build index 77d4026..2ede64b 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -1,7 +1,6 @@ #!/bin/bash set -e [% c("var/set_default_env") -%] -[% c("var/setarch") -%] distdir=/var/tmp/dist/[% project %] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] diff --git a/rbm.conf b/rbm.conf index 967eb08..581bd0e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -280,9 +280,6 @@ targets: var: windows-x86_64: 1 osname: windows-x86_64 - container: - arch: amd64 - faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 # HEASLR is 64 bit only (see bug 12968) flag_HEASLR: '-Wl,--high-entropy-va' windows-i686: @@ -290,25 +287,18 @@ targets: var: windows-i686: 1 osname: windows-i686 - container: - arch: i386 - faketime_path: /usr/lib/i386-linux-gnu/faketime/libfaketime.so.1 - setarch: | - if test -z "$RBM_SETARCH" - then - export RBM_SETARCH=1 - exec setarch i686 ./build - fi windows: var: windows: 1 container: suite: stretch + arch: amd64 configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' compiler: mingw-w64 + faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 deps: - build-essential - python

1 0

[tor-browser-build/master] Fold in stable Changelog
by gk＠torproject.org 05 Sep '19

05 Sep '19

commit 21a73d6109f1e1f68b2dc9f7f2ca4a5922bcdd0a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 5 13:37:46 2019 +0000 Fold in stable Changelog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index bd20859..2cf1c5a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -85,6 +85,30 @@ Tor Browser 9.0a6 -- September 4 2019 * Bug 30461: Update tor-android-service project to use Firefox 68 toolchain * Bug 28753: Use Gradle with --offline when building the browser part +Tor Browser 8.5.5 -- September 3 2019 + * All platforms + * Update Firefox to 60.9.0esr + * Update Torbutton to 2.1.13 + * Bug 31520: Remove monthly giving banner from Tor Browser + * Bug 31140: Do not enable IonMonkey on AARCH64 + * Translations update + * Update NoScript to 11.0.3 + * Bug 26847: NoScript pops up a full-site window for XSS warning + * Bug 31287: NoScript leaks browser locale + * Bug 31357: Retire Tom's default obfs4 bridge + * Windows + OS X + Linux + * Update Tor to 0.4.1.5 + * Windows + * Bug 31547: Back out patch for Mozilla's bug 1574980 + * Bug 27503: Provide full support for accessibility tools + * Bug 30575: Don't allow enterprise policies in Tor Browser + * Bug 31141: Fix typo in font.system.whitelist + * Android + * Bug 28119: Tor Browser for aarch64 + * Build System + * All platforms + * Bug 31465: Bump Go to 1.12.9 + Tor Browser 9.0a5 -- July 31 2019 * Android * Bug 31260: Backport bug 1477259 for aarch64 support on Google Play

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Pick up fix for #31598
by gk＠torproject.org 05 Sep '19

05 Sep '19

commit a327f24b9b730258da19c37e7d09ad52b7cc2e9f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 5 07:19:36 2019 +0000 Pick up fix for #31598 --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 0efb110e9bc6..1edfec57049a 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 0efb110e9bc65e3289c58d093c32a25877f61e0b +Subproject commit 1edfec57049a76052fda8eb17b6e3b8f281e3361

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 05 Sep '19

05 Sep '19

commit f19b6946fcccb42b3b060c5ecf53ba8ec524b420 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 3 12:13:01 2019 +0200 squash! TB4: Tor Browser's Firefox preference overrides. Bug 31598: Enable letterboxing --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6c2d2476e1b3..81352dcbaece 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -161,6 +161,8 @@ pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authenticati pref("browser.cache.frecency_experiment", -1); // Bug 2874: Block Components.interfaces from content pref("dom.use_components_shim", false); +// Enable letterboxing +pref("privacy.resistFingerprinting.letterboxing", true); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[torbutton/master] Bug 31598: Disable warning on window resize if letterboxing is enabled
by gk＠torproject.org 05 Sep '19

05 Sep '19

commit 1edfec57049a76052fda8eb17b6e3b8f281e3361 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 4 11:38:45 2019 +0200 Bug 31598: Disable warning on window resize if letterboxing is enabled --- chrome/content/torbutton.js | 14 ++++++++------ defaults/preferences/preferences.js | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 6209b6b8..9d6a5c48 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -92,6 +92,7 @@ var torbutton_unique_pref_observer = m_tb_prefs.addObserver("plugin.disable", this, false); m_tb_prefs.addObserver("privacy.firstparty.isolate", this, false); m_tb_prefs.addObserver("privacy.resistFingerprinting", this, false); + m_tb_prefs.addObserver("privacy.resistFingerprinting.letterboxing", this, false); // We observe xpcom-category-entry-added for plugins w/ Gecko-Content-Viewers var observerService = Services.obs; @@ -107,6 +108,7 @@ var torbutton_unique_pref_observer = m_tb_prefs.removeObserver("plugin.disable", this); m_tb_prefs.removeObserver("privacy.firstparty.isolate", this); m_tb_prefs.removeObserver("privacy.resistFingerprinting", this); + m_tb_prefs.removeObserver("privacy.resistFingerprinting.letterboxing", this); var observerService = Services.obs; observerService.removeObserver(this, "xpcom-category-entry-added"); @@ -156,6 +158,7 @@ var torbutton_unique_pref_observer = torbutton_use_nontor_proxy(); break; case "privacy.resistFingerprinting": + case "privacy.resistFingerprinting.letterboxing": torbutton_update_fingerprinting_prefs(); break; case "privacy.firstparty.isolate": @@ -1508,14 +1511,14 @@ function torbutton_update_disk_prefs() { function torbutton_update_fingerprinting_prefs() { var mode = m_tb_prefs.getBoolPref("privacy.resistFingerprinting"); + var letterboxing = m_tb_prefs.getBoolPref("privacy.resistFingerprinting.letterboxing", false); m_tb_prefs.setBoolPref("webgl.disable-extensions", mode); m_tb_prefs.setBoolPref("dom.network.enabled", !mode); m_tb_prefs.setBoolPref("dom.enable_performance", !mode); m_tb_prefs.setBoolPref("plugin.expose_full_path", !mode); m_tb_prefs.setBoolPref("browser.zoom.siteSpecific", !mode); - - m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode); + m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode && !letterboxing); // Force prefs to be synced to disk Services.prefs.savePrefFile(null); @@ -1915,8 +1918,7 @@ function torbutton_new_window(event) let progress = Cc["@mozilla.org/docloaderservice;1"] .getService(Ci.nsIWebProgress); - if (m_tb_prefs.getBoolPref("extensions.torbutton.resize_new_windows") - && torbutton_is_windowed(window)) { + if (torbutton_is_windowed(window)) { progress.addProgressListener(torbutton_resizelistener, Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); } @@ -1999,8 +2001,8 @@ var torbutton_resizelistener = await new Promise(resolve => setTimeout(resolve, 0)); if (window.windowState === window.STATE_MAXIMIZED || window.windowState === window.STATE_FULLSCREEN) { - if (m_tb_prefs. - getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) { + if (m_tb_prefs.getBoolPref("extensions.torbutton.resize_new_windows") && + m_tb_prefs.getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) { // Do not add another notification if one is already showing. const kNotificationName = "torbutton-maximize-notification"; diff --git a/defaults/preferences/preferences.js b/defaults/preferences/preferences.js index e5d66d55..acea0a3d 100644 --- a/defaults/preferences/preferences.js +++ b/defaults/preferences/preferences.js @@ -30,7 +30,7 @@ pref("extensions.torbutton.cookie_protections",true); pref("extensions.torbutton.cookie_auto_protect",false); pref("extensions.torbutton.clear_http_auth",true); pref("extensions.torbutton.close_newnym",true); -pref("extensions.torbutton.resize_new_windows",true); +pref("extensions.torbutton.resize_new_windows",false); pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last pref("extensions.torbutton.tor_memory_jar",false); pref("extensions.torbutton.nontor_memory_jar",false);

1 0

[tor-browser-spec/master] Bug 31606: Don't update Tor Browser release date on the website
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit 44866943861e1da1959c06e711c8be4b222eee91 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 3 14:05:14 2019 +0200 Bug 31606: Don't update Tor Browser release date on the website The new website does not include the Tor Browser release date, so there is no need to update it. --- processes/ReleaseProcess | 1 - 1 file changed, 1 deletion(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index a358959..41e268d 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -144,7 +144,6 @@ torsocks git pull origin # Update `version-win32-stable` as well if we include a new stable tor # version. See: #14152. - # Update the release date (via releasedate-torbrowserbundle*). See: #8968. # In the RecommendedTBBVersions file, only add the new version. Don't # remove the old one yet. That comes later. vim databags/versions.ini content/projects/torbrowser/RecommendedTBBVersions/contents.lr

1 0

[tor-browser-spec/master] Bug 31606: Fix instructions for updating the Windows Expert Bundle version
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit 23c956584436ec12795af873aef02a700d49cf20 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 3 14:09:11 2019 +0200 Bug 31606: Fix instructions for updating the Windows Expert Bundle version --- processes/ReleaseProcess | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 41e268d..c183c9a 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -142,8 +142,9 @@ #. Update website's torbrowser versions file in the website git cd tpo torsocks git pull origin - # Update `version-win32-stable` as well if we include a new stable tor - # version. See: #14152. + # Update `win32` in the `torbrowser-stable` section as well if we + # include a new stable tor version (called the Windows Expert Bundle + # on the website). See: #14152. # In the RecommendedTBBVersions file, only add the new version. Don't # remove the old one yet. That comes later. vim databags/versions.ini content/projects/torbrowser/RecommendedTBBVersions/contents.lr

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 1330467 - part 7. Confirm FPI in permission manager tests; r=Ehsan
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit a8c2fe1a361abb926e6dbbce91940a1c56b0b9bf Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 3 09:41:37 2019 +0200 fixup! Bug 1330467 - part 7. Confirm FPI in permission manager tests; r=Ehsan --- extensions/permissions/test/unit/test_permmanager_defaults.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/permissions/test/unit/test_permmanager_defaults.js b/extensions/permissions/test/unit/test_permmanager_defaults.js index cfd42f49e92a..c586982a133c 100644 --- a/extensions/permissions/test/unit/test_permmanager_defaults.js +++ b/extensions/permissions/test/unit/test_permmanager_defaults.js @@ -156,11 +156,12 @@ add_task(async function do_test() { Ci.nsIPermissionManager.ALLOW_ACTION, pm.testPermissionFromPrincipal(principal4, TEST_PERMISSION) ); - // make sure principals with a firstPartyDomain use different permissions + // make sure principals with userContextId use the same permissions Assert.equal( Ci.nsIPermissionManager.ALLOW_ACTION, pm.testPermissionFromPrincipal(principal6, TEST_PERMISSION) ); + // make sure principals with a firstPartyDomain use different permissions Assert.equal( Ci.nsIPermissionManager.UNKNOWN_ACTION, pm.testPermissionFromPrincipal(principal7, TEST_PERMISSION)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit 5b5b014217a2df562ea4551ae68d0bc267cedf97 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 3 09:12:56 2019 +0200 squash! TB4: Tor Browser's Firefox preference overrides. Bug 31065: Explicitly allow proxying localhost --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0d84455051e5..6c2d2476e1b3 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -173,6 +173,7 @@ pref("network.proxy.socks", "127.0.0.1"); pref("network.proxy.socks_port", 9150); pref("network.proxy.socks_remote_dns", true); pref("network.proxy.no_proxies_on", ""); // For fingerprinting and local service vulns (#10419) +pref("network.proxy.allow_hijacking_localhost", true); // Allow proxies for localhost (#31065) pref("network.proxy.type", 1); pref("network.security.ports.banned", "9050,9051,9150,9151"); pref("network.dns.disablePrefetch", true);

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1560574 - use FormatPRExplodedTime to display GMT; r=kershaw
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit a2e76dee549c9efb60bfa13c0e6e4e5f8b5edd76 Author: Liang-Heng Chen <xeonchen(a)gmail.com> Date: Tue Aug 20 14:00:31 2019 +0000 Bug 1560574 - use FormatPRExplodedTime to display GMT; r=kershaw Differential Revision: https://phabricator.services.mozilla.com/D36502 --HG-- extra : moz-landing-system : lando --- .../streamconv/converters/nsFTPDirListingConv.cpp | 2 +- netwerk/streamconv/converters/nsIndexedToHTML.cpp | 25 +++++++++++--- netwerk/test/unit/test_bug365133.js | 16 ++++----- netwerk/test/unit/test_bug484684.js | 40 +++++++++++----------- netwerk/test/unit/test_bug515583.js | 4 +-- netwerk/test/unit/test_bug543805.js | 24 ++++++------- 6 files changed, 64 insertions(+), 47 deletions(-) diff --git a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp index af0093fd5c6c..b721016afd8f 100644 --- a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp +++ b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp @@ -294,7 +294,7 @@ char* nsFTPDirListingConv::DigestBufferLines(char* aBuffer, // the application/http-index-format specs // viewers of such a format can then reformat this into the // current locale (or anything else they choose) - PR_FormatTimeUSEnglish(buffer, sizeof(buffer), "%a, %d %b %Y %H:%M:%S", + PR_FormatTimeUSEnglish(buffer, sizeof(buffer), "%a, %d %b %Y %H:%M:%S GMT", &result.fe_time); nsAutoCString escaped; diff --git a/netwerk/streamconv/converters/nsIndexedToHTML.cpp b/netwerk/streamconv/converters/nsIndexedToHTML.cpp index cb8cf9c2f065..9ff8985cd48a 100644 --- a/netwerk/streamconv/converters/nsIndexedToHTML.cpp +++ b/netwerk/streamconv/converters/nsIndexedToHTML.cpp @@ -25,6 +25,7 @@ #include "nsDirIndexParser.h" #include "nsNativeCharsetUtils.h" #include "nsString.h" +#include "nsContentUtils.h" #include <algorithm> #include "nsIChannel.h" #include "mozilla/Unused.h" @@ -670,6 +671,24 @@ nsIndexedToHTML::OnDataAvailable(nsIRequest* aRequest, nsIInputStream* aInput, return mParser->OnDataAvailable(aRequest, aInput, aOffset, aCount); } +static nsresult FormatTime(const nsDateFormatSelector aDateFormatSelector, + const nsTimeFormatSelector aTimeFormatSelector, + const PRTime aPrTime, nsAString& aStringOut) { + // FormatPRExplodedTime will use GMT based formatted string (e.g. GMT+1) + // instead of local time zone name (e.g. CEST). + // To avoid this case when ResistFingerprinting is disabled, use + // |FormatPRTime| to show exact time zone name. + if (!nsContentUtils::ShouldResistFingerprinting()) { + return mozilla::DateTimeFormat::FormatPRTime( + aDateFormatSelector, aTimeFormatSelector, aPrTime, aStringOut); + } + + PRExplodedTime prExplodedTime; + PR_ExplodeTime(aPrTime, PR_GMTParameters, &prExplodedTime); + return mozilla::DateTimeFormat::FormatPRExplodedTime( + aDateFormatSelector, aTimeFormatSelector, &prExplodedTime, aStringOut); +} + NS_IMETHODIMP nsIndexedToHTML::OnIndexAvailable(nsIRequest* aRequest, nsISupports* aCtxt, nsIDirIndex* aIndex) { @@ -816,12 +835,10 @@ nsIndexedToHTML::OnIndexAvailable(nsIRequest* aRequest, nsISupports* aCtxt, pushBuffer.AppendInt(static_cast<int64_t>(t)); pushBuffer.AppendLiteral("\">"); nsAutoString formatted; - mozilla::DateTimeFormat::FormatPRTime(kDateFormatShort, kTimeFormatNone, t, - formatted); + FormatTime(kDateFormatShort, kTimeFormatNone, t, formatted); AppendNonAsciiToNCR(formatted, pushBuffer); pushBuffer.AppendLiteral("</td>\n <td>"); - mozilla::DateTimeFormat::FormatPRTime(kDateFormatNone, kTimeFormatSeconds, - t, formatted); + FormatTime(kDateFormatNone, kTimeFormatSeconds, t, formatted); // use NCR to show date in any doc charset AppendNonAsciiToNCR(formatted, pushBuffer); } diff --git a/netwerk/test/unit/test_bug365133.js b/netwerk/test/unit/test_bug365133.js index d9aabd5c6ea9..a872d7a5c7d9 100644 --- a/netwerk/test/unit/test_bug365133.js +++ b/netwerk/test/unit/test_bug365133.js @@ -8,7 +8,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "a%20" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 DIRECTORY \n', + '201: "a%20" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT DIRECTORY \n', ], [ /* Unix style listing, space at the end of link name */ @@ -17,7 +17,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "l%20" 2 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 SYMBOLIC-LINK \n', + '201: "l%20" 2 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT SYMBOLIC-LINK \n', ], [ /* Unix style listing, regular file with " -> " in name */ @@ -26,7 +26,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "arrow%20-%3E%20in%20name%20" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n', + '201: "arrow%20-%3E%20in%20name%20" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n', ], [ /* Unix style listing, tab at the end of filename */ @@ -35,7 +35,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "t%09" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 DIRECTORY \n', + '201: "t%09" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT DIRECTORY \n', ], [ /* Unix style listing, multiple " -> " in filename */ @@ -44,7 +44,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "symlink%20with%20arrow%20-%3E%20in%20name" 26 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 SYMBOLIC-LINK \n', + '201: "symlink%20with%20arrow%20-%3E%20in%20name" 26 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT SYMBOLIC-LINK \n', ], [ /* Unix style listing, multiple " -> " in filename, incorrect filesize */ @@ -53,7 +53,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "symlink%20with%20arrow%20-%3E%20in%20name%20-%3E%20file%20with%20arrow" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 SYMBOLIC-LINK \n', + '201: "symlink%20with%20arrow%20-%3E%20in%20name%20-%3E%20file%20with%20arrow" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT SYMBOLIC-LINK \n', ], [ /* DOS style listing, space at the end of filename, year 1999 */ @@ -62,7 +62,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file%20" 1024 Fri%2C%2001%20Jan%201999%2001%3A00%3A00 FILE \n', + '201: "file%20" 1024 Fri%2C%2001%20Jan%201999%2001%3A00%3A00%20GMT FILE \n', ], [ /* DOS style listing, tab at the end of filename, year 2000 */ @@ -71,7 +71,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file%09" 1024 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n', + '201: "file%09" 1024 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n', ], ]; diff --git a/netwerk/test/unit/test_bug484684.js b/netwerk/test/unit/test_bug484684.js index ae0d8276aaa4..e867d0c01637 100644 --- a/netwerk/test/unit/test_bug484684.js +++ b/netwerk/test/unit/test_bug484684.js @@ -10,8 +10,8 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file1" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n' + - '201: "%20file2" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n', + '201: "file1" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n' + + '201: "%20file2" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n', ], // old Hellsoft unix format [ @@ -22,8 +22,8 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file1" 214059 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n' + - '201: "file2" 214059 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n', + '201: "file1" 214059 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n' + + '201: "file2" 214059 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n', ], // new Hellsoft unix format [ @@ -34,8 +34,8 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file1" 192 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n' + - '201: "%20file2" 192 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n', + '201: "file1" 192 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n' + + '201: "%20file2" 192 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n', ], // DOS format with correct offsets [ @@ -50,12 +50,12 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "dir1" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "junction1" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "file1" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n' + - '201: "%20dir2" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "%20junction2" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "%20file2" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n', + '201: "dir1" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "junction1" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "file1" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n' + + '201: "%20dir2" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "%20junction2" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "%20file2" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n', ], // DOS format with wrong offsets [ @@ -72,14 +72,14 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "dir1" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "dir2" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "dir3" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "junction1" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "junction2" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "junction3" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "file1" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n' + - '201: "file2" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n', + '201: "dir1" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "dir2" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "dir3" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "junction1" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "junction2" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "junction3" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "file1" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n' + + '201: "file2" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n', ], ]; diff --git a/netwerk/test/unit/test_bug515583.js b/netwerk/test/unit/test_bug515583.js index 85db9fd8e9ef..fe958747e25c 100644 --- a/netwerk/test/unit/test_bug515583.js +++ b/netwerk/test/unit/test_bug515583.js @@ -14,8 +14,8 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "A" 2048 Wed%2C%2003%20Mar%201993%2018%3A09%3A01 FILE \n' + - '201: "E" 2048 Mon%2C%2008%20Mar%201993%2018%3A09%3A01 FILE \n', + '201: "A" 2048 Wed%2C%2003%20Mar%201993%2018%3A09%3A01%20GMT FILE \n' + + '201: "E" 2048 Mon%2C%2008%20Mar%201993%2018%3A09%3A01%20GMT FILE \n', ], [ "\r\r\r\n", diff --git a/netwerk/test/unit/test_bug543805.js b/netwerk/test/unit/test_bug543805.js index f4dec7e099b4..8ea493982e01 100644 --- a/netwerk/test/unit/test_bug543805.js +++ b/netwerk/test/unit/test_bug543805.js @@ -22,24 +22,24 @@ const tests = [ day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + + "%2020%3A19%3A00%20GMT FILE \n" + '201: "%20test.blankfile" 22 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + - '201: "%20test2.blankfile" 33 Tue%2C%2001%20Apr%202008%2000%3A00%3A00 FILE \n' + + "%2020%3A19%3A00%20GMT FILE \n" + + '201: "%20test2.blankfile" 33 Tue%2C%2001%20Apr%202008%2000%3A00%3A00%20GMT FILE \n' + '201: "nodup.file" 44 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + + "%2020%3A19%3A00%20GMT FILE \n" + '201: "test.file" 55 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + - '201: "test2.file" 66 Tue%2C%2001%20Apr%202008%2000%3A00%3A00 FILE \n', + "%2020%3A19%3A00%20GMT FILE \n" + + '201: "test2.file" 66 Tue%2C%2001%20Apr%202008%2000%3A00%3A00%20GMT FILE \n', ], // standard ls format @@ -59,24 +59,24 @@ const tests = [ day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + + "%2020%3A19%3A00%20GMT FILE \n" + '201: "%20test.blankfile" 22 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + - '201: "%20test2.blankfile" 33 Tue%2C%2001%20Apr%202008%2000%3A00%3A00 FILE \n' + + "%2020%3A19%3A00%20GMT FILE \n" + + '201: "%20test2.blankfile" 33 Tue%2C%2001%20Apr%202008%2000%3A00%3A00%20GMT FILE \n' + '201: "nodup.file" 44 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + + "%2020%3A19%3A00%20GMT FILE \n" + '201: "test.file" 55 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + - '201: "test2.file" 66 Tue%2C%2001%20Apr%202008%2000%3A00%3A00 FILE \n', + "%2020%3A19%3A00%20GMT FILE \n" + + '201: "test2.file" 66 Tue%2C%2001%20Apr%202008%2000%3A00%3A00%20GMT FILE \n', ], ];

1 0

[tor-browser-build/master] Pick up another fix for obfs4 compilation bustage
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 9fde9fe3b38b8785d08ea0d1fc291ac0c266ed04 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 21:12:39 2019 +0000 Pick up another fix for obfs4 compilation bustage --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 244421c..967eb08 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0a6' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 9.0a4 project_name: tor-browser

1 0

[tor-browser-build/master] fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek.
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 8cb36805e3f408b9958d3bf75811d87cb54453e2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 21:11:30 2019 +0000 fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek. --- projects/goutls/config | 1 - projects/goxnet/config | 8 +------- projects/obfs4/build | 25 +++++++------------------ projects/obfs4/config | 2 -- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/projects/goutls/config b/projects/goutls/config index d738305..fa4b5d8 100644 --- a/projects/goutls/config +++ b/projects/goutls/config @@ -28,4 +28,3 @@ input_files: - name: gobsaes project: gobsaes - filename: sessionid.patch - enable: '[% c("var/nightly") || c("var/alpha") %]' diff --git a/projects/goxnet/config b/projects/goxnet/config index 6aa5a0e..ae574c6 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/net -git_hash: 7dbad50ab5b31073856416cdcfeb2796d682f844 +git_hash: ed066c81e75eba56dd9bd2139ade88125b855585 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -13,12 +13,6 @@ var: go_lib_install: - golang.org/x/net/proxy -targets: - nightly: - # Nightly version of obfs4 requires a more recent version of goxnet - # See bug 29193 - git_hash: ed066c81e75eba56dd9bd2139ade88125b855585 - input_files: - project: container-image - name: go diff --git a/projects/obfs4/build b/projects/obfs4/build index 3f650c4..33b0add 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -11,29 +11,18 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] -[% IF c("var/nightly") || c("var/alpha") -%] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] -[% END -%] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/nightly") || c("var/alpha") -%] - # Remove go.mod and go.sum files until we can build using Go module - # versioning (see bug 28325). - rm -f go.mod go.sum -[% END -%] -# Commit 70d0e90c861be34ce3c5425ef1366a0b2ceb3026 changed the canonical obfs4 -# upstream repo to gitlab.com/yawning/obfs4.git. -[% IF c("var/nightly") || c("var/alpha") %] - mkdir -p "$GOPATH/src/gitlab.com/yawning" - ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git" -[% ELSE %] - mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" - ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" -[% END %] +# Remove go.mod and go.sum files until we can build using Go module +# versioning (see bug 28325). +rm -f go.mod go.sum +mkdir -p "$GOPATH/src/gitlab.com/yawning" +ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git" cd obfs4proxy go build -ldflags '-s' cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR diff --git a/projects/obfs4/config b/projects/obfs4/config index ce57cdc..d9357bb 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -34,7 +34,5 @@ input_files: project: goxnet - name: goutls project: goutls - enable: '[% c("var/nightly") || c("var/alpha") %]' - name: goxtext project: goxtext - enable: '[% c("var/nightly") || c("var/alpha") %]'

1 0

[tor-browser-build/master] Pick up fix for obfs4 compilation bustage
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 708993137e2cea1cdc979722a76c3eedd3f6cfd5 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 20:32:50 2019 +0000 Pick up fix for obfs4 compilation bustage --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index c16e8ae..244421c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0a6' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 9.0a4 project_name: tor-browser

1 0

[tor-browser-build/master] fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek.
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 86021a7ad8c95feaf26247ff33481be3bb863fcc Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 20:31:25 2019 +0000 fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek. --- projects/obfs4/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/obfs4/config b/projects/obfs4/config index 48afc2f..ce57cdc 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -34,7 +34,7 @@ input_files: project: goxnet - name: goutls project: goutls - enable: '[% c("var/nightly") %]' + enable: '[% c("var/nightly") || c("var/alpha") %]' - name: goxtext project: goxtext - enable: '[% c("var/nightly") %]' + enable: '[% c("var/nightly") || c("var/alpha") %]'

1 0

[tor-browser-build/master] Pick up fix for #31592
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 4e2920301010a8c6f127828a40321aa81b28820c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 15:47:45 2019 +0000 Pick up fix for #31592 --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 6bdcf8d..b13635c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1

1 0