- tbb-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.7.0esr-14.5-1] 3 commits: fixup! MB 1: Mullvad Browser branding
by morgan (＠morgan) 10 Feb '25

10 Feb '25

morgan pushed to branch mullvad-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: dc0c71a8 by Henry Wilkes at 2025-02-10T15:09:49+00:00 fixup! MB 1: Mullvad Browser branding MB 312: Differentiate between release channels. We update the brand.ftl and brand.properties files to add "Alpha" and "Nightly" to the brand names. We update about-wordmark.svg to be different between channels and use context-fill to allow us to customise the appearance in about:mullvad-browser. We add mullvad-about-wordmark-en.ftl to provide the English text equivalent for the wordmark, to be used by screen readers in about:mullvad-browser. We add mullvad-branding.css to provide branding colors for about:mullvad-browser. We drop firefox-wordmark.svg changes since the asset should be unused in Mullvad Browser now that about:mullvad-browser uses about-wordmark instead. We drop unnecessary rules from branding aboutDialog.css and make sure the dialog is large enough to show the wordmark for alpha and nightly. - - - - - f241a1ff by Henry Wilkes at 2025-02-10T15:09:49+00:00 fixup! MB 39: Add home page about:mullvad-browser MB 312: Update the home page for different release channels. We use about-wordmark.svg instead of firefox-wordmark.svg. We use the colors from the mullvad-branding.css sheet to colour the background, link text and outline colors. We now properly support contrast themes, where we do not apply the branding colors. We tweak the sizing and spacing. We switch from XHTML to HTML. We consistently use kebab case for the DOM IDs, rather than camel case. We drop the Open Sans font. - - - - - a6d2abdb by Henry Wilkes at 2025-02-10T15:09:49+00:00 fixup! Mullvad Browser strings MB 312: Drop mullvad-browser string which has been replaced with mullvad-about-wordmark-en. - - - - - 33 changed files: - browser/branding/mb-alpha/content/about-wordmark.svg - browser/branding/mb-alpha/content/aboutDialog.css - browser/branding/mb-alpha/content/firefox-wordmark.svg - browser/branding/mb-alpha/content/jar.mn - + browser/branding/mb-alpha/content/mullvad-branding.css - browser/branding/mb-alpha/locales/en-US/brand.ftl - browser/branding/mb-alpha/locales/en-US/brand.properties - browser/branding/mb-alpha/locales/jar.mn - + browser/branding/mb-alpha/locales/mullvad-about-wordmark-en.ftl - browser/branding/mb-nightly/content/about-wordmark.svg - browser/branding/mb-nightly/content/aboutDialog.css - browser/branding/mb-nightly/content/firefox-wordmark.svg - browser/branding/mb-nightly/content/jar.mn - + browser/branding/mb-nightly/content/mullvad-branding.css - browser/branding/mb-nightly/locales/en-US/brand.ftl - browser/branding/mb-nightly/locales/en-US/brand.properties - browser/branding/mb-nightly/locales/jar.mn - + browser/branding/mb-nightly/locales/mullvad-about-wordmark-en.ftl - browser/branding/mb-release/content/about-wordmark.svg - browser/branding/mb-release/content/aboutDialog.css - browser/branding/mb-release/content/firefox-wordmark.svg - browser/branding/mb-release/content/jar.mn - + browser/branding/mb-release/content/mullvad-branding.css - browser/branding/mb-release/locales/en-US/brand.properties - browser/branding/mb-release/locales/jar.mn - + browser/branding/mb-release/locales/mullvad-about-wordmark-en.ftl - browser/components/about/AboutRedirector.cpp - browser/components/mullvad-browser/content/aboutMullvadBrowser.css - browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml → browser/components/mullvad-browser/content/aboutMullvadBrowser.html - − browser/components/mullvad-browser/content/mullvadBrowserFont.css - browser/components/mullvad-browser/jar.mn - toolkit/content/license.html - toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/f3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/f3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Pushed new branch 23-revert-full-dbus-session-access
by intrigeri (＠intrigeri) 10 Feb '25

10 Feb '25

intrigeri pushed new branch 23-revert-full-dbus-session-access at The Tor Project / Applications / torbrowser-launcher -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tree/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] fixup! TB 21952: Implement Onion-Location
by morgan (＠morgan) 10 Feb '25

10 Feb '25

