- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40045: Fix complete .mar file creation for dmg2mar
by gk＠torproject.org 27 Aug '20

27 Aug '20

commit 340d124db3ef1f1ac173f28b2ceb5c8532e99797 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Aug 19 15:33:58 2020 +0000 Bug 40045: Fix complete .mar file creation for dmg2mar --- projects/release/dmg2mar | 2 +- tools/dmg2mar | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/projects/release/dmg2mar b/projects/release/dmg2mar index d6175f5..42fae50 100644 --- a/projects/release/dmg2mar +++ b/projects/release/dmg2mar @@ -1,4 +1,4 @@ #!/bin/bash [% c("var/set_default_env") -%] cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version") %] -[% shell_quote(c("basedir")) %]/tools/dmg2mar +[% shell_quote(c("basedir")) %]/tools/dmg2mar [% c("var/channel") %] diff --git a/tools/dmg2mar b/tools/dmg2mar index 9b98956..13a4c9e 100755 --- a/tools/dmg2mar +++ b/tools/dmg2mar @@ -103,6 +103,7 @@ sub get_dmg_files_from_sha256sums { } sub convert_files { + my ($channel) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { print "Finished $_[2]\n" }); foreach my $file (get_dmg_files_from_sha256sums) { @@ -140,9 +141,13 @@ sub convert_files { find($wanted, "$tmpdir/$appname.app"); unlink $output; + local $ENV{MOZ_PRODUCT_VERSION} = $file->{version}; + local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', $output, "$tmpdir/$appname.app"); exit_error "Error updating $output: $err" unless $success; + exit_error "make_full_update.sh failed. $output does not exist." + unless -f $output; $pm->finish; } $pm->wait_all_children; @@ -164,6 +169,10 @@ sub remove_incremental_mars { # Set LC_ALL=C to avoid reproducibility issues when creating mar files $ENV{LC_ALL} = 'C'; + +exit_error "Please specify update channel" unless @ARGV == 1; +my $channel = $ARGV[0]; + extract_martools; -convert_files; +convert_files $channel; remove_incremental_mars;

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/38' into master
by gk＠torproject.org 27 Aug '20

27 Aug '20

commit f7ca0b7eb215dd909197a4a2d35f96fdb186f172 Merge: bdcf6b3 81bae4a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 27 17:34:41 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/38' into master projects/release/dmg2mar | 2 +- tools/dmg2mar | 11 ++++++++++- tools/update-responses/update_responses | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] fixup! Bug 40027: Fix incremental .mar creation for esr78
by gk＠torproject.org 27 Aug '20

27 Aug '20

commit 81bae4ade31e803fb3627ad0283e020331d1a21c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Aug 24 17:41:58 2020 +0000 fixup! Bug 40027: Fix incremental .mar creation for esr78 --- tools/update-responses/update_responses | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index de703ee..b07d937 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -230,8 +230,8 @@ sub create_incremental_mar { exit_error "Missing code signature while creating $mar_file"; } } - $ENV{MOZ_PRODUCT_VERSION} = $new_version; - $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; + local $ENV{MOZ_PRODUCT_VERSION} = $new_version; + local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; my ($out, $err, $success) = capture_exec('make_incremental_update.sh', $mar_file_path, "$tmpdir/A", "$tmpdir/B"); if (!$success) {

1 0

[torbutton/master] Bug 40006: Fix new identity for 81
by gk＠torproject.org 26 Aug '20

26 Aug '20

commit 72cbb6d501aa798a676da9331e686581ee4038cf Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Aug 26 12:29:31 2020 +0200 Bug 40006: Fix new identity for 81 New identity tries to disable some buttons to prevent them from being clicked while doing a new identity. These are now initialized lazily, which makes the current code fail. Instead of doing that, we now avoid disabling the buttons and ignore new identity requests while one is in progress. --- chrome/content/torbutton.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 0d2e7e2d..a9d4ccd1 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -760,15 +760,18 @@ torbutton_new_circuit = function() { gBrowser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE); } +let newIdentityInProgress = false; + // Bug 1506 P4: Needed for New Identity. torbutton_new_identity = async function() { try { - // Make sure that we can only click once on New Identiy to avoid race + // Ignore if there's a New Identity in progress to avoid race // conditions leading to failures (see bug 11783 for an example). - // TODO: Remove the Torbutton menu entry again once we have done our - // security control redesign. - document.getElementById("menu_newIdentity").disabled = true; - document.getElementById("appMenuNewIdentity").disabled = true; + if (newIdentityInProgress) { + return; + } + + newIdentityInProgress = true; let shouldConfirm = m_tb_prefs.getBoolPref("extensions.torbutton.confirm_newnym"); @@ -789,14 +792,9 @@ torbutton_new_identity = async function() { if (confirmed) { await torbutton_do_new_identity(); - } else { - // TODO: Remove the Torbutton menu entry again once we have done our - // security control redesign. - document.getElementById("menu_newIdentity").disabled = false; - document.getElementById("appMenuNewIdentity").disabled = false; } } else { - await torbutton_do_new_identity(); + await torbutton_do_new_identity(); } } catch(e) { // If something went wrong make sure we have the New Identity button @@ -805,8 +803,8 @@ torbutton_new_identity = async function() { // security control redesign. torbutton_log(5, "Unexpected error on new identity: " + e); window.alert("Torbutton: Unexpected error on new identity: " + e); - document.getElementById("menu_newIdentity").disabled = false; - document.getElementById("appMenuNewIdentity").disabled = false; + } finally { + newIdentityInProgress = false; } }

1 0

[tor-browser-build/master] Bug 40031: Add licenses for kcp-go and smux.
by gk＠torproject.org 25 Aug '20

25 Aug '20

