- tbb-commits - lists.torproject.org

[tor-browser-build/master] Pick up fix for bug 29572
by gk＠torproject.org 11 Mar '19

11 Mar '19

commit 5a4f0853b634daa93e099ad613257f069635bb93 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 11 10:53:59 2019 +0000 Pick up fix for bug 29572 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index c61e694..70d1ff3 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit c61e6940a1824462648064898be0759dd1600414 +Subproject commit 70d1ff3e7c1c5c69a1b4cdb61ee1b6b9e2a9bc4a

1 0

[rbm/master] Bug 29572: Update the test before running git checkout --detach
by gk＠torproject.org 11 Mar '19

11 Mar '19

commit 70d1ff3e7c1c5c69a1b4cdb61ee1b6b9e2a9bc4a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 11 11:26:48 2019 +0100 Bug 29572: Update the test before running git checkout --detach The reason we don't run |git checkout --detach| in all cases is that it fails when we cloned a repository without a master branch. To avoid running it in this case, we were checking if HEAD is pointing to a branch which has a corresponding file in the .git directory. … [View More]

1 0

[tor-launcher/master] Bug 22402: Improve "For assistance" link.
by gk＠torproject.org 07 Mar '19

07 Mar '19

commit e4c4622a8e443a36480dacae3eee18d55a55a7ac Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Mar 7 09:34:00 2019 -0500 Bug 22402: Improve "For assistance" link. Instead of pointing users to the Tor Project contact page, point them to support.torproject.org/#connectingtotor. --- src/chrome/content/network-settings.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-… [View More]

1 0

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

06 Mar '19

commit f160a7e0c63758e6e90ba3ece59c7130a603f2e0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 6 07:41:09 2019 +0000 Fold in stable Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 83d0f4b..a68ff69 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-… [View More]

1 0

[tor-browser-build/maint-8.0] Bump tor version to 0.3.5.8
by gk＠torproject.org 06 Mar '19

06 Mar '19

commit fbd366f2f0a0b1b58642cf5f860d98ba768ebe78 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 6 07:32:59 2019 +0000 Bump tor version to 0.3.5.8 Fixes #29660 and similar bugs where tor mishandled empty SOCKS auth. See #29175 for more details. --- projects/tor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor/config b/projects/tor/config index f5e2515..9301818 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -… [View More]

1 0

[tor-browser-build/master] Bump tor version to 0.4.0.2-alpha
by gk＠torproject.org 06 Mar '19

06 Mar '19

commit 864a167a1cdef48560b52c5f3ba559f343eddae0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 6 07:30:53 2019 +0000 Bump tor version to 0.4.0.2-alpha Fixes #29660 and similar bugs where tor mishandled empty SOCKS auth. See #29175 for more details. --- projects/tor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor/config b/projects/tor/config index af90885..ffdb200 100644 --- a/projects/tor/config +++ b/projects/tor/… [View More]

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 29445: Enable support for enterprise policies
by gk＠torproject.org 06 Mar '19

06 Mar '19

commit 7ce43156780e3b91f35481cce1eb4afed56a4b0f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 5 13:58:52 2019 -0500 Bug 29445: Enable support for enterprise policies Enable enterprise policies for all update channels, including "release" (which Tor Browser uses instead of "esr"). --- browser/components/enterprisepolicies/EnterprisePolicies.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/browser/components/… [View More]

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_27210_v3'
by boklm＠torproject.org 05 Mar '19

05 Mar '19

commit ba9064e4b5a369b9c70201e335ef706db25f2815 Merge: 799ccf0 f4b5f7b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 5 21:45:55 2019 +0100 Merge remote-tracking branch 'gk/bug_27210_v3' Conflicts: projects/orbot/build Makefile | 15 +++++++++++ projects/android-toolchain/build | 10 +++++-- projects/firefox/config | 2 +- projects/firefox/mozconfig-android-x86 | 48 ++++++++++++++++++++++++++++… [View More]

1 0

[tor-browser-build/master] Bug 27210: Add support for x86 on Android
by boklm＠torproject.org 05 Mar '19

05 Mar '19

