- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 25099: Set nightly version to tbb-nightly.$year.$month.$day
by gk＠torproject.org 19 Nov '19

19 Nov '19

commit 0f019cf3aa17c6b77bb8126a9c4bdf47886238cb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 7 18:16:06 2019 +0200 Bug 25099: Set nightly version to tbb-nightly.$year.$month.$day Include the current day in the nightly version number, so that each build gets a different version number. We get this version number using a perl function, and a "state" variable, so that the day when the build was started is used. This avoids issues when a build is started on a day but finishs on a different day. In the nightly directory, the builds are now stored using the version instead of just the date. We also allow overriding this version number by using the TORBROWSER_NIGHTLY_VERSION environment variable. This could be useful for example if you need to generate incremental mars for the version from the previous day. --- README | 2 +- projects/firefox/get-moz-build-date | 5 ++--- projects/release/config | 3 +-- rbm.conf | 9 ++++++++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README b/README index 6dc5112..d77a460 100644 --- a/README +++ b/README @@ -62,7 +62,7 @@ channel you want to build: You can find the build result in the directory release/unsigned/$version or alpha/unsigned/$version for release or alpha builds. The result of -nightly can be found in the nightly/$date directory. +nightly can be found in the nightly/$version directory. If you want to build for a specific platform only, append the platform name to the makefile target: diff --git a/projects/firefox/get-moz-build-date b/projects/firefox/get-moz-build-date index 4e55c92..e6989ff 100755 --- a/projects/firefox/get-moz-build-date +++ b/projects/firefox/get-moz-build-date @@ -6,9 +6,8 @@ use strict; die "wrong number of arguments" unless @ARGV == 2; my ($year, $version) = @ARGV; 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); +if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) { + $date = sprintf("%d%02d%02d010101", $1, $2, $3); } else { my @v = split(/[\.ab]/, $version); push @v, '0' if @v < 4; diff --git a/projects/release/config b/projects/release/config index c705a6f..17db3d0 100644 --- a/projects/release/config +++ b/projects/release/config @@ -4,7 +4,6 @@ output_dir: release var: signed_status: unsigned - today: '[% USE date; date.format(format = "%Y-%m-%d") %]' publish_dir: '[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %]' containers_target: with_containers @@ -74,7 +73,7 @@ targets: output_dir: 'nightly' var: build_target: nightly - publish_dir: '[% c("var/today") %]' + publish_dir: '[% c("version") %]' alpha: output_dir: alpha diff --git a/rbm.conf b/rbm.conf index 4a90ccc..f0ae4f9 100644 --- a/rbm.conf +++ b/rbm.conf @@ -147,7 +147,7 @@ targets: var: nightly: 1 channel: nightly - torbrowser_version: tbb-nightly + torbrowser_version: '[% ENV.TORBROWSER_NIGHTLY_VERSION ? ENV.TORBROWSER_NIGHTLY_VERSION : c("var_p/nightly_torbrowser_version") %]' torbrowser-testbuild: - testbuild @@ -508,5 +508,12 @@ ENV: my ($out) = capture_exec('sudo', 'runc', '--version'); return $out =~ m/^.*spec: 1\.[0-9]+\.[0-9]+(?:-dev)?$/m; }, + nightly_torbrowser_version => sub { + state $version = ''; + return $version if $version; + my (undef, undef, undef, $day, $mon, $year) = gmtime; + $version = sprintf("tbb-nightly.%u.%02u.%02u", $year + 1900, $mon + 1, $day); + return $version; + }, }, )

1 0

[tor-browser-build/master] Bug 25099: Remove the alpha_nightly target
by gk＠torproject.org 19 Nov '19

19 Nov '19