morgan pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 983bf5de by Henry Wilkes at 2025-02-10T14:38:02+00:00 fixup! TB 21952: Implement Onion-Location TB 43406: Hide the "onion available" button whilst the "Connect" button is shown. - - - - - 1 changed file: - browser/components/onionservices/content/onionlocation.css Changes: ===================================== browser/components/onionservices/content/onionlocation.css ===================================== @@ -5,3 +5,18 @@ -moz-context-properties: fill; fill: currentColor; } + +#tor-connect-urlbar-button:not([hidden]) ~ #onion-location-box { + /* Hide this button whilst the "Connect" button is shown. tor-browser#43406. + * This should only make a difference when the tor process dies mid-session. + * NOTE: We do not attempt to re-assign focus since the user should already + * have had their attention disrupted when the tor process dies mid-session. + * NOTE: If we hide this whilst the onion location popup is shown, the popup + * will instead become anchored to the site identity (padlock) button instead, + * but will return to the #onion-location-box once the "Connect" button is + * hidden again. In principle we could explicitly call + * PopupNotifications.anchorVisibilityChange() but mozilla code already has + * plenty of entry points to update the anchor position for us. + * Moreover, this scenario is expected to be a very rare. */ + display: none; +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/983bf5d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/983bf5d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-14.0] 4 commits: Bug 41314: Add tools/setup-martools and tools/mar
by morgan (＠morgan) 10 Feb '25

10 Feb '25