commit f4b5f7b3b38679456d97b71904b0c59d4e4600d9 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 8 10:49:13 2019 +0000 Bug 27210: Add support for x86 on Android --- Makefile | 15 +++++++++++ projects/android-toolchain/build | 10 +++++-- projects/firefox/config | 2 +- projects/firefox/mozconfig-android-x86 | 48 ++++++++++++++++++++++++++++++++++ projects/orbot/build | 7 ++++- projects/orbot/config … [View More] | 2 +- projects/release/build | 3 +++ projects/release/config | 11 ++++++++ projects/rust/build | 5 +++- projects/rust/config | 12 ++++++--- projects/tor-browser/config | 2 +- rbm.conf | 15 ++++++++++- 12 files changed, 121 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 8ec5d0c..d419422 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ release: submodule-update release-android-armv7: submodule-update $(rbm) build release --target release --target torbrowser-android-armv7 +release-android-x86: submodule-update + $(rbm) build release --target release --target torbrowser-android-x86 + release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 @@ -32,6 +35,9 @@ alpha: submodule-update alpha-android-armv7: submodule-update $(rbm) build release --target alpha --target torbrowser-android-armv7 +alpha-android-x86: submodule-update + $(rbm) build release --target alpha --target torbrowser-android-x86 + alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 @@ -56,6 +62,9 @@ nightly: submodule-update nightly-android-armv7: submodule-update $(rbm) build release --target nightly --target torbrowser-android-armv7 +nightly-android-x86: submodule-update + $(rbm) build release --target nightly --target torbrowser-android-x86 + nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 @@ -80,6 +89,9 @@ alpha_nightly: submodule-update alpha_nightly-android-armv7: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-android-armv7 +alpha_nightly-android-x86: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-android-x86 + alpha_nightly-linux-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 @@ -101,6 +113,9 @@ testbuild: submodule-update testbuild-android-armv7: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-armv7 +testbuild-android-x86: submodule-update + $(rbm) build release --target testbuild --target torbrowser-android-x86 + testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index a9d3139..ff899d2 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -17,8 +17,14 @@ unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME cd $NDK_HOME mv android-ndk-r15c/* . rm -fR android-ndk-r15c -# API 16 is the minimum we currently support for Tor Browser on Android -./build/tools/make_standalone_toolchain.py --api 16 --arch arm --install-dir=./arm + +# The architectures we support +archs="arm x86" +for arch in $archs; do + # API 16 is the minimum we currently support for Tor Browser on Android for + # 32bit. + ./build/tools/make_standalone_toolchain.py --api 16 --arch $arch --install-dir=./$arch +done # Tool Archives cd $SDK_HOME diff --git a/projects/firefox/config b/projects/firefox/config index 68f2326..4d68969 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -41,7 +41,7 @@ targets: torbrowser_update_channel: default branding_directory: browser/branding/nightly - android-armv7: + android: var: arch_deps: - openjdk-8-jdk diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 new file mode 100644 index 0000000..1fe0b93 --- /dev/null +++ b/projects/firefox/mozconfig-android-x86 @@ -0,0 +1,48 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-linux-android +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +ac_add_options --enable-application=mobile/android +ac_add_options --target=i386-linux-android +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk +ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle +ac_add_options --with-android-version=16 +ac_add_options --with-branding=mobile/android/branding/torbrowser + +# Android NDK does not contain llvm-config so set clang path in options +ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/x86/lib64 +ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/x86/bin/clang + +ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser +ac_add_options --with-l10n-base=/var/tmp/dist/locales + +if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then +# Because Google Play will likely be the primary distribution medium, +# we disable updating and rely on Google Play by default. The +# Developer Policy explicitly prohibits in-app updating: +# An app distributed via Google Play may not modify, replace, or +# update itself using any method other than Google Plays update +# mechanism. +# https://play.google.com/about/privacy-security-deception/malicious-behavior/ + + ac_add_options --disable-tor-browser-update + ac_add_options --disable-signmar + ac_add_options --disable-verify-mar +fi + +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-rust-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc + +ac_add_options --without-google-play-services + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme diff --git a/projects/orbot/build b/projects/orbot/build index 4e222a9..22667b5 100644 --- a/projects/orbot/build +++ b/projects/orbot/build @@ -23,7 +23,12 @@ done # Build OrbotService Native Libraries pushd /var/tmp/build/[% project %]-[% c('version') %]/orbotservice/src/main /var/tmp/dist/android-toolchain/android-ndk/ndk-build -mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/pdnsd.so +[% IF c("var/android-armv7") %] + arch=armeabi-v7a +[% ELSE %] + arch=x86 +[% END %] +mv libs/$arch/pdnsd libs/$arch/pdnsd.so popd # Build Android Libraries and Apps diff --git a/projects/orbot/config b/projects/orbot/config index 1bedbdb..5ad5bfc 100644 --- a/projects/orbot/config +++ b/projects/orbot/config @@ -24,7 +24,7 @@ var: gradle_dependencies_version: 1 targets: - android-armv7: + android: var: arch_deps: - openjdk-8-jdk diff --git a/projects/release/build b/projects/release/build index cf190a6..ca7b26d 100644 --- a/projects/release/build +++ b/projects/release/build @@ -7,6 +7,9 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-android-armv7") -%] mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ [% END -%] +[% IF c("var/torbrowser-android-x86") -%] + mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/ +[% END -%] [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ diff --git a/projects/release/config b/projects/release/config index 65e297d..1a742ac 100644 --- a/projects/release/config +++ b/projects/release/config @@ -15,9 +15,13 @@ targets: - torbrowser-windows-x86_64 - torbrowser-osx-x86_64 - torbrowser-android-armv7 + - torbrowser-android-x86 torbrowser-android-armv7: var: torbrowser-android-armv7: 1 + torbrowser-android-x86: + var: + torbrowser-android-x86: 1 torbrowser-linux-x86_64: var: torbrowser-linux-x86_64: 1 @@ -91,6 +95,13 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-android-armv7 + - name: android-x86 + project: tor-browser + enable: '[% c("var/torbrowser-android-x86") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-android-x86 + - name: linux-x86_64 project: tor-browser enable: '[% c("var/torbrowser-linux-x86_64") %]' diff --git a/projects/rust/build b/projects/rust/build index 3c1d130..0df84a1 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -67,8 +67,11 @@ cd /var/tmp/build/rustc-[% c('version') %]-src [% END %] [% IF c("var/android") %] - patch -p1 < $rootdir/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch patch -p1 < $rootdir/replace_pagesize_in_mmap.patch + # The additional Rust patch is not necessary for x86. + [% IF c("var/android-armv7") %] + patch -p1 < $rootdir/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch + [% END %] [% END %] mkdir build diff --git a/projects/rust/config b/projects/rust/config index 48912ab..3d78ad3 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -15,15 +15,21 @@ var: use_container: 1 targets: - android-armv7: + android: var: rust_arch: x86_64 arch_deps: - libssl-dev - pkg-config - zlib1g-dev + android-armv7: + var: configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=armv7-linux-androideabi --set=target.armv7-linux-androideabi.cc=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-gcc + android-x86: + var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=i686-linux-android --set=target.i686-linux-android.cc=$ANDROID_NDK_HOME/x86/bin/i686-linux-android-gcc + linux: var: arch_deps: @@ -92,7 +98,7 @@ input_files: enable: '[% c("var/windows-i686") && !c("input_file_var/unwind_128") %]' - filename: unwind_128.patch enable: '[% c("input_file_var/unwind_128") %]' - - filename: 0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch - enable: '[% c("var/android") %]' - filename: replace_pagesize_in_mmap.patch enable: '[% c("var/android") %]' + - filename: 0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch + enable: '[% c("var/android-armv7") %]' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c4f25ff..9b26bc8 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -41,7 +41,7 @@ targets: windows-x86_64: var: mar_osname: win64 - android-armv7: + android: build: '[% INCLUDE build.android %]' var: arch_deps: diff --git a/rbm.conf b/rbm.conf index 03c105e..1b82e60 100644 --- a/rbm.conf +++ b/rbm.conf @@ -159,11 +159,23 @@ targets: torbrowser-android-armv7: - android-armv7 + - android android-armv7: arch: armv7 var: - android: 1 + android-armv7: 1 osname: android-armv7 + torbrowser-android-x86: + - android-x86 + - android + android-x86: + arch: x86 + var: + android-x86: 1 + osname: android-x86 + android: + var: + android: 1 compiler: android-toolchain snowflake: 0 fteproxy: 0 @@ -178,6 +190,7 @@ targets: - libtool - zip - unzip + torbrowser-linux-x86_64: - linux-x86_64 - linux [View Less]

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 27486 Avoid about:blank tabs when opening onboarding pages.
by gk＠torproject.org 05 Mar '19

05 Mar '19

commit 3a69f6697799d7c6d0ed408df8aa28239b430556 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 13 11:32:13 2019 -0500 Bug 27486 Avoid about:blank tabs when opening onboarding pages. Instead of using a simple <a href>, programmatically open onboarding web pages by using tabBrowser.addTab(). The same technique is now used for "See My Path", "See FAQs", and "Visit an Onion". --- browser/extensions/onboarding/bootstrap.js | 17 +++++++------… [View More]- .../extensions/onboarding/content/onboarding.js | 26 +++++++++++++--------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/browser/extensions/onboarding/bootstrap.js b/browser/extensions/onboarding/bootstrap.js index 0762249ba1e9..a90bef0faaa2 100644 --- a/browser/extensions/onboarding/bootstrap.js +++ b/browser/extensions/onboarding/bootstrap.js @@ -91,16 +91,17 @@ function setPrefs(prefs) { }); } -function openTorCircuitDisplayPage() { - let kFrameScript = "resource://onboarding/onboarding-tor-circuit-display.js"; - const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo +function openTorTab(aURL, aFrameScript) { let win = Services.wm.getMostRecentWindow('navigator:browser'); if (win) { let tabBrowser = win.gBrowser; - let tab = tabBrowser.addTab(kOnionURL); + let tab = tabBrowser.addTab(aURL); tabBrowser.selectedTab = tab; - let b = tabBrowser.getBrowserForTab(tab); - b.messageManager.loadFrameScript(kFrameScript, true); + + if (aFrameScript) { + let b = tabBrowser.getBrowserForTab(tab); + b.messageManager.loadFrameScript(aFrameScript, true); + } } } @@ -177,8 +178,8 @@ function initContentMessageListener() { isLoggedIn: syncTourChecker.isLoggedIn() }); break; - case "tor-open-circuit-display-page": - openTorCircuitDisplayPage(); + case "tor-open-tab": + openTorTab(msg.data.params.url, msg.data.params.frameScriptURL); break; #if 0 // No telemetry in Tor Browser. diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 9d03a6fc82d8..5cb81852bb73 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -195,12 +195,9 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-expect-differences.title", "onboarding.tour-tor-expect-differences.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-expect-differences.png"); - let button = createOnboardingTourButton(div, + createOnboardingTourButton(div, "onboarding-tour-tor-expect-differences-button", - "onboarding.tour-tor-expect-differences.button", "a"); - let anchor = button.querySelector("a"); - anchor.setAttribute("href", "https://support.torproject.org/#faq"); - anchor.setAttribute("target", "_blank"); + "onboarding.tour-tor-expect-differences.button"); return div; }, @@ -214,12 +211,9 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-onion-services.title", "onboarding.tour-tor-onion-services.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-onion-services.png"); - let button = createOnboardingTourButton(div, + createOnboardingTourButton(div, "onboarding-tour-tor-onion-services-button", - "onboarding.tour-tor-onion-services.button", "a"); - let anchor = button.querySelector("a"); - anchor.setAttribute("href", "https://3g2upl4pq6kufc4m.onion/"); - anchor.setAttribute("target", "_blank"); + "onboarding.tour-tor-onion-services.button"); return div; }, @@ -836,6 +830,7 @@ class Onboarding { ({ id, classList } = target.firstChild); } + const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo let handledTourActionClick = false; switch (id) { case "onboarding-overlay-button": @@ -918,7 +913,16 @@ class Onboarding { handledTourActionClick = true; break; case "onboarding-tour-tor-circuit-display-button": - sendMessageToChrome("tor-open-circuit-display-page"); + let kFrameScript = "resource://onboarding/onboarding-tor-circuit-display.js"; + sendMessageToChrome("tor-open-tab", + {url: kOnionURL, frameScriptURL: kFrameScript}); + break; + case "onboarding-tour-tor-expect-differences-button": + const kFAQURL = "https://support.torproject.org/#faq"; + sendMessageToChrome("tor-open-tab", {url: kFAQURL}); + break; + case "onboarding-tour-tor-onion-services-button": + sendMessageToChrome("tor-open-tab", {url: kOnionURL}); break; } if (classList.contains("onboarding-tour-item")) { [View Less]

1 0

[tor-browser-build/master] Bug 29194: Set DEBIAN_FRONTEND=noninteractive
by gk＠torproject.org 05 Mar '19

05 Mar '19

commit a4689ee18278443aaf10f72da623efba657a970a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 29 16:17:15 2019 +0100 Bug 29194: Set DEBIAN_FRONTEND=noninteractive Update rbm to set DEBIAN_FRONTEND=noninteractive when using apt-get in install_package. Also set DEBIAN_FRONTEND=noninteractive for the other apt-get commands we use in debootstrap-image and container-image. We now also use the -q (quiet) argument. --- projects/container-… [View More]

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_29194_v2'
by gk＠torproject.org 05 Mar '19

05 Mar '19

commit 799ccf053e78b385fbd2900e092113849d73c94b Merge: e39c1db a4689ee Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 5 08:56:37 2019 +0000 Merge remote-tracking branch 'boklm/bug_29194_v2' projects/container-image/config | 5 +++-- projects/debootstrap-image/config | 5 +++-- rbm | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-)

1 0

[rbm/master] Bug 29194: Set DEBIAN_FRONTEND=noninteractive
by gk＠torproject.org 05 Mar '19

05 Mar '19

commit c61e6940a1824462648064898be0759dd1600414 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 29 16:08:03 2019 +0100 Bug 29194: Set DEBIAN_FRONTEND=noninteractive Set DEBIAN_FRONTEND=noninteractive when using apt-get in install_package. Also use the -q (quiet) argument. --- lib/RBM/DefaultConfig.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index d758b8e..f8165c3 100644 --- a/… [View More]

1 0

[tor-browser-build/master] Bug 29633: Don't ship pdnsd anymore
by boklm＠torproject.org 04 Mar '19

04 Mar '19

commit e39c1dbe69a48274c5e806efc0ef2d407085b255 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 1 19:16:56 2019 +0000 Bug 29633: Don't ship pdnsd anymore We don't use Orbot's VPN mode and therefore don't need pdnsd bundled. Thanks, Nathan, for noticing. --- projects/orbot/build | 6 ------ 1 file changed, 6 deletions(-) diff --git a/projects/orbot/build b/projects/orbot/build index 4e222a9..840df3e 100644 --- a/projects/orbot/build +++ b/projects/orbot/build … [View More]

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 29120: Enable media cache in memory
by gk＠torproject.org 04 Mar '19

04 Mar '19

commit b7c1e2820087e60d019b57d25042a27dc83adc4a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 4 08:38:22 2019 +0000 Bug 29120: Enable media cache in memory Back then in bug 10237 we set `media.cache_size` to `0` in the attempt to block disk caching if we are in Private Browsing Mode. However, it turns out that is not enough to prevent writing to disk in that case and, moreover, is the reason for poor video performance in some cases. The … [View More]patch in this commit addresses both issues by enabling the media cache again and making sure it stays memory-only in Private Browsing Mode. Big thanks to a cypherpunk for analyzing the bug and providing the patch. --- browser/app/profile/000-tor-browser.js | 3 ++- dom/media/MediaCache.cpp | 45 +++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 9f1e727ce724..a0b370c73279 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -60,7 +60,8 @@ pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); pref("signon.autofillForms", false); pref("browser.sessionstore.privacy_level", 2); -pref("media.cache_size", 0); +// Increase the maximum memory-backed cache size (#29120) +pref("media.memory_cache_max_size", 16384); // Misc privacy: Remote pref("browser.send_pings", false); diff --git a/dom/media/MediaCache.cpp b/dom/media/MediaCache.cpp index 38197de3e4a6..056527e7926c 100644 --- a/dom/media/MediaCache.cpp +++ b/dom/media/MediaCache.cpp @@ -154,7 +154,9 @@ class MediaCache { // If the length is known and considered small enough, a discrete MediaCache // with memory backing will be given. Otherwise the one MediaCache with // file backing will be provided. - static RefPtr<MediaCache> GetMediaCache(int64_t aContentLength); + // If aIsPrivateBrowsing is true, only initialization of a memory backed + // MediaCache will be attempted, returning nullptr if that fails. + static RefPtr<MediaCache> GetMediaCache(int64_t aContentLength, bool aIsPrivateBrowsing); nsIEventTarget* OwnerThread() const { return sThread; } @@ -706,7 +708,7 @@ void MediaCache::CloseStreamsForPrivateBrowsing() { } /* static */ RefPtr<MediaCache> MediaCache::GetMediaCache( - int64_t aContentLength) { + int64_t aContentLength, bool aIsPrivateBrowsing) { NS_ASSERTION(NS_IsMainThread(), "Only call on main thread"); if (!sThreadInit) { @@ -734,10 +736,30 @@ void MediaCache::CloseStreamsForPrivateBrowsing() { return nullptr; } - if (aContentLength > 0 && - aContentLength <= int64_t(MediaPrefs::MediaMemoryCacheMaxSize()) * 1024) { - // Small-enough resource, use a new memory-backed MediaCache. - RefPtr<MediaBlockCacheBase> bc = new MemoryBlockCache(aContentLength); + if (aIsPrivateBrowsing || + (aContentLength > 0 && + aContentLength <= int64_t(MediaPrefs::MediaMemoryCacheMaxSize()) * 1024)) { + // We're either in private browsing mode or we have a + // small-enough resource, use a new memory-backed MediaCache. + + int64_t cacheSize = 0; + if (!aIsPrivateBrowsing) { + cacheSize = aContentLength; + } else { + // We're in private browsing mode, we'll have to figure out a + // cache size since we can't fallback to a file backed MediaCache. + if (aContentLength < 0) { + // Unknown content length, we'll give the maximum allowed + // cache size just to be sure. + cacheSize = int64_t(MediaPrefs::MediaMemoryCacheMaxSize()) * 1024; + } else { + // If the content length is less than the maximum allowed cache size, + // use that, otherwise we cap it. + cacheSize = std::min(aContentLength, int64_t(MediaPrefs::MediaMemoryCacheMaxSize()) * 1024); + } + } + + RefPtr<MediaBlockCacheBase> bc = new MemoryBlockCache(cacheSize); nsresult rv = bc->Init(); if (NS_SUCCEEDED(rv)) { RefPtr<MediaCache> mc = new MediaCache(bc); @@ -745,8 +767,13 @@ void MediaCache::CloseStreamsForPrivateBrowsing() { mc.get()); return mc; } - // MemoryBlockCache initialization failed, clean up and try for a - // file-backed MediaCache below. + + // MemoryBlockCache initialization failed. + // If we're in private browsing mode, we will bail here. + // Otherwise, clean up and try for a file-backed MediaCache below. + if (aIsPrivateBrowsing) { + return nullptr; + } } if (gMediaCache) { @@ -2600,7 +2627,7 @@ nsresult MediaCacheStream::Init(int64_t aContentLength) { mStreamLength = aContentLength; } - mMediaCache = MediaCache::GetMediaCache(aContentLength); + mMediaCache = MediaCache::GetMediaCache(aContentLength, mIsPrivateBrowsing); if (!mMediaCache) { return NS_ERROR_FAILURE; } [View Less]

1 0

[tor-browser-build/master] Bug 29632: Use HTTPS for downloading Gradle
by boklm＠torproject.org 03 Mar '19

03 Mar '19

commit 1e09514cd1bfdeba863a84929edfc21ede3f8b9d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 1 19:08:03 2019 +0000 Bug 29632: Use HTTPS for downloading Gradle There should be no excuse anymore to use plan HTTP (even though, we check the SHA-256 sum). Use HTTPS where possible. --- projects/android-toolchain/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index … [View More]

1 0

[tor-browser-build/master] Add missing parenthesis
by gk＠torproject.org 01 Mar '19

01 Mar '19

commit 95f303b383fabb0904545a2c5b8150476270e2d0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 1 07:05:02 2019 +0000 Add missing parenthesis --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index aa0a34f..f3d3c27 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -113,7 +113,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig tar -C /var/… [View More]

1 0

[tor-browser-build/master] Bug 28685: Set Build ID based on Tor Browser version
by gk＠torproject.org 28 Feb '19

28 Feb '19

commit d11f03f7c10c2cf5a942a353d0961249ceee9644 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 20 20:15:19 2019 +0100 Bug 28685: Set Build ID based on Tor Browser version --- projects/firefox/build | 2 +- projects/firefox/get-moz-build-date | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 1544c11..aa0a34f 100644 --- a/projects/firefox/build +++ b/… [View More]projects/firefox/build @@ -113,7 +113,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] [% END %] -eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat browser/config/version.txt)) +eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %] if [ -z $MOZ_BUILD_DATE ] then echo "MOZ_BUILD_DATE is not set" diff --git a/projects/firefox/get-moz-build-date b/projects/firefox/get-moz-build-date index fb7298a..4e55c92 100755 --- a/projects/firefox/get-moz-build-date +++ b/projects/firefox/get-moz-build-date @@ -1,16 +1,24 @@ #!/usr/bin/perl -w -# Generate a MOZ_BUILD_DATE based on firefox version number +# Generate a MOZ_BUILD_DATE based on Tor Browser version number use strict; die "wrong number of arguments" unless @ARGV == 2; my ($year, $version) = @ARGV; -$version =~ s/\D+$//; -my @v = split(/[\.ab]/, $version); -push @v, '0' if @v < 4; -push @v, '0' if @v < 4; -my $day_of_month = int(($v[0] - 45) / 5); -my $date = 101010101 + $year * 10000000000 + $day_of_month * 1000000 - + $v[1] * 10000 + $v[2] * 100 + $v[3]; -$date += 100000000 unless $version =~ m/[ab]/; +my $date; +if ($version eq 'tbb-nightly') { + my (undef, undef, undef, $day, $mon, $y) = localtime; + $date = sprintf("%d%02d%02d010101", $y + 1900, $mon + 1, $day); +} else { + my @v = split(/[\.ab]/, $version); + push @v, '0' if @v < 4; + push @v, '0' if @v < 4; + # When MOZ_BUILD_DATE was based on the firefox version, with + # Tor Browser 8.0.6 and firefox 60.5.1 it was 20190204060201 + # We can remove 5 from the month, while keeping it increasing. + my $month = $v[0] - 5; + $date = 1010101 + $year * 10000000000 + $month * 100000000 + + $v[1] * 1000000 + $v[2] * 10000 + $v[3]; + $date += 1000000 unless $version =~ m/[ab]/; +} print "export MOZ_BUILD_DATE=$date\n"; [View Less]