commit 07ffaa91443f12ed53b0bbe9645c1f2666e9f39e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 14 23:43:50 2019 +0100 Bug 25099: Remove the alpha_nightly target --- .gitignore | 1 - Makefile | 33 --------------------------------- README | 9 +-------- README.MAKEFILE | 11 ----------- projects/release/config | 6 ------ 5 files changed, 1 insertion(+), 59 deletions(-) diff --git a/.gitignore b/.gitignore index efd3840..8239960 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ /out /release /alpha -/alpha_nightly /nightly /testbuild /rbm.local.conf diff --git a/Makefile b/Makefile index 9f61bfb..6edb7e3 100644 --- a/Makefile +++ b/Makefile @@ -110,39 +110,6 @@ nightly-osx-x86_64: submodule-update nightly-src: submodule-update $(rbm) build release --target nightly --target torbrowser-src -alpha_nightly: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-all - -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-android-x86_64: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-android-x86_64 - -alpha_nightly-android-aarch64: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-android-aarch64 - -alpha_nightly-linux-x86_64: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 - -alpha_nightly-linux-i686: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-linux-i686 - -alpha_nightly-windows-i686: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-windows-i686 - -alpha_nightly-windows-x86_64: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-windows-x86_64 - -alpha_nightly-osx-x86_64: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-osx-x86_64 - -alpha_nightly-src: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-src - testbuild: submodule-update $(rbm) build release --target testbuild --target torbrowser-all diff --git a/README b/README index 481db2e..6dc5112 100644 --- a/README +++ b/README @@ -59,17 +59,10 @@ channel you want to build: $ make release $ make alpha $ make nightly - $ make alpha_nightly You can find the build result in the directory release/unsigned/$version or alpha/unsigned/$version for release or alpha builds. The result of -nightly or alpha_nightly can be found in the nightly/$date or -alpha_nightly/$date directory. - -The alpha and alpha_nightly make target will build the same thing. The -only difference is the output directory. The alpha_nightly target can be -useful if you want to do a test build without polluting your alpha -directory. +nightly can be found in the nightly/$date directory. If you want to build for a specific platform only, append the platform name to the makefile target: diff --git a/README.MAKEFILE b/README.MAKEFILE index e106ca4..e07224e 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -36,17 +36,6 @@ nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, ----------------------------------------------------------------------- Same as nightly, for the selected platform only. -alpha_nightly -------------- -Build Tor Browser for the alpha channel, for all supported platforms. -This is the same as 'make alpha', but the output directory is different. -The resulting build can be found in directory alpha_nightly/$date - -alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86,android-x86_64,android-aarch64} ------------------------------------------------------------------------------ -The same as alpha_nightly, for the selected platform only. - testbuild --------- Build a Tor Browser test build. To make the build faster, only the en-US diff --git a/projects/release/config b/projects/release/config index d1aee8c..c705a6f 100644 --- a/projects/release/config +++ b/projects/release/config @@ -76,12 +76,6 @@ targets: build_target: nightly publish_dir: '[% c("var/today") %]' - alpha_nightly: - output_dir: 'alpha_nightly' - var: - build_target: alpha - publish_dir: '[% c("var/today") %]' - alpha: output_dir: alpha var:

1 0

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

19 Nov '19

commit da23c8cd79dab16f1848cacde60be0588c0d59a5 Merge: a750c93 0f019cf Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 19 10:03:21 2019 +0000 Merge remote-tracking branch 'boklm/bug_25099_v10' .gitignore | 1 - Makefile | 33 --------------------------------- README | 9 +-------- README.MAKEFILE | 11 ----------- projects/firefox/get-moz-build-date | 5 ++--- projects/release/config | 9 +-------- rbm.conf | 9 ++++++++- 7 files changed, 12 insertions(+), 65 deletions(-)

1 0

[tor-browser-build/maint-9.0] Bump NoScript to 11.0.8
by gk＠torproject.org 18 Nov '19

18 Nov '19

