September 2018 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 26411: Stop using old MAR format in the second esr60-based stable release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 12d52de1efe093b75a434a10ff0fb8f48fec2858 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 29 17:43:32 2018 +0200 Bug 26411: Stop using old MAR format in the second esr60-based stable release --- Makefile | 6 +++--- projects/tor-browser/build | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b667960..4c21a83 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ signtag-alpha: submodule-update incrementals-release: submodule-update $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals tools/update-responses/download_missing_versions release - MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release + tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release incrementals-alpha: submodule-update @@ -132,9 +132,9 @@ update_responses-alpha: submodule-update dmg2mar-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed - MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target release --target signed + $(rbm) build release --step dmg2mar --target release --target signed tools/update-responses/download_missing_versions release - CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 7211841..4c228a9 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -274,11 +274,6 @@ popd cd $distdir [% IF c("var/build_mar") -%] - [% IF c("var/release") -%] - # Let's use the bzip2 format for now so that users can update to the first - # esr60-based Tor Browser. - export MAR_OLD_FORMAT=1 - [% END -%] # Create full MAR file and compressed package. MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR"

1 0

[tor-browser-build/maint-8.0] Bug 26411: Stop using old MAR format in the second esr60-based stable release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit eea6a6af8765bf1781515fb813a6860ece96fee5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 29 17:43:32 2018 +0200 Bug 26411: Stop using old MAR format in the second esr60-based stable release --- Makefile | 6 +++--- projects/tor-browser/build | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b667960..4c21a83 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ signtag-alpha: submodule-update incrementals-release: submodule-update $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals tools/update-responses/download_missing_versions release - MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release + tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release incrementals-alpha: submodule-update @@ -132,9 +132,9 @@ update_responses-alpha: submodule-update dmg2mar-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed - MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target release --target signed + $(rbm) build release --step dmg2mar --target release --target signed tools/update-responses/download_missing_versions release - CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 5456ad1..219f622 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -266,11 +266,6 @@ popd cd $distdir [% IF c("var/build_mar") -%] - [% IF c("var/release") -%] - # Let's use the bzip2 format for now so that users can update to the first - # esr60-based Tor Browser. - export MAR_OLD_FORMAT=1 - [% END -%] # Create full MAR file and compressed package. MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR"

1 0

[tor-browser-build/master] Fix typo in Changelog
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit ad725d869fda953775dc889d40f8a96a8391ff07 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 6 10:03:01 2018 +0000 Fix typo in Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 693a713..7c33834 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -36,7 +36,7 @@ Tor Browser 8.5a1 -- September 5 2018 * Bug 27221: Purge startup cache if Tor Browser version changed * Bug 26049: Reduce delay for showing update prompt to 1 hour * Bug 25405: Cannot use Moat if a meek bridge is configured - * Bug 27268+27257+27262+26603 : Preferences clean-up + * Bug 27268+27257+27262+26603: Preferences clean-up * Windows * Bug 26381: Work around endless loop during page load and about:tor not loading * Bug 27411: Fix broken security slider and NoScript interaction on Windows

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 27472 - Export MOZILLA_OFFICIAL during Android build
by gk＠torproject.org 05 Sep '18

05 Sep '18

commit bd090e4ef466374ca3c231efa350159f7c0ab96c Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Sep 5 13:38:09 2018 +0000 Bug 27472 - Export MOZILLA_OFFICIAL during Android build --- .mozconfig-android | 1 + 1 file changed, 1 insertion(+) diff --git a/.mozconfig-android b/.mozconfig-android index efcb1c5415c2..45270689fbcd 100755 --- a/.mozconfig-android +++ b/.mozconfig-android @@ -1,6 +1,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize ac_add_options --enable-official-branding

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 27400 - Target Android API 26
by gk＠torproject.org 05 Sep '18

05 Sep '18

commit 641dea421ec41553993b92d79a98394ae541f476 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Sep 4 21:59:41 2018 +0000 Bug 27400 - Target Android API 26 --- old-configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/old-configure.in b/old-configure.in index b740691ab080..6ee9edb5b551 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2084,7 +2084,7 @@ dnl ======================================================== case "$MOZ_BUILD_APP" in mobile/android) - MOZ_ANDROID_SDK(23, 23, 26.0.2, 26.0.0 26.0.0-dev 25.3.2 25.3.1) + MOZ_ANDROID_SDK(26, 26, 26.0.2, 26.0.0 26.0.0-dev 25.3.2 25.3.1) ;; esac

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 27473 - Change app name on Android for Alpha version
by gk＠torproject.org 05 Sep '18