morgan pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build Commits: 59657d1f by Nicolas Vigier at 2025-02-10T14:29:54+00:00 Bug 41314: Add tools/setup-martools and tools/mar tools/setup-martools will download and extract mar-tools to tools/local/mar-tools (if not already present). tools/mar will run mar after running tools/setup-martools. - - - - - daee5b1b by Nicolas Vigier at 2025-02-10T14:31:10+00:00 Bug 41314: Use setup-martools in update_responses - - - - - cf76529e by Nicolas Vigier at 2025-02-10T14:31:11+00:00 Bug 41314: Update mar-tools version in projects/mar-tools/config - - - - - 85f32e7a by Nicolas Vigier at 2025-02-10T14:31:11+00:00 Bug 41314: Use setup-martools in dmg2mar - - - - - 8 changed files: - projects/mar-tools/config - tools/dmg2mar - + tools/mar - + tools/setup-martools - tools/signing/machines-setup/setup-signing-machine - tools/signing/machines-setup/upload-tbb-to-signing-machine - + tools/signmar - tools/update-responses/update_responses Changes: ===================================== projects/mar-tools/config ===================================== @@ -1,20 +1,22 @@ # vim: filetype=yaml sw=2 # # Used by tools/signing/machines-setup/upload-tbb-to-signing-machine -# to fetch mar-tools for signing machine setup +# to fetch mar-tools for signing machine setup, and by tools/setup-martools +# to allow running `mar` as `tools/mar`. # -version: 12.0.4 -filename: 'mar-tools-linux64.zip' +version: 14.0.4 +filename: 'mar-tools.zip' container: use_container: 0 gpg_keyring: torbrowser.gpg tag_gpg_id: 1 input_files: - - URL: 'https://archive.torproject.org/tor-package-archive/torbrowser/[% c("version") %]/mar-tools-linux64.zip' - sha256sum: 726ec4192de61a9342b3262c7ac722cbd59eaba07879be9589c65599d2d69584 + - URL: 'https://archive.torproject.org/tor-package-archive/torbrowser/[% c("version") %]/mar-tools-linux-x86_64-[% c("version") %].zip' + sha256sum: 414254d2471c7f0bcc25de955dbbe716c416d0b80e7688dc2dd48ac6e7fdbf0a steps: fetch_martools: fetch_martools: | #!/bin/bash - echo ok + mkdir -p '[% dest_dir %]' + cp -f mar-tools-linux-x86_64-[% c("version") %].zip '[% dest_dir %]/mar-tools.zip' ===================================== tools/dmg2mar ===================================== @@ -34,6 +34,7 @@ use File::Slurp; use File::Find; use Parallel::ForkManager; use Cwd; +use FindBin; # If the application is not TorBrowser (for instance, TorMessenger) # set the application name in the TOR_APPNAME_BUNDLE_OSX, @@ -70,25 +71,18 @@ sub osname { exit_error 'Unknown OS'; } -my $martools_tmpdir; -sub extract_martools { - my $osname = osname; - my $marzip = glob(getcwd . "/mar-tools-$osname-*.zip"); - exit_error "Could not find mar-tools zip" unless $marzip; - $martools_tmpdir = File::Temp->newdir(); - my $old_cwd = getcwd; - chdir $martools_tmpdir; - my (undef, undef, $success) = capture_exec('unzip', $marzip); - chdir $old_cwd; - exit_error "Error extracting $marzip" unless $success; - $ENV{PATH} = "$martools_tmpdir/mar-tools:$ENV{PATH}"; - if ($ENV{LD_LIBRARY_PATH}) { - $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; - } else { - $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; - } - $ENV{MAR} = "$martools_tmpdir/mar-tools/mar"; - $ENV{MSBDIFF} = "$martools_tmpdir/mar-tools/mbsdiff"; +sub setup_martools { + my ($out, $err, $exit) = capture { + system("$FindBin::Bin/setup-martools"); + }; + exit_error "Error setting up mar-tools: $err" if $exit; + my $martoolsdir = "$FindBin::Bin/local/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} = "$ENV{LD_LIBRARY_PATH}:$martoolsdir"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martoolsdir/mar-tools"; + } + $ENV{PATH} = "$martoolsdir:$ENV{PATH}"; } sub get_nbprocs { @@ -192,6 +186,6 @@ $ENV{LC_ALL} = 'C'; exit_error "Please specify the mar channel id" unless @ARGV == 1; my $mar_channel_id = $ARGV[0]; -extract_martools; +setup_martools; convert_files $mar_channel_id; remove_incremental_mars; ===================================== tools/mar ===================================== @@ -0,0 +1,8 @@ +#!/bin/bash +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +cmdname=$(basename -- "${BASH_SOURCE[0]}") +setupmt=$("$script_dir/setup-martools") +eval "$setupmt" +exec "$MARTOOLSDIR/$cmdname" "$@" ===================================== tools/setup-martools ===================================== @@ -0,0 +1,49 @@ +#!/bin/bash +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +localdir="$script_dir/local" +test $# -eq 1 && localdir="$1" + +cd "$script_dir/.." + +function download_extract_martools { + make submodule-update > /dev/null + martools_version=$(./rbm/rbm showconf --step fetch_martools mar-tools version) + if test -h "$localdir/mar-tools"; then + test "$(readlink $localdir/mar-tools)" = "mar-tools-$martools_version" && return 0 + rm -f "$localdir/mar-tools" + fi + if test -d "$localdir/mar-tools"; then + echo "Error: $localdir/mar-tools already exists and is not a symlink" + exit 1 + fi + echo "Setting up mar-tools" + mkdir -p "$localdir" + cd "$localdir" + if ! test -d "mar-tools-$martools_version"; then + cd "$script_dir/.." + ./rbm/rbm build --step fetch_martools mar-tools + martools_zip="$(pwd)/out/mar-tools/mar-tools.zip" + cd "$localdir" + test -f "$martools_zip" + unzip -jd "mar-tools-$martools_version" "$martools_zip" + fi + ln -sf "mar-tools-$martools_version" mar-tools + echo "mar-tools have been set up in $localdir/mar-tools" +} + +function print_martools_vars { + mardir="$localdir/mar-tools" + if test -z "$LD_LIBRARY_PATH"; then + echo "export LD_LIBRARY_PATH=$mardir" + else + echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$mardir" + fi + echo "export MARTOOLSDIR=$mardir" + echo "export MAR=$mardir/mar" +} + +download_extract_martools >&2 +print_martools_vars ===================================== tools/signing/machines-setup/setup-signing-machine ===================================== @@ -140,7 +140,7 @@ fi # install mar-tools if ! test -d /home/signing-mar/mar-tools; then tmpdir=$(mktemp -d) - unzip -d "$tmpdir" /signing/mar-tools-linux64.zip + unzip -d "$tmpdir" /signing/mar-tools.zip chown -R signing-mar:signing-mar "$tmpdir/mar-tools" chmod go+rX "$tmpdir/mar-tools"/* mv "$tmpdir/mar-tools" /home/signing-mar/mar-tools ===================================== tools/signing/machines-setup/upload-tbb-to-signing-machine ===================================== @@ -25,7 +25,7 @@ git archive --prefix=rbm/ --output="$tmpdir/rbm.tar" HEAD . echo "Created rbm.tar" cd .. -martools_filename=mar-tools-linux64.zip +martools_filename=mar-tools.zip if ! test -f "./out/mar-tools/$martools_filename"; then ./rbm/rbm build --step fetch_martools mar-tools echo "Downloaded $martools_filename" ===================================== tools/signmar ===================================== @@ -0,0 +1 @@ +mar \ No newline at end of file ===================================== tools/update-responses/update_responses ===================================== @@ -33,8 +33,6 @@ my %htdocsfiles; my $releases_dir = $config->{releases_dir}; $releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; -my $initPATH = $ENV{PATH}; -my $initLD_LIBRARY_PATH = $ENV{LD_LIBRARY_PATH}; sub exit_error { print STDERR "Error: ", $_[0], "\n"; @@ -67,6 +65,20 @@ sub get_nbprocs { return 4; } +sub setup_martools { + my ($out, $err, $exit) = capture { + system("$FindBin::Bin/../setup-martools"); + }; + exit_error "Error setting up mar-tools: $err" if $exit; + my $martoolsdir = "$FindBin::Bin/../local/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} = "$ENV{LD_LIBRARY_PATH}:$martoolsdir"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martoolsdir/mar-tools"; + } + $ENV{PATH} = "$martoolsdir:$ENV{PATH}"; +} + sub write_htdocs { my ($channel, $file, $content) = @_; mkdir $htdocsdir unless -d $htdocsdir; @@ -318,7 +330,7 @@ sub version_dir { sub get_buildinfos { my ($config, $version) = @_; return if exists $config->{versions}{$version}{buildID}; - extract_martools($config, $version); + setup_martools; my $files = $config->{versions}{$version}{files}; foreach my $os (keys %$files) { foreach my $lang (keys %{$files->{$os}}) { @@ -498,40 +510,6 @@ sub write_downloads_json { } } -sub marzip_path { - my ($config, $version) = @_; - for my $osname (qw/linux-x86_64 linux-i686 macos-x86_64 windows-x86_64 windows-i686/) { - my $marzip = glob(version_dir($config, $version) . "/mar-tools-$osname-*.zip"); - if ($marzip && -f $marzip) { - return $marzip; - } - } - exit_error 'Could not find mar-tools'; -} - -my $martools_tmpdir; -my $extracted_martools; -sub extract_martools { - my ($config, $version) = @_; - return if $extracted_martools; - my $marzip = marzip_path($config, $version); - $martools_tmpdir = get_tmpdir($config); - my $old_cwd = getcwd; - chdir $martools_tmpdir; - my (undef, undef, $exit) = capture { - system('unzip', $marzip); - }; - chdir $old_cwd; - exit_error "Error extracting $marzip" if $exit; - $ENV{PATH} = "$martools_tmpdir/mar-tools:$initPATH"; - if ($initLD_LIBRARY_PATH) { - $ENV{LD_LIBRARY_PATH} = "$initLD_LIBRARY_PATH:$martools_tmpdir/mar-tools"; - } else { - $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; - } - $extracted_martools = 1; -} - sub log_step { my ($url, $step, $status, $details) = @_; state $u; @@ -701,9 +679,9 @@ my %actions = ( my $channel = $ARGV[0]; exit_error "Unknown channel" unless $config->{channels}{$channel}; my $versions = as_array($config->{channels}{$channel}); + setup_martools; foreach my $version (@$versions) { next unless $config->{versions}{$version}{incremental_from}; - extract_martools($config, $version); get_version_files($config, $version); create_incremental_mars_for_version($config, $version, $channel); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 4 commits: Bug 41314: Add tools/setup-martools and tools/mar
by morgan (＠morgan) 10 Feb '25

