- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-91.4.0esr-11.0-1] Revert "Bug 1728536 - Fix compilation error with `--disable-maintenance-service`. r?#application-update-reviewers"
by boklm＠torproject.org 15 Dec '21

15 Dec '21

commit 46759c4b9ea37931f18c0627a82009d704260f68 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Dec 15 19:51:18 2021 +0100 Revert "Bug 1728536 - Fix compilation error with `--disable-maintenance-service`. r?#application-update-reviewers" This reverts commit a21cc727a3f1d94581d777c2499ac2e601852b1a. --- toolkit/mozapps/update/updater/updater.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 71be78dca2b8..70ca36dcc3d2 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -3673,7 +3673,6 @@ int NS_main(int argc, NS_tchar** argv) { # endif } -# ifdef MOZ_MAINTENANCE_SERVICE // If we started the elevated updater, and it finished, check the secure // update status file to make sure that it succeeded, and if it did we // need to launch the PostUpdate process in the unelevated updater which @@ -3691,7 +3690,6 @@ int NS_main(int argc, NS_tchar** argv) { } } } -# endif CloseHandle(elevatedFileHandle);

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] Revert "Bug 1728536 - Fix compilation error with `--disable-maintenance-service`. r?#application-update-reviewers"
by boklm＠torproject.org 15 Dec '21

15 Dec '21