05 Sep '18

commit 3abcd666a37fcf11c3ba01cd628ccd086be5de37 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Sep 5 14:00:01 2018 +0000 Bug 27473 - Change app name on Android for Alpha version --- mobile/android/branding/torbrowser/configure.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/android/branding/torbrowser/configure.sh b/mobile/android/branding/torbrowser/configure.sh index 79b7e718cbfd..5e2dbfc15cf9 100644 --- a/mobile/android/branding/torbrowser/configure.sh +++ b/mobile/android/branding/torbrowser/configure.sh @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -ANDROID_PACKAGE_NAME=org.torproject.torbrowser -MOZ_APP_DISPLAYNAME="Tor Browser for Android" +ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha +MOZ_APP_DISPLAYNAME="Tor Browser for Android (Alpha)" MOZ_UPDATER= MOZ_ANDROID_ANR_REPORTER=

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 1479311 - Don't attempt finding and highlighting a tab's base domain within a javascript: URL. r=snorp
by gk＠torproject.org 05 Sep '18

05 Sep '18

commit 4b66110d0704227ee7e90b7adb092da2d3bf0ac5 Author: Jan Henning <jh+bugzilla(a)buttercookie.de> Date: Fri Aug 3 20:58:46 2018 +0200 Bug 1479311 - Don't attempt finding and highlighting a tab's base domain within a javascript: URL. r=snorp MozReview-Commit-ID: DzE0UJfMcCI --HG-- extra : rebase_source : 2a9bcc74447a8a2862aa3c753f7bd30e1d0361dc --- .../src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java b/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java index f7f237eab1cc..9e8e1041027a 100644 --- a/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java +++ b/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java @@ -335,7 +335,7 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout { } int index = url.indexOf(baseDomain); - if (index == -1) { + if (index == -1 || url.startsWith("javascript:")) { setTitle(url); return; }

1 0

[tor-browser-build/master] Release preparations for 8.5a1
by gk＠torproject.org 03 Sep '18

03 Sep '18

commit f237614a4a08f3fa575cb06f0cdd69006a117b8f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 3 09:35:52 2018 +0000 Release preparations for 8.5a1 Version bumps --- projects/firefox/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 124de7a..8ebbd4f 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") %]-1-build3' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg @@ -9,7 +9,7 @@ gpg_keyring: torbutton.gpg var: firefox_platform_version: 60.2.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 8.0 + torbrowser_branch: 8.5 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 19f16bb..c5ddc0a 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.16.3 +version: 0.2.16.4 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index aeea5e0..c1a3878 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.3.9 +version: 0.3.4.7-rc git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 5cc88e4..cbbbf64 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0' - torbrowser_build: 'build5' + torbrowser_version: '8.5a1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5.6 + - 8.0a10 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Updating changelog for 8.5a1; typo fixes
by gk＠torproject.org 03 Sep '18

03 Sep '18

commit b58707432f5120b1627964dfdea8feefbe605871 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 3 09:33:13 2018 +0000 Updating changelog for 8.5a1; typo fixes --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 55 ++++++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c46f139..693a713 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,50 @@ +Tor Browser 8.5a1 -- September 5 2018 + * All platforms + * Update Firefox to 60.2.0esr + * Update Tor to 0.3.4.7-rc + * Update OpenSSL to 1.0.2p + * Update Torbutton to 2.0.6 + * Bug 27401: Start listening for NoScript before it loads + * Bug 27276: Adapt to new NoScript messaging protocol + * Bug 26884: Use Torbutton to provide security slider on mobile + * Bug 26962: Circuit display onboarding + * Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1 + * Bug 26490: Remove the security slider notification + * Bug 27301: Improve about:tor behavior and appearance + * Bug 27097: Add text for Tor News signup widget + * Bug 27214: Improve the onboarding text + * Translations update + * Update Tor Launcher to 0.2.16.4 + * Bug 25405: Cannot use Moat if a meek bridge is configured + * Bug 27392: Update Moat URLs + * Translations update + * Update HTTPS Everywhere to 2018.8.22 + * Update NoScript to 10.1.9.1 + * Bug 26962: New feature onboarding + * Bug 27403: The onboarding bubble is not always displayed + * Bug 27283: Fix first-party isolation for UI tour + * Bug 27213: Update about:tbupdate to new (about:tor) layout + * Bug 26670: Make canvas permission prompt respect first-party isolation + * Bug 26561: .onion images are not displayed + * Bug 21787: Spoof en-US for date picker + * Bug 21607: Disable WebVR for now until it is properly audited + * Bug 21549: Disable wasm for now until it is properly audited + * Bug 26614: Disable Web Authentication API until it is properly audited + * Bug 27281: Enable Reader View mode again + * Bug 26114: Don't expose navigator.mozAddonManager to websites + * Bug 26048: Fix potentially confusing "restart to update" message + * Bug 27221: Purge startup cache if Tor Browser version changed + * Bug 26049: Reduce delay for showing update prompt to 1 hour + * Bug 25405: Cannot use Moat if a meek bridge is configured + * Bug 27268+27257+27262+26603 : Preferences clean-up + * Windows + * Bug 26381: Work around endless loop during page load and about:tor not loading + * Bug 27411: Fix broken security slider and NoScript interaction on Windows + * Build System + * All Platforms + * Bug 27061: Enable verification of langpacks checksums + * Bug 27178+27179: Add support for xz compression in mar files + Tor Browser 8.0 -- September 5 2018 * All platforms * Update Firefox to 60.2.0esr @@ -131,13 +178,13 @@ Tor Browser 8.0 -- September 5 2018 * Bug 20283: Tor Browser should run without a `/proc` filesystem. * Bug 26354: Set SSE2 support as minimal requirement for Tor Browser 8 * Build System - * All + * All Platforms * Bug 26362+26410: Use old MAR format for first ESR60-based stable * Bug 27020: RBM build fails with runc version 1.0.1 * Bug 26949: Use GitHub repository for STIX * Bug 26773: Add --verbose to the ./mach build flag for firefox * Bug 26319: Don't package up Tor Browser in the `mach package` step - * Bug 27178: add support for xz compression in mar files + * Bug 27178: Add support for xz compression in mar files * Clean up * Windows * Bug 26203: Adapt tor-browser-build/tor-browser for Windows @@ -232,7 +279,7 @@ Tor Browser 8.0a10 -- August 20 2018 * Bug 26951+18022: Fix execdesktop argument passing * Bug 26795: Bump snowflake to 6077141f4a for bug 25600 * Build System - * All + * All Platforms * Bug 26410: Stop using old MAR format in the alpha series * Bug 27020: RBM build fails with runc version 1.0.1 * Bug 26949: Use GitHub repository for STIX @@ -303,7 +350,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 22242: Remove RUNPATH in Linux binaries embedded by selfrando * Bug 26354: Set SSE2 support as minimal requirement for Tor Browser 8 * Build System - * All + * All Platforms * Bug 26362: Use old MAR format for first ESR60-based alpha * Clean up * Windows

1 0

[tor-browser-build/master] Bug 25405: cannot use Moat if a meek bridge is configured
by gk＠torproject.org 03 Sep '18

03 Sep '18

commit 98da9295f4f97a022c7131de7234893d0a6293de Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 26 21:10:44 2018 +0000 Bug 25405: cannot use Moat if a meek bridge is configured When doing Moat things, use a separate profile for the secondary browser (instead of trying to use the main meek helper profile). --- projects/tor-browser/build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 5456ad1..7211841 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -34,6 +34,7 @@ touch "$GENERATEDPREFSPATH" EXTSPATH=TorBrowser/Data/Browser/profile.default/extensions TORCONFIGPATH=TorBrowser/Data/Tor MEEKPROFILEPATH=TorBrowser/Data/Browser/profile.meek-http-helper + MOATPROFILEPATH=TorBrowser/Data/Browser/profile.moat-http-helper mkdir -p "$TBDIR/TorBrowser/Data/Browser/Caches" [% END %] @@ -144,6 +145,13 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/u popd [% END %] +# For platforms for which we need to ship a Moat helper profile in addition +# to a meek one, create it by duplicating the meek one that we just finished +# creating. +if [ ! -z "$MOATPROFILEPATH" ]; then + cp -pR $TBDIR/$MEEKPROFILEPATH $TBDIR/$MOATPROFILEPATH +fi + [% IF ! c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH" [% END %]

1 0