10 Feb '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: bbe7bf81 by Nicolas Vigier at 2025-02-10T14:12:04+00:00 Bug 41314: Add tools/setup-martools and tools/mar tools/setup-martools will download and extract mar-tools to tools/local/mar-tools (if not already present). tools/mar will run mar after running tools/setup-martools. - - - - - 7f90f5cd by Nicolas Vigier at 2025-02-10T14:12:04+00:00 Bug 41314: Use setup-martools in update_responses - - - - - 75179413 by Nicolas Vigier at 2025-02-10T14:12:04+00:00 Bug 41314: Update mar-tools version in projects/mar-tools/config - - - - - dbc66b84 by Nicolas Vigier at 2025-02-10T14:12:04+00:00 Bug 41314: Use setup-martools in dmg2mar - - - - - 8 changed files: - projects/mar-tools/config - tools/dmg2mar - + tools/mar - + tools/setup-martools - tools/signing/machines-setup/setup-signing-machine - tools/signing/machines-setup/upload-tbb-to-signing-machine - + tools/signmar - tools/update-responses/update_responses Changes: ===================================== projects/mar-tools/config ===================================== @@ -1,20 +1,22 @@ # vim: filetype=yaml sw=2 # # Used by tools/signing/machines-setup/upload-tbb-to-signing-machine -# to fetch mar-tools for signing machine setup +# to fetch mar-tools for signing machine setup, and by tools/setup-martools +# to allow running `mar` as `tools/mar`. # -version: 12.0.4 -filename: 'mar-tools-linux64.zip' +version: 14.0.4 +filename: 'mar-tools.zip' container: use_container: 0 gpg_keyring: torbrowser.gpg tag_gpg_id: 1 input_files: - - URL: 'https://archive.torproject.org/tor-package-archive/torbrowser/[% c("version") %]/mar-tools-linux64.zip' - sha256sum: 726ec4192de61a9342b3262c7ac722cbd59eaba07879be9589c65599d2d69584 + - URL: 'https://archive.torproject.org/tor-package-archive/torbrowser/[% c("version") %]/mar-tools-linux-x86_64-[% c("version") %].zip' + sha256sum: 414254d2471c7f0bcc25de955dbbe716c416d0b80e7688dc2dd48ac6e7fdbf0a steps: fetch_martools: fetch_martools: | #!/bin/bash - echo ok + mkdir -p '[% dest_dir %]' + cp -f mar-tools-linux-x86_64-[% c("version") %].zip '[% dest_dir %]/mar-tools.zip' ===================================== tools/dmg2mar ===================================== @@ -34,6 +34,7 @@ use File::Slurp; use File::Find; use Parallel::ForkManager; use Cwd; +use FindBin; # If the application is not TorBrowser (for instance, TorMessenger) # set the application name in the TOR_APPNAME_BUNDLE_OSX, @@ -70,25 +71,18 @@ sub osname { exit_error 'Unknown OS'; } -my $martools_tmpdir; -sub extract_martools { - my $osname = osname; - my $marzip = glob(getcwd . "/mar-tools-$osname-*.zip"); - exit_error "Could not find mar-tools zip" unless $marzip; - $martools_tmpdir = File::Temp->newdir(); - my $old_cwd = getcwd; - chdir $martools_tmpdir; - my (undef, undef, $success) = capture_exec('unzip', $marzip); - chdir $old_cwd; - exit_error "Error extracting $marzip" unless $success; - $ENV{PATH} = "$martools_tmpdir/mar-tools:$ENV{PATH}"; - if ($ENV{LD_LIBRARY_PATH}) { - $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; - } else { - $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; - } - $ENV{MAR} = "$martools_tmpdir/mar-tools/mar"; - $ENV{MSBDIFF} = "$martools_tmpdir/mar-tools/mbsdiff"; +sub setup_martools { + my ($out, $err, $exit) = capture { + system("$FindBin::Bin/setup-martools"); + }; + exit_error "Error setting up mar-tools: $err" if $exit; + my $martoolsdir = "$FindBin::Bin/local/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} = "$ENV{LD_LIBRARY_PATH}:$martoolsdir"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martoolsdir/mar-tools"; + } + $ENV{PATH} = "$martoolsdir:$ENV{PATH}"; } sub get_nbprocs { @@ -192,6 +186,6 @@ $ENV{LC_ALL} = 'C'; exit_error "Please specify the mar channel id" unless @ARGV == 1; my $mar_channel_id = $ARGV[0]; -extract_martools; +setup_martools; convert_files $mar_channel_id; remove_incremental_mars; ===================================== tools/mar ===================================== @@ -0,0 +1,8 @@ +#!/bin/bash +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +cmdname=$(basename -- "${BASH_SOURCE[0]}") +setupmt=$("$script_dir/setup-martools") +eval "$setupmt" +exec "$MARTOOLSDIR/$cmdname" "$@" ===================================== tools/setup-martools ===================================== @@ -0,0 +1,49 @@ +#!/bin/bash +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +localdir="$script_dir/local" +test $# -eq 1 && localdir="$1" + +cd "$script_dir/.." + +function download_extract_martools { + make submodule-update > /dev/null + martools_version=$(./rbm/rbm showconf --step fetch_martools mar-tools version) + if test -h "$localdir/mar-tools"; then + test "$(readlink $localdir/mar-tools)" = "mar-tools-$martools_version" && return 0 + rm -f "$localdir/mar-tools" + fi + if test -d "$localdir/mar-tools"; then + echo "Error: $localdir/mar-tools already exists and is not a symlink" + exit 1 + fi + echo "Setting up mar-tools" + mkdir -p "$localdir" + cd "$localdir" + if ! test -d "mar-tools-$martools_version"; then + cd "$script_dir/.." + ./rbm/rbm build --step fetch_martools mar-tools + martools_zip="$(pwd)/out/mar-tools/mar-tools.zip" + cd "$localdir" + test -f "$martools_zip" + unzip -jd "mar-tools-$martools_version" "$martools_zip" + fi + ln -sf "mar-tools-$martools_version" mar-tools + echo "mar-tools have been set up in $localdir/mar-tools" +} + +function print_martools_vars { + mardir="$localdir/mar-tools" + if test -z "$LD_LIBRARY_PATH"; then + echo "export LD_LIBRARY_PATH=$mardir" + else + echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$mardir" + fi + echo "export MARTOOLSDIR=$mardir" + echo "export MAR=$mardir/mar" +} + +download_extract_martools >&2 +print_martools_vars ===================================== tools/signing/machines-setup/setup-signing-machine ===================================== @@ -144,7 +144,7 @@ fi # install mar-tools if ! test -d /home/signing-mar/mar-tools; then tmpdir=$(mktemp -d) - unzip -d "$tmpdir" /signing/mar-tools-linux64.zip + unzip -d "$tmpdir" /signing/mar-tools.zip chown -R signing-mar:signing-mar "$tmpdir/mar-tools" chmod go+rX "$tmpdir/mar-tools"/* mv "$tmpdir/mar-tools" /home/signing-mar/mar-tools ===================================== tools/signing/machines-setup/upload-tbb-to-signing-machine ===================================== @@ -25,7 +25,7 @@ git archive --prefix=rbm/ --output="$tmpdir/rbm.tar" HEAD . echo "Created rbm.tar" cd .. -martools_filename=mar-tools-linux64.zip +martools_filename=mar-tools.zip if ! test -f "./out/mar-tools/$martools_filename"; then ./rbm/rbm build --step fetch_martools mar-tools echo "Downloaded $martools_filename" ===================================== tools/signmar ===================================== @@ -0,0 +1 @@ +mar \ No newline at end of file ===================================== tools/update-responses/update_responses ===================================== @@ -33,8 +33,6 @@ my %htdocsfiles; my $releases_dir = $config->{releases_dir}; $releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; -my $initPATH = $ENV{PATH}; -my $initLD_LIBRARY_PATH = $ENV{LD_LIBRARY_PATH}; sub exit_error { print STDERR "Error: ", $_[0], "\n"; @@ -67,6 +65,20 @@ sub get_nbprocs { return 4; } +sub setup_martools { + my ($out, $err, $exit) = capture { + system("$FindBin::Bin/../setup-martools"); + }; + exit_error "Error setting up mar-tools: $err" if $exit; + my $martoolsdir = "$FindBin::Bin/../local/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} = "$ENV{LD_LIBRARY_PATH}:$martoolsdir"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martoolsdir/mar-tools"; + } + $ENV{PATH} = "$martoolsdir:$ENV{PATH}"; +} + sub write_htdocs { my ($channel, $file, $content) = @_; mkdir $htdocsdir unless -d $htdocsdir; @@ -318,7 +330,7 @@ sub version_dir { sub get_buildinfos { my ($config, $version) = @_; return if exists $config->{versions}{$version}{buildID}; - extract_martools($config, $version); + setup_martools; my $files = $config->{versions}{$version}{files}; foreach my $os (keys %$files) { foreach my $lang (keys %{$files->{$os}}) { @@ -498,40 +510,6 @@ sub write_downloads_json { } } -sub marzip_path { - my ($config, $version) = @_; - for my $osname (qw/linux-x86_64 linux-i686 linux-aarch64 macos-x86_64 windows-x86_64 windows-i686/) { - my $marzip = glob(version_dir($config, $version) . "/mar-tools-$osname-*.zip"); - if ($marzip && -f $marzip) { - return $marzip; - } - } - exit_error 'Could not find mar-tools'; -} - -my $martools_tmpdir; -my $extracted_martools; -sub extract_martools { - my ($config, $version) = @_; - return if $extracted_martools; - my $marzip = marzip_path($config, $version); - $martools_tmpdir = get_tmpdir($config); - my $old_cwd = getcwd; - chdir $martools_tmpdir; - my (undef, undef, $exit) = capture { - system('unzip', $marzip); - }; - chdir $old_cwd; - exit_error "Error extracting $marzip" if $exit; - $ENV{PATH} = "$martools_tmpdir/mar-tools:$initPATH"; - if ($initLD_LIBRARY_PATH) { - $ENV{LD_LIBRARY_PATH} = "$initLD_LIBRARY_PATH:$martools_tmpdir/mar-tools"; - } else { - $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; - } - $extracted_martools = 1; -} - sub log_step { my ($url, $step, $status, $details) = @_; state $u; @@ -701,9 +679,9 @@ my %actions = ( my $channel = $ARGV[0]; exit_error "Unknown channel" unless $config->{channels}{$channel}; my $versions = as_array($config->{channels}{$channel}); + setup_martools; foreach my $version (@$versions) { next unless $config->{versions}{$version}{incremental_from}; - extract_martools($config, $version); get_version_files($config, $version); create_incremental_mars_for_version($config, $version, $channel); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] release: new version, 14.0.6
by morgan (＠morgan) 07 Feb '25