1 0

[tor-browser-build/master] Bug 29579: Fix typo in projects/tor/build
by gk＠torproject.org 25 Feb '19

25 Feb '19

commit 0403da4390f8891a5a082eb6c761cd8710f913ca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 25 15:45:13 2019 +0100 Bug 29579: Fix typo in projects/tor/build --- projects/tor/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index f063693..d6018d9 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -11,7 +11,7 @@ mkdir -p /var/tmp/build [% END %] [% IF c("var/osx") %] - [% IF ("var/… [View More]

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Revert "Bug 29180: MAR download stalls when about dialog is opened""
by gk＠torproject.org 25 Feb '19

25 Feb '19

commit 5a0ac465ad739e62dc0c2e9887a15f146e9415a8 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 25 07:45:23 2019 +0000 Revert "Revert "Bug 29180: MAR download stalls when about dialog is opened"" This reverts commit fcc53d9fa4969850b4cd77951974ee6db73e827b. --- browser/base/content/aboutDialog-appUpdater.js | 17 +++++++++++----- toolkit/mozapps/update/content/updates.js | 27 ++++++++++++++------------ 2 files changed, 27 insertions(+), 17 deletions(-) … [View More]diff --git a/browser/base/content/aboutDialog-appUpdater.js b/browser/base/content/aboutDialog-appUpdater.js index e81098a1e898..b732db6bee6b 100644 --- a/browser/base/content/aboutDialog-appUpdater.js +++ b/browser/base/content/aboutDialog-appUpdater.js @@ -318,11 +318,18 @@ appUpdater.prototype = this.update.QueryInterface(Ci.nsIWritablePropertyBag); this.update.setProperty("foregroundDownload", "true"); - this.aus.pauseDownload(); - let state = this.aus.downloadUpdate(this.update, false); - if (state == "failed") { - this.selectPanel("downloadFailed"); - return; + // If one is not already in progress, start a download. Previously, + // we would pause and restart an existing download in case there was + // a need to transition from a background download to a foreground one, + // but that caused Tor bug 29180. There is no difference between a + // foreground and background download unless the update manifest + // includes a backgroundInterval attribute. + if (!this.isDownloading) { + let state = this.aus.downloadUpdate(this.update, false); + if (state == "failed") { + this.selectPanel("downloadFailed"); + return; + } } this.setupDownloadingUI(); diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js index 5b6ae7cc6ba1..195265ff81f9 100644 --- a/toolkit/mozapps/update/content/updates.js +++ b/toolkit/mozapps/update/content/updates.js @@ -751,19 +751,22 @@ var gDownloadingPage = { gUpdates.update.QueryInterface(Ci.nsIWritablePropertyBag); gUpdates.update.setProperty("foregroundDownload", "true"); - // Pause any active background download and restart it as a foreground - // download. - aus.pauseDownload(); - var state = aus.downloadUpdate(gUpdates.update, false); - if (state == "failed") { - // We've tried as hard as we could to download a valid update - - // we fell back from a partial patch to a complete patch and even - // then we couldn't validate. Show a validation error with instructions - // on how to manually update. - this.cleanUp(); - gUpdates.wiz.goTo("errors"); - return; + // If it is not already in progress, start the download. See + // Tor bug 29180 as well as the longer comment in the startDownload() + // function within browser/base/content/aboutDialog-appUpdater.js. + if (!aus.isDownloading) { + var state = aus.downloadUpdate(gUpdates.update, false); + if (state == "failed") { + // We've tried as hard as we could to download a valid update - + // we fell back from a partial patch to a complete patch and even + // then we couldn't validate. Show a validation error with + // instructions on how to manually update. + this.cleanUp(); + gUpdates.wiz.goTo("errors"); + return; + } } + // Add this UI as a listener for active downloads aus.addDownloadListener(this); [View Less]

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Revert "Bug 28885: notify users that update is downloading""
by gk＠torproject.org 25 Feb '19

25 Feb '19

commit 4f79cf20b45acc657639f620d03f24b38f8e7bf1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 25 07:45:02 2019 +0000 Revert "Revert "Bug 28885: notify users that update is downloading"" This reverts commit 58a439dd4e6fc1734d60d7175caa1cb2f88fbbac. --- browser/app/profile/000-tor-browser.js | 1 + .../customizableui/content/panelUI.inc.xul | 1 + .../components/customizableui/content/panelUI.js | 28 ++++++++++++++++++++++ browser/… [View More]components/nsBrowserGlue.js | 1 + .../themes/shared/customizableui/panelUI.inc.css | 1 + browser/themes/shared/toolbarbutton-icons.inc.css | 1 + toolkit/mozapps/update/UpdateListener.jsm | 23 ++++++++++++++++++ toolkit/mozapps/update/nsUpdateService.js | 28 ++++++++++++++++++++++ 8 files changed, 84 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 11027f4c9a3a..9f1e727ce724 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -20,6 +20,7 @@ pref("startup.homepage_override_url", "https://blog.torproject.org/category/tags // Try to nag a bit more about updates: Pop up a restart dialog an hour after the initial dialog pref("app.update.promptWaitTime", 3600); pref("app.update.badge", true); +pref("app.update.notifyDuringDownload", true); pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues #ifdef XP_WIN diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul index 5891556a6e5f..ee4f8351d02b 100644 --- a/browser/components/customizableui/content/panelUI.inc.xul +++ b/browser/components/customizableui/content/panelUI.inc.xul @@ -172,6 +172,7 @@ <vbox id="appMenu-addon-banners"/> <toolbarbutton class="panel-banner-item" label-update-available="&updateAvailable.panelUI.label;" + label-update-downloading="Downloading update" label-update-manual="&updateManual.panelUI.label;" label-update-restart="&updateRestart.panelUI.label2;" oncommand="PanelUI._onBannerItemSelected(event)" diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js index 5233be130be2..a4018bb2e6c2 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -46,6 +46,7 @@ const PanelUI = { init() { this._initElements(); + this._initUpdaterStrings(); this.menuButton.addEventListener("mousedown", this); this.menuButton.addEventListener("keypress", this); @@ -53,6 +54,7 @@ const PanelUI = { Services.obs.addObserver(this, "fullscreen-nav-toolbox"); Services.obs.addObserver(this, "appMenu-notifications"); + Services.obs.addObserver(this, "show-update-progress"); XPCOMUtils.defineLazyPreferenceGetter(this, "autoHideToolbarInFullScreen", "browser.fullscreen.autohide", false, (pref, previousValue, newValue) => { @@ -120,6 +122,28 @@ const PanelUI = { } }, + _initUpdaterStrings() { + // If Torbutton is installed and enabled, replace the "Downloading update" + // string with one from torbutton.properties (to facilitate localization). + try { + let brands = Services.strings.createBundle( + "chrome://branding/locale/brand.properties"); + let stringArgs = [brands.GetStringFromName("brandShortName")]; + let torbuttonBundle = Services.strings.createBundle( + "chrome://torbutton/locale/torbutton.properties"); + let label = torbuttonBundle.formatStringFromName( + "updateDownloadingPanelUILabel", stringArgs, 1); + let attrName = "label-update-downloading"; + let elements = document.getElementsByClassName("panel-banner-item"); + for (let i = 0; i < elements.length; ++i) { + let elem = elements.item(i); + if (elem.hasAttribute(attrName)) { + elem.setAttribute(attrName, label); + } + } + } catch (e) {} + }, + _eventListenersAdded: false, _ensureEventListenersAdded() { if (this._eventListenersAdded) @@ -152,6 +176,7 @@ const PanelUI = { Services.obs.removeObserver(this, "fullscreen-nav-toolbox"); Services.obs.removeObserver(this, "appMenu-notifications"); + Services.obs.removeObserver(this, "show-update-progress"); window.removeEventListener("MozDOMFullscreen:Entered", this); window.removeEventListener("MozDOMFullscreen:Exited", this); @@ -252,6 +277,9 @@ const PanelUI = { this._notifications = AppMenuNotifications.notifications; this._updateNotifications(true); break; + case "show-update-progress": + openAboutDialog(); + break; } }, diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 0ec10a3337d4..e68817fd3c7c 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -187,6 +187,7 @@ const global = this; const listeners = { observers: { + "update-downloading": ["UpdateListener"], "update-staged": ["UpdateListener"], "update-downloaded": ["UpdateListener"], "update-available": ["UpdateListener"], diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index 75946aa5f082..4cb2032a09d1 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -62,6 +62,7 @@ } #PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, +#PanelUI-menu-button[badge-status="update-downloading"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css b/browser/themes/shared/toolbarbutton-icons.inc.css index d3a634d5ff51..230ddf951858 100644 --- a/browser/themes/shared/toolbarbutton-icons.inc.css +++ b/browser/themes/shared/toolbarbutton-icons.inc.css @@ -259,6 +259,7 @@ toolbar[brighttext] { } #PanelUI-menu-button[badge-status="update-available"], +#PanelUI-menu-button[badge-status="update-downloading"], #PanelUI-menu-button[badge-status="update-manual"], #PanelUI-menu-button[badge-status="update-restart"] { list-style-image: url("chrome://browser/skin/menu-badged.svg"); diff --git a/toolkit/mozapps/update/UpdateListener.jsm b/toolkit/mozapps/update/UpdateListener.jsm index a2b228d321ac..8437f4b884d4 100644 --- a/toolkit/mozapps/update/UpdateListener.jsm +++ b/toolkit/mozapps/update/UpdateListener.jsm @@ -127,6 +127,15 @@ var UpdateListener = { doc => this.replaceReleaseNotes(doc, update, "updateManualWhatsNew")); }, + showUpdateDownloadingNotification() { + this.showUpdateNotification("downloading", true, true, () => { + // The user clicked on the "Downloading update" app menu item. + // Code in browser/components/customizableui/content/panelUI.js + // receives the following notification and opens the about dialog. + Services.obs.notifyObservers(null, "show-update-progress", null); + }); + }, + handleUpdateError(update, status) { switch (status) { case "download-attempt-failed": @@ -204,6 +213,17 @@ var UpdateListener = { } }, + handleUpdateDownloading(status) { + switch (status) { + case "downloading": + this.showUpdateDownloadingNotification(); + break; + case "idle": + this.reset(); + break; + } + }, + observe(subject, topic, status) { if (!this.enabled) { return; @@ -215,6 +235,9 @@ var UpdateListener = { case "update-available": this.handleUpdateAvailable(update, status); break; + case "update-downloading": + this.handleUpdateDownloading(status); + break; case "update-staged": case "update-downloaded": this.handleUpdateStagedOrDownloaded(update, status); diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index b2a4e82cf241..159112805425 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -38,6 +38,7 @@ const PREF_APP_UPDATE_ENABLED = "app.update.enabled"; const PREF_APP_UPDATE_IDLETIME = "app.update.idletime"; const PREF_APP_UPDATE_LOG = "app.update.log"; const PREF_APP_UPDATE_NOTIFIEDUNSUPPORTED = "app.update.notifiedUnsupported"; +const PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD = "app.update.notifyDuringDownload"; const PREF_APP_UPDATE_POSTUPDATE = "app.update.postupdate"; const PREF_APP_UPDATE_PROMPTWAITTIME = "app.update.promptWaitTime"; const PREF_APP_UPDATE_SERVICE_ENABLED = "app.update.service.enabled"; @@ -3325,6 +3326,8 @@ Downloader.prototype = { if (this._request && this._request instanceof Ci.nsIRequest) { this._request.cancel(cancelError); } + + this._notifyDownloadStatusObservers(); }, /** @@ -3498,6 +3501,13 @@ Downloader.prototype = { return selectedPatch; }, + _notifyDownloadStatusObservers: function Downloader_notifyDownloadStatusObservers() { + if (Services.prefs.getBoolPref(PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD, false)) { + let status = this.updateService.isDownloading ? "downloading" : "idle"; + Services.obs.notifyObservers(this._update, "update-downloading", status); + } + }, + /** * Whether or not we are currently downloading something. */ @@ -3552,6 +3562,9 @@ Downloader.prototype = { var um = Cc["@mozilla.org/updates/update-manager;1"]. getService(Ci.nsIUpdateManager); um.saveUpdates(); + + this._notifyDownloadStatusObservers(); + return STATE_DOWNLOADING; }, @@ -3728,9 +3741,16 @@ Downloader.prototype = { } else { state = STATE_PENDING; } +#if defined(TOR_BROWSER_UPDATE) + // In Tor Browser, show update-related messages in the hamburger menu + // even if the update was started in the foreground, e.g., from the + // about box. + shouldShowPrompt = !getCanStageUpdates(); +#else if (this.background) { shouldShowPrompt = !getCanStageUpdates(); } +#endif AUSTLMY.pingDownloadCode(this.isCompleteUpdate, AUSTLMY.DWNLD_SUCCESS); // Tell the updater.exe we're ready to apply. @@ -3835,6 +3855,7 @@ Downloader.prototype = { } this._request = null; + this._notifyDownloadStatusObservers(); if (state == STATE_DOWNLOAD_FAILED) { var allFailed = true; @@ -3907,9 +3928,16 @@ Downloader.prototype = { // processor service. LOG("Downloader:onStopRequest - failed to stage update. Exception: " + e); +#if defined(TOR_BROWSER_UPDATE) + // In Tor Browser, show update-related messages in the hamburger menu + // even if the update was started in the foreground, e.g., from the + // about box. + shouldShowPrompt = true; +#else if (this.background) { shouldShowPrompt = true; } +#endif } } } [View Less]

1 0

[tor-browser-build/master] Bug 29556: Fix nightly builds emails
by boklm＠torproject.org 22 Feb '19

22 Feb '19

commit abcc56a2ebf32a4ceeea2554b5dea3ab1f6d2fd0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 22 12:01:25 2019 +0100 Bug 29556: Fix nightly builds emails By default dma will send emails by connecting to the configured mail server on port 25. According to https://riseup.net/en/email/clients we should be connecting to mail.riseup.net on port 587. --- tools/ansible/group_vars/boklm-tbb-nightly/dma.yml | 1 + 1 file changed, 1 insertion(+) … [View More]

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_25849_v3'
by boklm＠torproject.org 21 Feb '19

21 Feb '19

commit d500c61974ff1cdbccd31a64181aa10cb1e9482f Merge: caa9e6d 3de8afa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 21 16:16:35 2019 +0100 Merge remote-tracking branch 'gk/bug_25849_v3' projects/rust/build | 6 +- projects/rust/config | 4 +- projects/rust/unwind_128.patch | 161 +++++++++++++++++++++++++++++++++++++++++ projects/tor/build | 10 ++- projects/tor/config | 3 +- 5 files changed, 178 insertions(+), 6 deletions(-)

1 0

[tor-browser-build/master] Bug 25849: Enable Rust in Tor for Windows nightlies
by boklm＠torproject.org 21 Feb '19

21 Feb '19

commit 3de8afa44fa4a7078f917263147f6e19107e3141 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Feb 10 20:30:19 2019 +0000 Bug 25849: Enable Rust in Tor for Windows nightlies --- projects/rust/build | 6 +- projects/rust/config | 4 +- projects/rust/unwind_128.patch | 161 +++++++++++++++++++++++++++++++++++++++++ projects/tor/build | 10 ++- projects/tor/config | 3 +- 5 files changed, 178 insertions(+), 6 deletions(-) diff … [View More]--git a/projects/rust/build b/projects/rust/build index 12f012a..3c1d130 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -59,7 +59,11 @@ cd /var/tmp/build/rustc-[% c('version') %]-src # See: https://github.com/rust-lang/rust/issues/12859 for discussion about # that and https://github.com/rust-lang/rust/pull/49633 for a newer attempt to # fix this problem. We apply the patch from neersighted. - patch -p1 < $rootdir/unwind.patch + [% IF !c("input_file_var/unwind_128") %] + patch -p1 < $rootdir/unwind.patch + [% ELSE %] + patch -p1 < $rootdir/unwind_128.patch + [% END %] [% END %] [% IF c("var/android") %] diff --git a/projects/rust/config b/projects/rust/config index 99d1177..48912ab 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -89,7 +89,9 @@ input_files: file_gpg_id: 1 gpg_keyring: rust.gpg - filename: unwind.patch - enable: '[% c("var/windows-i686") %]' + enable: '[% c("var/windows-i686") && !c("input_file_var/unwind_128") %]' + - filename: unwind_128.patch + enable: '[% c("input_file_var/unwind_128") %]' - filename: 0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch enable: '[% c("var/android") %]' - filename: replace_pagesize_in_mmap.patch diff --git a/projects/rust/unwind_128.patch b/projects/rust/unwind_128.patch new file mode 100644 index 0000000..93528c9 --- /dev/null +++ b/projects/rust/unwind_128.patch @@ -0,0 +1,161 @@ +From 0a186eafebf26ca01879827a4cc95cc274791334 Mon Sep 17 00:00:00 2001 +From: Bjorn Neergaard <bjorn(a)neersighted.com> +Date: Sat, 9 Feb 2019 19:39:23 +0000 +Subject: [PATCH] Fix cross-compiling i686-pc-windows-gnu from Linux + +This is still very rough and serves as a proof-of-concept for fixing +Linux -> 32-bit MinGW cross compilation workflow. Currently, clang and +GCC's MinGW targets both only support DW2 (DWARF) or SJLJ (Set Jump Long +Jump) unwinding on 32-bit Windows. + +The default for GCC (and the way it is shipped on every major distro) is +to use SJLJ on Windows, as DWARF cannot traverse non-DWARF frames. This +would work fine, except for the fact that libgcc (our C runtime on the +MinGW platform) exports symbols under a different name when configured +to use SJLJ-style unwinding, and uses a preprocessor macro internally to +alias them. + +Because of this, we have to detect this scenario and link to the correct +symbols ourselves. Linking has been tested with a full bootstrap on both +x86_64-unknown-linux-gnu and i686-pc-windows-gnu, as well as +cross-compilation of some of my own projects. + +Obviously, the detection is a bit unrefined. Right now we +unconditionally use SJLJ when compiling Linux -> MinGW. I'd like to add +feature detection using compiler build flags or autotools-style +compilation and object analysis. Input on the best way to proceed here +is welcome. + +Also, currently there is copy-pasted/duplicated code in libunwind. +Ideally, this could be reduced, but this would likely require a +rethinking of how iOS is special-cased above, to avoid further +duplication. Input on how to best structure this file is requested. + +diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs +index 11d9154ba6..bd8ff844f7 100644 +--- a/src/bootstrap/compile.rs ++++ b/src/bootstrap/compile.rs +@@ -154,6 +154,11 @@ pub fn std_cargo(builder: &Builder, + } else { + let mut features = builder.std_features(); + ++ // FIXME: Temporary detection of SJLJ MinGW compilers. ++ if builder.config.build.contains("linux") && target == "i686-pc-windows-gnu" { ++ features.push_str(" sjlj_eh"); ++ } ++ + // When doing a local rebuild we tell cargo that we're stage1 rather than + // stage0. This works fine if the local rust and being-built rust have the + // same view of what the default allocator is, but fails otherwise. Since +diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml +index 5a2dce5930..e1c876f503 100644 +--- a/src/libstd/Cargo.toml ++++ b/src/libstd/Cargo.toml +@@ -50,3 +50,4 @@ force_alloc_system = [] + panic-unwind = ["panic_unwind"] + profiler = ["profiler_builtins"] + wasm_syscall = [] ++sjlj_eh = ["unwind/sjlj_eh"] +diff --git a/src/libunwind/Cargo.toml b/src/libunwind/Cargo.toml +index 4760461df6..27c7303604 100644 +--- a/src/libunwind/Cargo.toml ++++ b/src/libunwind/Cargo.toml +@@ -15,3 +15,6 @@ doc = false + core = { path = "../libcore" } + libc = { path = "../rustc/libc_shim" } + compiler_builtins = { path = "../rustc/compiler_builtins_shim" } ++ ++[features] ++sjlj_eh = [] +diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs +index 73a259bd44..ff3404864f 100644 +--- a/src/libunwind/libunwind.rs ++++ b/src/libunwind/libunwind.rs +@@ -10,11 +10,6 @@ + + #![allow(bad_style)] + +-macro_rules! cfg_if { +- ( $( if #[cfg( $meta:meta )] { $($it1:item)* } else { $($it2:item)* } )* ) => +- ( $( $( #[cfg($meta)] $it1)* $( #[cfg(not($meta))] $it2)* )* ) +-} +- + use libc::{c_int, c_void, uintptr_t}; + + #[repr(C)] +@@ -83,8 +78,8 @@ pub enum _Unwind_Context {} + pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reason_Code, + exception: *mut _Unwind_Exception); + extern "C" { +- #[unwind(allowed)] +- pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] + pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception); + pub fn _Unwind_GetLanguageSpecificData(ctx: *mut _Unwind_Context) -> *mut c_void; + pub fn _Unwind_GetRegionStart(ctx: *mut _Unwind_Context) -> _Unwind_Ptr; +@@ -216,26 +211,52 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm + pc + } + } ++} // cfg_if! + +-if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { +- // Not 32-bit iOS ++cfg_if! { ++if #[cfg(all(target_os = "ios", target_arch = "arm"))] { ++ // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() + extern "C" { +- #[unwind(allowed)] +- pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] ++ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; ++ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; ++ } ++ ++ #[inline] ++ pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code { ++ _Unwind_SjLj_RaiseException(exc) ++ } ++ ++} else if #[cfg(feature = "sjlj_eh")] { ++ extern "C" { ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] ++ pub fn _Unwind_SjLj_Resume(e: *mut _Unwind_Exception) -> !; ++ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; + pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, + trace_argument: *mut c_void) + -> _Unwind_Reason_Code; + } +-} else { +- // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() +- extern "C" { +- #[unwind(allowed)] +- pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; ++ ++ #[inline] ++ pub unsafe fn _Unwind_Resume(exc: *mut _Unwind_Exception) -> ! { ++ _Unwind_SjLj_Resume(exc) + } + + #[inline] + pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code { + _Unwind_SjLj_RaiseException(exc) + } ++} else { ++ extern "C" { ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] ++ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; ++ pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; ++ pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, ++ trace_argument: *mut c_void) ++ -> _Unwind_Reason_Code; ++ } + } + } // cfg_if! +-- +2.20.1 + diff --git a/projects/tor/build b/projects/tor/build index e9bd326..f063693 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -24,7 +24,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] -[% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %] +[% IF !c("var/android") && c("var/nightly") %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] export PATH=/var/tmp/dist/rust/bin:$PATH [% END %] @@ -33,6 +33,10 @@ libeventdir=/var/tmp/dist/libevent openssldir=/var/tmp/dist/openssl [% IF c("var/windows") %] + [% IF ("var/nightly") %] + # We are compiling Tor with Rust enabled for nightlies. + export TOR_RUST_TARGET=[% c("arch") %]-pc-windows-gnu + [% END %] tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] zlibdir=/var/tmp/build/zlib mingwlibs=/var/tmp/dist/mingw-w64/[% c("arch") %]-w64-mingw32/bin/ @@ -74,11 +78,11 @@ cd /var/tmp/build/[% project %]-[% c('version') %] echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh find -type f -print0 | xargs -0 [% c("var/touch") %] -[% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ +[% IF !c("var/android") && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ - [% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %]--enable-rust[% END %] \ + [% IF !c("var/android") && c("var/nightly") %]--enable-rust[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/osx") || c("var/windows") -%] export LD_PRELOAD=[% c("var/faketime_path") %] diff --git a/projects/tor/config b/projects/tor/config index e6e923b..af90885 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -65,4 +65,5 @@ input_files: input_file_var: rust_version: 1.28.0 prev_version: 1.27.2 - enable: '[% (c("var/linux") || c("var/osx")) && c("var/nightly") %]' + unwind_128: '[% c("var/windows-i686") %]' + enable: '[% !c("var/android") && c("var/nightly") %]' [View Less]

1 0

[tor-browser-build/master] Bug 23384: Add user pospeselr on build-sunet-a.torproject.net
by boklm＠torproject.org 12 Feb '19

12 Feb '19

commit caa9e6d5711ef098cfd7ba77fe88ad44e14cdd72 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 12 20:56:32 2019 +0100 Bug 23384: Add user pospeselr on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/pospeselr.pub | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index fa8ffa3..a1c091d 100644 --… [View More]

1 0