commit a8066f0972088860ac44ebb66da5b3c036f47135 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 18 08:43:36 2019 +0000 Bump NoScript to 11.0.8 Fixes #32362 and #32429 on our side --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index f78b4f8..908a6a1 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: b068f8e1bd7d53e7a2d6959e5449621d0ae073c5f12271e027aad13a1e837961 + sha256sum: 0e3f0cfbf3563f0f6d6153d47833101b53e593ebcf6feee2e881d2516a4ce0c0 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Bump NoScript to 11.0.8
by gk＠torproject.org 18 Nov '19

18 Nov '19

commit a750c9303469cd524c9091bbebca95a7905de912 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 18 08:43:36 2019 +0000 Bump NoScript to 11.0.8 Fixes #32362 and #32429 on our side --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 56c13bc..908a6a1 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: bc7063510c201cdb32d4569ebed7cdac95e565dbe50dcae0a92a0233f80f747a + sha256sum: 0e3f0cfbf3563f0f6d6153d47833101b53e593ebcf6feee2e881d2516a4ce0c0 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Bug 32509: Add comment explaining cbindgen vendoring
by boklm＠torproject.org 15 Nov '19

15 Nov '19

commit ead3b276006b68a7eecac3f29f09c1d4df76350c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 15 15:03:45 2019 +0000 Bug 32509: Add comment explaining cbindgen vendoring --- projects/cbindgen/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/cbindgen/config b/projects/cbindgen/config index 69014bf..ddfb9f9 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -11,5 +11,6 @@ input_files: - project: container-image - name: rust project: rust + # `cargo vendor vendor` in the `cbindgen` directory has vendored the sources. - URL: https://people.torproject.org/~boklm/mirrors/sources/cbindgen-vendor.tar.bz2 sha256sum: f4cde3d56df893b543b35b7e4a6e295a275dbb3cee8e8eae549efe679db50ab9

1 0

[tor-browser-build/master] Fold in stable changelog
by gk＠torproject.org 09 Nov '19

09 Nov '19

commit b27585dfd29b08977cc4dc7b9d27103b995466d6 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Nov 9 07:20:29 2019 +0000 Fold in stable changelog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index dda1936..d010aa3 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -33,6 +33,28 @@ Tor Browser 9.5a2 -- November 11 2019 * Android * Bug 28803: Integrate building Pluggable Transports for Android +Tor Browser 9.0.1 -- November 4 2019 + * All Platforms + * Update NoScript to 11.0.4 + * Bug 21004: Don't block JavaScript on onion services on medium security + * Bug 27307: NoScript marks HTTP onions as not secure + * Bug 30783: Fundraising banner for EOY 2019 campain + * Bug 32321: Don't ping Mozilla for Man-in-the-Middle-detection + * Bug 27268: Preferences clean-up + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.20.2 + * Bug 32164: Trim each received log line from tor + * Translations update + * Bug 31803: Replaced about:debugging logo with flat version + * Bug 31764: Fix for error when navigating via 'Paste and go' + * Bug 32169: Fix TB9 Wikipedia address bar search + * Bug 32210: Hide the tor pane when using a system tor + * Bug 31658: Use builtin --panel-disabled-color for security level text + * Bug 32188: Fix localization on about:preferences#tor + * Bug 32184: Red dot is shown while downloading an update + * Android + * Bug 32342: Crash when changing the browser locale + Tor Browser 9.5a1 -- October 23 2019 * All Platforms * Update Firefox to 68.2.0esr

1 0

[tor-browser-build/master] Pick up changes for build6
by gk＠torproject.org 07 Nov '19

07 Nov '19