commit d069864d14a1574b121ed7cba229ba42e22cfb1f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 10 15:51:43 2021 +0000 Revert "Bug 1728536 - Fix compilation error with `--disable-maintenance-service`. r?#application-update-reviewers" This reverts commit a21cc727a3f1d94581d777c2499ac2e601852b1a. --- toolkit/mozapps/update/updater/updater.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 71be78dca2b8..70ca36dcc3d2 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -3673,7 +3673,6 @@ int NS_main(int argc, NS_tchar** argv) { # endif } -# ifdef MOZ_MAINTENANCE_SERVICE // If we started the elevated updater, and it finished, check the secure // update status file to make sure that it succeeded, and if it did we // need to launch the PostUpdate process in the unelevated updater which @@ -3691,7 +3690,6 @@ int NS_main(int argc, NS_tchar** argv) { } } } -# endif CloseHandle(elevatedFileHandle);

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab-tpo/merge-requests/380'
by boklm＠torproject.org 15 Dec '21

15 Dec '21

commit 7b637e4d2b7d889ebab9f11ecd0ff78f9ad6f697 Merge: 5d2068a 9f7492f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Dec 15 19:28:42 2021 +0100 Merge remote-tracking branch 'gitlab-tpo/merge-requests/380' .../0001-Revert-apple-getentropy-removal.patch | 39 ---------------------- projects/openssl/build | 1 - projects/openssl/config | 6 ++-- 3 files changed, 2 insertions(+), 44 deletions(-)

1 0

[tor-browser-build/master] Bug 40401: Update OpenSSL to 1.1.1m
by boklm＠torproject.org 15 Dec '21

15 Dec '21

commit 9f7492f0101f6ee413834e15c1f93504478b804e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 15 08:05:00 2021 +0000 Bug 40401: Update OpenSSL to 1.1.1m OpenSSL 1.1.1m includes a fix for our #40358. We have to remove our workaround otherwise compilation breaks. Hence, this commit fixes #40390 as well. --- .../0001-Revert-apple-getentropy-removal.patch | 39 ---------------------- projects/openssl/build | 1 - projects/openssl/config | 6 ++-- 3 files changed, 2 insertions(+), 44 deletions(-) diff --git a/projects/openssl/0001-Revert-apple-getentropy-removal.patch b/projects/openssl/0001-Revert-apple-getentropy-removal.patch deleted file mode 100644 index d101203..0000000 --- a/projects/openssl/0001-Revert-apple-getentropy-removal.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8b9e95ae8a9d81b1942be28cba95c35f2303ee2d Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <sysrqb(a)torproject.org> -Date: Fri, 3 Sep 2021 20:48:53 +0000 -Subject: [PATCH] Revert "apple getentropy removal" - -This reverts commit b58ac9f1e3f828b5c65c9edd5bb86603a4886a26. ---- - crypto/rand/rand_unix.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c -index 43f1069d15..2dfced2052 100644 ---- a/crypto/rand/rand_unix.c -+++ b/crypto/rand/rand_unix.c -@@ -34,9 +34,6 @@ - #if defined(__OpenBSD__) - # include <sys/param.h> - #endif --#if defined(__APPLE__) --# include <CommonCrypto/CommonRandom.h> --#endif - - #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) - # include <sys/types.h> -@@ -381,11 +378,6 @@ static ssize_t syscall_random(void *buf, size_t buflen) - if (errno != ENOSYS) - return -1; - } --# elif defined(__APPLE__) -- if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess) -- return (ssize_t)buflen; -- -- return -1; - # else - union { - void *p; --- -2.25.1 - diff --git a/projects/openssl/build b/projects/openssl/build index bf0b16f..f8c4cbf 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -12,7 +12,6 @@ export CC='gcc -m32' # Tricking OpenSSL into using our clang as cross-compiler ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin-cc export CC="cc [% c("var/FLAGS") %]" - patch -p1 < $rootdir/0001-Revert-apple-getentropy-removal.patch [% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] diff --git a/projects/openssl/config b/projects/openssl/config index f0f6ef3..fe730c7 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1l +version: 1.1.1m filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -31,6 +31,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 - - filename: 0001-Revert-apple-getentropy-removal.patch - enable: '[% c("var/osx") %]' + sha256sum: f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96

1 0

[tor-browser-build/master] Bug 40402: Use /bin/bash in list_toolchain_updates
by boklm＠torproject.org 15 Dec '21

15 Dec '21

commit 5d2068aac44fba17083d41164d771762a79e0f29 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 15 09:48:38 2021 +0000 Bug 40402: Use /bin/bash in list_toolchain_updates See: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… for the issue we hit. --- projects/common/list_toolchain_updates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/list_toolchain_updates b/projects/common/list_toolchain_updates index 4cfd829..ebbfe6e 100644 --- a/projects/common/list_toolchain_updates +++ b/projects/common/list_toolchain_updates @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash set -e

1 0

[tor-browser-build/master] Bug 40395: Update how we check node version in list_toolchain_updates_checks
by gk＠torproject.org 14 Dec '21

14 Dec '21

commit f1f4381aaceb2c2c59097bd305ad0307a3dd84f7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 10 12:42:01 2021 +0100 Bug 40395: Update how we check node version in list_toolchain_updates_checks --- projects/firefox/list_toolchain_updates_checks | 28 ++++++++++++++++++++---- projects/geckoview/list_toolchain_updates_checks | 28 ++++++++++++++++++++---- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/projects/firefox/list_toolchain_updates_checks b/projects/firefox/list_toolchain_updates_checks index a308468..26ee3a0 100644 --- a/projects/firefox/list_toolchain_updates_checks +++ b/projects/firefox/list_toolchain_updates_checks @@ -89,12 +89,32 @@ check_update_needed clang "$needed" "$current" # node read -d '' p << 'EOF' || true -if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { - print $1; - exit; +sub l { + ref $_[0] eq 'ARRAY' ? $_[0] : [ $_[0] ]; } + +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/node.yml'); +my $node_toolchain; +T: foreach my $t (keys %$d) { + foreach my $alias (@{l($d->{$t}{run}{'toolchain-alias'})}) { + if ($alias eq 'linux64-node') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + if ($fetch =~ m/^nodejs-.*/) { + $node_toolchain = $fetch; + last T; + } + } + } + } +} + +exit 1 unless $node_toolchain; + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +my ($version) = $fetch->{$node_toolchain}{fetch}{url} =~ m|^https://nodejs.org/dist/v([^/]+)/|; +print "$version\\n"; EOF -needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +needed=$(perl -MYAML::XS -e "$p") current='[% pc("node", "version") %]' check_update_needed node "$needed" "$current" diff --git a/projects/geckoview/list_toolchain_updates_checks b/projects/geckoview/list_toolchain_updates_checks index f31fa51..fef9756 100644 --- a/projects/geckoview/list_toolchain_updates_checks +++ b/projects/geckoview/list_toolchain_updates_checks @@ -180,12 +180,32 @@ check_update_needed clang "$needed" "$current" # node read -d '' p << 'EOF' || true -if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { - print $1; - exit; +sub l { + ref $_[0] eq 'ARRAY' ? $_[0] : [ $_[0] ]; } + +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/node.yml'); +my $node_toolchain; +T: foreach my $t (keys %$d) { + foreach my $alias (@{l($d->{$t}{run}{'toolchain-alias'})}) { + if ($alias eq 'linux64-node') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + if ($fetch =~ m/^nodejs-.*/) { + $node_toolchain = $fetch; + last T; + } + } + } + } +} + +exit 1 unless $node_toolchain; + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +my ($version) = $fetch->{$node_toolchain}{fetch}{url} =~ m|^https://nodejs.org/dist/v([^/]+)/|; +print "$version\\n"; EOF -needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +needed=$(perl -MYAML::XS -e "$p") current='[% pc("node", "version") %]' check_update_needed node "$needed" "$current"

1 0

[tor-browser-build/master] Bug 40395: Update node to 12.22.1
by gk＠torproject.org 14 Dec '21

14 Dec '21

commit a0d781d425cd8ff06e6bc10e0320cec06438c6df Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 10 14:37:42 2021 +0100 Bug 40395: Update node to 12.22.1 --- projects/node/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/node/config b/projects/node/config index 041e5d9..300e59c 100644 --- a/projects/node/config +++ b/projects/node/config @@ -2,8 +2,8 @@ version: '[% c("var/node_version") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: - node_version: 10.23.1 - node_hash: 88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa + node_version: 12.22.1 + node_hash: dd650df7773a6ed3e390320ba51ef33cba6499f0e9397709ea3d1debdcbcb989 container: use_container: 1

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] Bug 1745715 - Process app-bundled fonts before system fonts when initializing the font list, to ensure their families get the expected Base visibility level. r=emilio
by gk＠torproject.org 14 Dec '21