07 Feb '25

morgan pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 9a605b6e by Morgan at 2025-02-07T17:32:30+00:00 release: new version, 14.0.6 - - - - - 56 changed files: - update_3/release/.htaccess - − update_3/release/13.5.10-14.0.4+13.5.11-macos-ALL.xml - update_3/release/13.5.9-14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/13.5.10-14.0.6+13.5.12-linux-i686-ALL.xml - update_3/release/13.5.11-14.0.5+13.5.12-linux-x86_64-ALL.xml → update_3/release/13.5.10-14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/13.5.10-14.0.6+13.5.12-macos-ALL.xml - update_3/release/13.5.10-14.0.5+13.5.12-windows-i686-ALL.xml → update_3/release/13.5.10-14.0.6+13.5.12-windows-i686-ALL.xml - update_3/release/13.5.10-14.0.5+13.5.12-windows-x86_64-ALL.xml → update_3/release/13.5.10-14.0.6+13.5.12-windows-x86_64-ALL.xml - update_3/release/13.5.10-14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/13.5.11-14.0.6+13.5.12-linux-i686-ALL.xml - update_3/release/13.5.9-14.0.5+13.5.12-linux-x86_64-ALL.xml → update_3/release/13.5.11-14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/13.5.11-14.0.6+13.5.12-macos-ALL.xml - update_3/release/13.5.11-14.0.5+13.5.12-windows-i686-ALL.xml → update_3/release/13.5.11-14.0.6+13.5.12-windows-i686-ALL.xml - update_3/release/13.5.11-14.0.5+13.5.12-windows-x86_64-ALL.xml → update_3/release/13.5.11-14.0.6+13.5.12-windows-x86_64-ALL.xml - − update_3/release/13.5.7-14.0.4+13.5.11-macos-ALL.xml - − update_3/release/13.5.9-14.0.4+13.5.11-macos-ALL.xml - update_3/release/14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/13.5.9-14.0.6+13.5.12-linux-i686-ALL.xml - update_3/release/13.5.10-14.0.5+13.5.12-linux-x86_64-ALL.xml → update_3/release/13.5.9-14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/13.5.9-14.0.6+13.5.12-macos-ALL.xml - update_3/release/13.5.9-14.0.5+13.5.12-windows-i686-ALL.xml → update_3/release/13.5.9-14.0.6+13.5.12-windows-i686-ALL.xml - update_3/release/13.5.9-14.0.5+13.5.12-windows-x86_64-ALL.xml → update_3/release/13.5.9-14.0.6+13.5.12-windows-x86_64-ALL.xml - − update_3/release/14.0.1-14.0.4+13.5.11-macos-ALL.xml - − update_3/release/14.0.2-14.0.4+13.5.11-macos-ALL.xml - − update_3/release/14.0.2-14.0.5+13.5.12-linux-x86_64-ALL.xml - − update_3/release/14.0.3-14.0.4+13.5.11-macos-ALL.xml - − update_3/release/14.0.3-14.0.5+13.5.12-windows-i686-ALL.xml - update_3/release/14.0.2-14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/14.0.3-14.0.6+13.5.12-linux-i686-ALL.xml - update_3/release/14.0.3-14.0.5+13.5.12-linux-x86_64-ALL.xml → update_3/release/14.0.3-14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/14.0.3-14.0.6+13.5.12-macos-ALL.xml - update_3/release/14.0.2-14.0.5+13.5.12-windows-i686-ALL.xml → update_3/release/14.0.3-14.0.6+13.5.12-windows-i686-ALL.xml - update_3/release/14.0.2-14.0.5+13.5.12-windows-x86_64-ALL.xml → update_3/release/14.0.3-14.0.6+13.5.12-windows-x86_64-ALL.xml - − update_3/release/14.0.4+13.5.11-macos-ALL.xml - − update_3/release/14.0.4-14.0.5+13.5.12-windows-x86_64-ALL.xml - update_3/release/14.0.4-14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/14.0.4-14.0.6+13.5.12-linux-i686-ALL.xml - update_3/release/14.0.4-14.0.5+13.5.12-linux-x86_64-ALL.xml → update_3/release/14.0.4-14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/14.0.4-14.0.6+13.5.12-macos-ALL.xml - update_3/release/14.0.4-14.0.5+13.5.12-windows-i686-ALL.xml → update_3/release/14.0.4-14.0.6+13.5.12-windows-i686-ALL.xml - update_3/release/14.0.3-14.0.5+13.5.12-windows-x86_64-ALL.xml → update_3/release/14.0.4-14.0.6+13.5.12-windows-x86_64-ALL.xml - update_3/release/14.0.3-14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/14.0.5-14.0.6+13.5.12-linux-i686-ALL.xml - + update_3/release/14.0.5-14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/14.0.5-14.0.6+13.5.12-macos-ALL.xml - + update_3/release/14.0.5-14.0.6+13.5.12-windows-i686-ALL.xml - + update_3/release/14.0.5-14.0.6+13.5.12-windows-x86_64-ALL.xml - update_3/release/13.5.11-14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/14.0.6+13.5.12-linux-i686-ALL.xml - update_3/release/14.0.5+13.5.12-linux-x86_64-ALL.xml → update_3/release/14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/14.0.6+13.5.12-macos-ALL.xml - update_3/release/14.0.5+13.5.12-windows-i686-ALL.xml → update_3/release/14.0.6+13.5.12-windows-i686-ALL.xml - update_3/release/14.0.5+13.5.12-windows-x86_64-ALL.xml → update_3/release/14.0.6+13.5.12-windows-x86_64-ALL.xml - update_3/release/download-android-aarch64.json - update_3/release/download-android-armv7.json - update_3/release/download-android-x86.json - update_3/release/download-android-x86_64.json - update_3/release/download-linux-i686.json - update_3/release/download-linux-x86_64.json - update_3/release/download-macos.json - update_3/release/download-windows-i686.json - update_3/release/download-windows-x86_64.json - update_3/release/downloads.json The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-128.7.0esr-14.0-1-build3
by morgan (＠morgan) 06 Feb '25