commit 95bc7fde8230aab8fdb3cc87a1d8143f400c25e4 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 7 22:13:05 2019 +0000 Pick up changes for build6 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 8c26eb9..3c57c71 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-build4' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build5' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index f8caf37..dda1936 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 9.5a2 -- November 8 2019 +Tor Browser 9.5a2 -- November 11 2019 * All Platforms * Update NoScript to 11.0.7 * Bug 21004: Don't block JavaScript on onion services on medium security @@ -7,6 +7,7 @@ Tor Browser 9.5a2 -- November 8 2019 * Bug 32321: Don't ping Mozilla for Man-in-the-Middle-detection * Bug 32318: Backport Mozilla's fix for bug 1534339 * Bug 32250: Backport enhanced letterboxing support (bug 1546832 and 1556017) + * Bug 31573: Catch SessionStore.jsm exception * Bug 27268: Preferences clean-up * Windows + OS X + Linux * Update Tor to 0.4.2.3-alpha @@ -29,7 +30,6 @@ Tor Browser 9.5a2 -- November 8 2019 * Build System * All Platforms * Bug 32413: Bump Go version to 1.12.13 - * Bug 32053: Compile Rust code with -O1 to avoid reproducibility issues * Android * Bug 28803: Integrate building Pluggable Transports for Android diff --git a/rbm.conf b/rbm.conf index c6da42c..4a90ccc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a2' - torbrowser_build: 'build5' + torbrowser_build: 'build6' torbrowser_incremental_from: - 9.5a1 project_name: tor-browser

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Revert "Bug 32053: Work around Rust related reproducibility issues"
by gk＠torproject.org 07 Nov '19

07 Nov '19

commit b223504c86b01d2e8d80daad4efe8f009e6b8879 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 7 22:07:02 2019 +0000 Revert "Bug 32053: Work around Rust related reproducibility issues" This reverts commit f1f9fa0286982d1fa486880ad6037e1e7a46457d as it would otherwise cause build bustage on Linux (see: #32426) --- Cargo.toml | 2 +- build/moz.configure/toolchain.configure | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index cb317e882847..7a0ba6d7abad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,7 @@ debug-assertions = true panic = "abort" [profile.release] -opt-level = 1 +opt-level = 2 rpath = false debug-assertions = false panic = "abort" diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index f5a6ea7b3bc3..3bcf403bceec 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1876,8 +1876,8 @@ js_option(env='RUSTC_OPT_LEVEL', nargs=1, help='Rust compiler optimization level (-C opt-level=%s)') -# Use -O1 as a workaround for reproducibility issues for now, see #32053. -imply_option('RUSTC_OPT_LEVEL', '1', when='--enable-release') +# --enable-release kicks in full optimizations. +imply_option('RUSTC_OPT_LEVEL', '2', when='--enable-release') @depends('RUSTC_OPT_LEVEL', moz_optimize)

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 31573: Catch SessionStore.jsm exception
by gk＠torproject.org 07 Nov '19

07 Nov '19

commit 739c353b91d30238977a20b31b7ecf624c17006b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 7 14:27:14 2019 +0000 Bug 31573: Catch SessionStore.jsm exception This is a backport of the fix for Mozilla's bug 1591259. --- dom/push/PushComponents.jsm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dom/push/PushComponents.jsm b/dom/push/PushComponents.jsm index 99b1d2baffac..fb2a601bc88d 100644 --- a/dom/push/PushComponents.jsm +++ b/dom/push/PushComponents.jsm @@ -88,12 +88,28 @@ PushServiceBase.prototype = { } if (topic === "sessionstore-windows-restored") { Services.obs.removeObserver(this, "sessionstore-windows-restored"); - this._handleReady(); + try { + this._handleReady(); + } catch (ex) { + // NS_ERROR_NOT_AVAILABLE will get thrown for the PushService getter + // if the PushService is disabled. + if (ex.result != Cr.NS_ERROR_NOT_AVAILABLE) { + throw ex; + } + } return; } if (topic === "android-push-service") { // Load PushService immediately. - this._handleReady(); + try { + this._handleReady(); + } catch (ex) { + // NS_ERROR_NOT_AVAILABLE will get thrown for the PushService getter + // if the PushService is disabled. + if (ex.result != Cr.NS_ERROR_NOT_AVAILABLE) { + throw ex; + } + } } },

1 0