14 Dec '21

commit 6ebf4b5c74896f0d30c061d6c61e98586ff2ca79 Author: Jonathan Kew <jkew(a)mozilla.com> Date: Mon Dec 13 20:09:36 2021 +0000 Bug 1745715 - Process app-bundled fonts before system fonts when initializing the font list, to ensure their families get the expected Base visibility level. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D133667 --- gfx/thebes/gfxFcPlatformFontList.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gfx/thebes/gfxFcPlatformFontList.cpp b/gfx/thebes/gfxFcPlatformFontList.cpp index 41a305c537c4..3b6029bd4353 100644 --- a/gfx/thebes/gfxFcPlatformFontList.cpp +++ b/gfx/thebes/gfxFcPlatformFontList.cpp @@ -1524,17 +1524,21 @@ nsresult gfxFcPlatformFontList::InitFontListForPlatform() { } #endif - // iterate over available fonts - FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem); - AddFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false); - #ifdef MOZ_BUNDLED_FONTS + // https://bugzilla.mozilla.org/show_bug.cgi?id=1745715: + // It's important to do this *before* processing the standard system fonts, + // so that if a family is present in both font sets, we'll treat it as app- + // bundled and therefore always visible. if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) { FcFontSet* appFonts = FcConfigGetFonts(nullptr, FcSetApplication); AddFontSetFamilies(appFonts, policy.get(), /* aAppFonts = */ true); } #endif + // iterate over available fonts + FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem); + AddFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false); + return NS_OK; }

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 14 Dec '21

14 Dec '21

commit 886c911686d7fbd2d7a36874d6ef5fa8c728fbcf Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 13 13:00:02 2021 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 40736: Disable third-party cookies in PBM --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 48005296c6c5..331baa9a6596 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -213,6 +213,7 @@ pref("javascript.options.large_arraybuffers", false); pref("privacy.firstparty.isolate", true); // Always enforce first party isolation pref("privacy.partition.network_state", false); // Disable for now until audit pref("network.cookie.cookieBehavior", 1); +pref("network.cookie.cookieBehavior.pbmode", 1); pref("network.http.spdy.allow-push", false); // Disabled for now. See https://bugs.torproject.org/27127 pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633 // Bug 40177: Make sure tracker cookie purging is disabled

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-94.1.1-11.5-1
by Matthew Finkel (＠sysrqb) 10 Dec '21

10 Dec '21

Matthew Finkel pushed new branch tor-browser-94.1.1-11.5-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-94.… You're receiving this email because of your account on gitlab.torproject.org.

1 0