06 Feb '25

morgan pushed new tag tor-browser-128.7.0esr-14.0-1-build3 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.7.0esr-14.0-1] BB 43468: ScreenCaptureKit should be a weak link.
by morgan (＠morgan) 06 Feb '25

06 Feb '25

morgan pushed to branch mullvad-browser-128.7.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 0100be62 by Pier Angelo Vendrame at 2025-02-06T18:28:13+00:00 BB 43468: ScreenCaptureKit should be a weak link. ScreenCaptureKit is not available on older macOS versions. For some reason, the upstream build have it as a weak import even though they do not specify the -weak_framework flag, whereas our builds have it as a normal import and do not work on macOS 10.15 without this patch. - - - - - 1 changed file: - toolkit/library/moz.build Changes: ===================================== toolkit/library/moz.build ===================================== @@ -228,7 +228,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": "-framework AVFoundation", "-framework CoreMedia", "-framework IOKit", - "-framework ScreenCaptureKit", + "-weak_framework ScreenCaptureKit", "-F%s" % CONFIG["MACOS_PRIVATE_FRAMEWORKS_DIR"], "-framework CoreUI", "-framework CoreSymbolication", View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/010… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/010… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.7.0esr-14.0-1] BB 43468: ScreenCaptureKit should be a weak link.
by morgan (＠morgan) 06 Feb '25