commit bdcf6b3b2b330e40260a0d17742ec37a890365fd Author: David Fifield <david(a)bamsoftware.com> Date: Tue Aug 25 20:15:53 2020 -0600 Bug 40031: Add licenses for kcp-go and smux. kcp-go$ git show 831b5b267373f6fbd3548849a3925c4e70806de2:LICENSE smux$ git show c6969d8a76874342611f4b544d05b1590f1a76b1:LICENSE --- .../Docs/Licenses/PluggableTransports/LICENSE | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE index d216374..fd0dbd6 100644 --- a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE +++ b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE @@ -210,3 +210,55 @@ To the extent possible under law, the authors have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty. See LICENSE.CC0. + +=============================================================================== + +xtaci/kcp-go + +The MIT License (MIT) + +Copyright (c) 2015 Daniel Fu + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +=============================================================================== + +xtaci/smux + +MIT License + +Copyright (c) 2016-2017 Daniel Fu + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.

1 0

[tor-browser-build/maint-9.5] Add repo for macOS Big Sur fix
by gk＠torproject.org 25 Aug '20

25 Aug '20

commit 0374ac5abf3927c23f06cc8f48198420df74e56e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 25 14:33:21 2020 +0000 Add repo for macOS Big Sur fix --- 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 922e875..6186d71 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -6,7 +6,7 @@ Tor Browser 9.5.4 -- August 25 2020 * Windows + OS X + Linux * Bug 40019: Onion-Location should not be processed on .onion webpages [tor-browser] * OS X - * Bug 40015: Tor Browser is broken on MacOS 11 Big Sur + * Bug 40015: Tor Browser is broken on MacOS 11 Big Sur [tor-browser] Tor Browser 9.5.3 -- July 28 2020 * All Platforms

1 0

[tor-browser-build/master] Bug 40046: Use Go 1.14.x series
by sysrqb＠torproject.org 24 Aug '20

24 Aug '20

commit 2ed67f3368a9de4822ba30714f4f1c8e594454ca Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 22 14:03:20 2020 +0000 Bug 40046: Use Go 1.14.x series Specifically, use Go 1.14.7 for now. Thanks, cypherpunk, for the reminder. --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 0188eb1..24ab09a 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.13.15 +version: 1.14.7 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 5fb43171046cf8784325e67913d55f88a683435071eef8e9da1aa8a1588fcf5d + sha256sum: 064392433563660c73186991c0a315787688e7c38a561e26647686f89b6c30e3 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40046_v2'
by sysrqb＠torproject.org 24 Aug '20

24 Aug '20

commit 4cc1216668d26fb209b480e898ec1f6ef8958d75 Merge: 4861f97 2ed67f3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Aug 24 18:56:34 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40046_v2' projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_34234'
by sysrqb＠torproject.org 24 Aug '20

24 Aug '20

commit 4861f97c0f74bb1f69d422cdf6967a6628a05031 Merge: d3c7af8 8feea5a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Aug 24 18:53:59 2020 +0000 Merge remote-tracking branch 'gkgl/bug_34234' README | 2 +- projects/debootstrap-image/config | 7 ------- projects/https-everywhere/config | 6 +++--- rbm.conf | 8 ++++---- 4 files changed, 8 insertions(+), 15 deletions(-)

1 0

[tor-browser-build/master] Bug 34234: Move HTTPS Everywhere build to Debian Buster
by sysrqb＠torproject.org 24 Aug '20

24 Aug '20

commit 8feea5ace569b0529d6281b98d95340a0414ce91 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 21 13:18:36 2020 +0000 Bug 34234: Move HTTPS Everywhere build to Debian Buster Additionally, clean up all Debian Stretch references. --- README | 2 +- projects/debootstrap-image/config | 7 ------- projects/https-everywhere/config | 6 +++--- rbm.conf | 8 ++++---- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/README b/README index a95f466..3e98d02 100644 --- a/README +++ b/README @@ -193,7 +193,7 @@ of containers: the container-image project is still called, but it will just create an empty file instead of a real container image. The build without containers is currently only supported for the Android -builds, and will require that you run Debian Stretch and install build +builds, and will require that you run Debian Buster and install build dependencies for all the components that are built. This can be done with the following command: diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 8e83d81..6ee4a64 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -56,13 +56,6 @@ targets: arch: amd64 debootstrap_mirror: "http://archive.debian.org/debian/" - stretch-amd64: - var: - minimal_apt_version: 1.4.9 - container: - suite: stretch - arch: amd64 - buster-amd64: var: minimal_apt_version: 1.8.2 diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index a5be759..f75a841 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -10,14 +10,14 @@ var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid # building the same thing 4 times, using 4 different container images # (each one with a different suite or architecture), we set the container - # to stretch/amd64 for all platforms. This allows us to create only one + # to buster/amd64 for all platforms. This allows us to create only one # container image, and also build the extension only one time as the # filename does not contain the platform, and var/build_id should be # the same since there is now nothing platform specific in the build # inputs. This allows us to save a little time and disk space. container: use_container: 1 - suite: stretch + suite: buster arch: amd64 deps: - git @@ -34,4 +34,4 @@ input_files: - project: python name: python target_prepend: - - common-stretch + - common-buster diff --git a/rbm.conf b/rbm.conf index 8f1143e..ac56689 100644 --- a/rbm.conf +++ b/rbm.conf @@ -179,13 +179,13 @@ targets: # Don't create mar files to save time build_mar: 0 - # The common-stretch target is used to build components that are common to all - # platforms, using Debian stretch. - common-stretch: + # The common-buster target is used to build components that are common to all + # platforms, using Debian Buster. + common-buster: var: common: 1 container: - suite: stretch + suite: buster arch: amd64 pre_pkginst: '' deps:

1 0