06 Feb '25

morgan pushed to branch base-browser-128.7.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: ca7de33e by Pier Angelo Vendrame at 2025-02-06T18:25:29+00:00 BB 43468: ScreenCaptureKit should be a weak link. ScreenCaptureKit is not available on older macOS versions. For some reason, the upstream build have it as a weak import even though they do not specify the -weak_framework flag, whereas our builds have it as a normal import and do not work on macOS 10.15 without this patch. - - - - - 1 changed file: - toolkit/library/moz.build Changes: ===================================== toolkit/library/moz.build ===================================== @@ -228,7 +228,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": "-framework AVFoundation", "-framework CoreMedia", "-framework IOKit", - "-framework ScreenCaptureKit", + "-weak_framework ScreenCaptureKit", "-F%s" % CONFIG["MACOS_PRIVATE_FRAMEWORKS_DIR"], "-framework CoreUI", "-framework CoreSymbolication", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ca7de33… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ca7de33… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.0-1] BB 43468: ScreenCaptureKit should be a weak link.
by morgan (＠morgan) 06 Feb '25

06 Feb '25

morgan pushed to branch tor-browser-128.7.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 3eb91e73 by Pier Angelo Vendrame at 2025-02-06T18:27:01+00:00 BB 43468: ScreenCaptureKit should be a weak link. ScreenCaptureKit is not available on older macOS versions. For some reason, the upstream build have it as a weak import even though they do not specify the -weak_framework flag, whereas our builds have it as a normal import and do not work on macOS 10.15 without this patch. - - - - - 1 changed file: - toolkit/library/moz.build Changes: ===================================== toolkit/library/moz.build ===================================== @@ -228,7 +228,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": "-framework AVFoundation", "-framework CoreMedia", "-framework IOKit", - "-framework ScreenCaptureKit", + "-weak_framework ScreenCaptureKit", "-F%s" % CONFIG["MACOS_PRIVATE_FRAMEWORKS_DIR"], "-framework CoreUI", "-framework CoreSymbolication", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3eb91e7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3eb91e7… You're receiving this email because of your account on gitlab.torproject.org.

1 0