- tor-commits - lists.torproject.org

[Git][tpo/applications/torbrowser-launcher] Pushed new branch AppArmor-updates-for-current-Debian
by intrigeri (＠intrigeri) 18 Mar '25

18 Mar '25

intrigeri pushed new branch AppArmor-updates-for-current-Debian at The Tor Project / Applications / torbrowser-launcher -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tree/A… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Tweak Tails notification in Tor Browser Stable release-prep template
by morgan (＠morgan) 18 Mar '25

18 Mar '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: db399f9f by Morgan at 2025-03-18T13:05:10+00:00 Tweak Tails notification in Tor Browser Stable release-prep template - - - - - 1 changed file: - .gitlab/issue_templates/Release Prep - Tor Browser Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Stable.md ===================================== @@ -147,28 +147,6 @@ Tor Browser Stable is on the `maint-${TOR_BROWSER_MAJOR}.${TOR_BROWSER_MINOR}` b ```bash make torbrowser-kick-devmole-build ``` -- [ ] Notify Tails of pending builds - - **Recipients** - ``` - tails-dev(a)boum.org - ``` - - **Subject** - ``` - Tor Browser ${TOR_BROWSER_VERSION} Building - ``` - - **Body** - ``` - Hello, - - Tor Browser Stable is being built and should be ready for Tails in the coming hours. Build artifacts and hashes will be available here: - - ${BUILD_ARTIFACTS_URL} - - ${BUIDL_HASHES_URL} - - ⚠️ WARNING: We have not yet verified the builds match, so make sure you do so before prepping the Tails release! - - Changelog: - # paste changelog as quote here - ``` </details> @@ -213,6 +191,25 @@ Tor Browser Stable is on the `maint-${TOR_BROWSER_MAJOR}.${TOR_BROWSER_MINOR}` b - morgan - pierov - [ ] Ensure all builders have matching builds +- [ ] Notify Tails + - **Recipients** + ``` + tails-dev(a)boum.org + ``` + - **Subject** + ``` + Tor Browser ${TOR_BROWSER_VERSION} Ready + ``` + - **Body** + ``` + Hello, + + Tor Browser Stable is ready for Tails. Build artifacts can be found here: + - ${BUILD_ARTIFACTS_URL} + + Changelog: + # paste changelog as quote here + ``` - [ ] Verify the associated legacy `maint-13.5` release has been signed and deployed - **⚠️ WARNING**: Do not continue if the legacy channel has not been fully signed and published yet; it is needed for update-response generation! - **NOTE** Stable releases without a corresponding legacy release may ignore this View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.8.0esr-14.5-1] 2 commits: fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser
by morgan (＠morgan) 17 Mar '25

17 Mar '25

morgan pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 36916036 by Henry Wilkes at 2025-03-17T21:14:23+00:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 43321: Only focus the about:torconnect buttons under certain circumstances. By default, when switching stages we move the focus back to the stage heading. This is because we want to lead the user back to the top of the page to show them the new context. This should help improve the experience when using a screen reader. If we are in the bootstrapping stage we instead move the focus to the "Cancel" button since it is likely that the user wants to use this control. If the user presses the "Cancel" button we return the focus to the "Connect" or "Try a bridge" button. I.e. we restore the prior focus. This allows to user to easily re-try without having to re-read the page they just saw. We do a similar thing when the user cancels the automatic startup bootstrapping. Finally, on page load we will focus the "Connect" button if the user has previously interacted with it. We record this interaction in a preference that persists between sessions. We also separate out the "Loading" stage from the "Start" stage. It is unexpected for `about:torconnect` to be opened whilst in the "Loading" stage, but if it does happen it would be safer to keep the page blank. The way this is implemented also ensures that the initial page is blank prior to "get-init-args" resolving. - - - - - ad21bdd6 by Henry Wilkes at 2025-03-17T21:14:23+00:00 fixup! TB 40597: Implement TorSettings module TB 43321: Add a isQuickstart property to the TorConnect.stage. This is used by `about:torconnect` for determining focus behaviour. - - - - - 5 changed files: - toolkit/components/torconnect/TorConnectParent.sys.mjs - toolkit/components/torconnect/content/aboutTorConnect.css - toolkit/components/torconnect/content/aboutTorConnect.html - toolkit/components/torconnect/content/aboutTorConnect.js - toolkit/modules/TorConnect.sys.mjs Changes: ===================================== toolkit/components/torconnect/TorConnectParent.sys.mjs ===================================== @@ -13,6 +13,9 @@ ChromeUtils.defineESModuleGetters(lazy, { HomePage: "resource:///modules/HomePage.sys.mjs", }); +const userHasEverClickedConnectPref = + "torbrowser.about_torconnect.user_has_ever_clicked_connect"; + /* This object is basically a marshalling interface between the TorConnect module and a particular about:torconnect page @@ -117,6 +120,9 @@ export class TorConnectParent extends JSWindowActorParent { TorConnect.chooseRegion(); break; case "torconnect:begin-bootstrapping": + if (message.data.userClickedConnect) { + Services.prefs.setBoolPref(userHasEverClickedConnectPref, true); + } TorConnect.beginBootstrapping(message.data.regionCode); break; case "torconnect:cancel-bootstrapping": @@ -130,6 +136,10 @@ export class TorConnectParent extends JSWindowActorParent { Direction: Services.locale.isAppLocaleRTL ? "rtl" : "ltr", CountryNames: TorConnect.countryNames, stage: TorConnect.stage, + userHasEverClickedConnect: Services.prefs.getBoolPref( + userHasEverClickedConnectPref, + false + ), quickstartEnabled: TorConnect.quickstart, }; case "torconnect:get-frequent-regions": ===================================== toolkit/components/torconnect/content/aboutTorConnect.css ===================================== @@ -15,6 +15,11 @@ html { height: 100%; } +body:not(.loaded) { + /* Keep blank whilst loading. */ + display: none; +} + #breadcrumbs { display: flex; align-items: center; @@ -93,6 +98,11 @@ html { display: none; } +#tor-connect-heading { + /* Do not show the focus outline. */ + outline: none; +} + #connect-to-tor { margin-inline-start: 0; } ===================================== toolkit/components/torconnect/content/aboutTorConnect.html ===================================== @@ -50,7 +50,7 @@ </div> <div id="text-container"> <div class="title"> - <h1 class="title-text"></h1> + <h1 id="tor-connect-heading" class="title-text" tabindex="-1"></h1> </div> <div id="connectLongContent"> <p id="connectLongContentText"></p> ===================================== toolkit/components/torconnect/content/aboutTorConnect.js ===================================== @@ -32,7 +32,6 @@ class AboutTorConnect { selectors = Object.freeze({ textContainer: { title: "div.title", - titleText: "h1.title-text", longContentText: "#connectLongContentText", }, progress: { @@ -77,7 +76,7 @@ class AboutTorConnect { elements = Object.freeze({ title: document.querySelector(this.selectors.textContainer.title), - titleText: document.querySelector(this.selectors.textContainer.titleText), + heading: document.getElementById("tor-connect-heading"), longContentText: document.querySelector( this.selectors.textContainer.longContentText ), @@ -138,18 +137,44 @@ class AboutTorConnect { locations = {}; - beginBootstrapping() { - RPMSendAsyncMessage("torconnect:begin-bootstrapping", {}); + /** + * Whether the user requested a cancellation of the bootstrap from *this* + * page. + * + * @type {boolean} + */ + userCancelled = false; + + /** + * Start a normal bootstrap attempt. + * + * @param {boolean} userClickedConnect - Whether this request was triggered by + * the user clicking the "Connect" button on the "Start" page. + */ + beginBootstrapping(userClickedConnect) { + RPMSendAsyncMessage("torconnect:begin-bootstrapping", { + userClickedConnect, + }); } + /** + * Start an auto bootstrap attempt. + * + * @param {string} regionCode - The region code to use for the bootstrap, or + * "automatic". + */ beginAutoBootstrapping(regionCode) { RPMSendAsyncMessage("torconnect:begin-bootstrapping", { regionCode, }); } + /** + * Try and cancel the current bootstrap attempt. + */ cancelBootstrapping() { RPMSendAsyncMessage("torconnect:cancel-bootstrapping"); + this.userCancelled = true; } /* @@ -260,7 +285,7 @@ class AboutTorConnect { } setTitle(title, className) { - this.elements.titleText.textContent = title; + this.elements.heading.textContent = title; this.elements.title.className = "title"; if (className) { this.elements.title.classList.add(className); @@ -349,18 +374,88 @@ class AboutTorConnect { } } + /** + * The connect button that was focused just prior to a bootstrap attempt, if + * any. + * + * @type {?Element} + */ + preBootstrappingFocus = null; + + /** + * The stage that was shown on this page just prior to a bootstrap attempt. + * + * @type {?string} + */ + preBootstrappingStage = null; + /* These methods update the UI based on the current TorConnect state */ - updateStage(stage) { + /** + * Update the shown stage. + * + * @param {ConnectStage} stage - The new stage to show. + * @param {boolean} [focusConnect=false] - Whether to try and focus the + * connect button, if we are in the Start stage. + */ + updateStage(stage, focusConnect = false) { if (stage.name === this.shownStage) { return; } + const prevStage = this.shownStage; this.shownStage = stage.name; this.selectedLocation = stage.defaultRegion; + // By default we want to reset the focus to the top of the page when + // changing the displayed page since we want a user to read the new page + // before activating a control. + let moveFocus = this.elements.heading; + + if (stage.name === "Bootstrapping") { + this.preBootstrappingStage = prevStage; + this.preBootstrappingFocus = null; + if (focusConnect && stage.isQuickstart) { + // If this is the initial automatic bootstrap triggered by the + // quickstart preference, treat as if the previous shown stage was + // "Start" and the user clicked the "Connect" button. + // Then, if the user cancels, the focus should still move to the + // "Connect" button. + this.preBootstrappingStage = "Start"; + this.preBootstrappingFocus = this.elements.connectButton; + } else if (this.elements.connectButton.contains(document.activeElement)) { + this.preBootstrappingFocus = this.elements.connectButton; + } else if ( + this.elements.tryBridgeButton.contains(document.activeElement) + ) { + this.preBootstrappingFocus = this.elements.tryBridgeButton; + } + } else { + if ( + this.userCancelled && + prevStage === "Bootstrapping" && + stage.name === this.preBootstrappingStage && + this.preBootstrappingFocus && + this.elements.cancelButton.contains(document.activeElement) + ) { + // If returning back to the same stage after the user tried to cancel + // bootstrapping from within this page, then we restore the focus to the + // connect button to allow the user to quickly re-try. + // If the bootstrap was cancelled for any other reason, we reset the + // focus as usual. + moveFocus = this.preBootstrappingFocus; + } + // Clear the Bootstrapping variables. + this.preBootstrappingStage = null; + this.preBootstrappingFocus = null; + } + + // Clear the recording of the cancellation request. + this.userCancelled = false; + + let isLoaded = true; let showProgress = false; let showLog = false; switch (stage.name) { @@ -368,14 +463,21 @@ class AboutTorConnect { console.error("Should not be open when TorConnect is disabled"); break; case "Loading": + // Unexpected for this page to open so early. + console.warn("Page opened whilst loading"); + isLoaded = false; + break; case "Start": - // Loading is not currnetly handled, treat the same as "Start", but UI - // will be unresponsive. this.showStart(stage.tryAgain, stage.potentiallyBlocked); + if (focusConnect) { + moveFocus = this.elements.connectButton; + } break; case "Bootstrapping": showProgress = true; this.showBootstrapping(stage.bootstrapTrigger, stage.tryAgain); + // Always focus the cancel button. + moveFocus = this.elements.cancelButton; break; case "Offline": showLog = true; @@ -419,6 +521,9 @@ class AboutTorConnect { } else { this.hide(this.elements.viewLogButton); } + + document.body.classList.toggle("loaded", isLoaded); + moveFocus.focus(); } updateBootstrappingStatus(data) { @@ -452,10 +557,9 @@ class AboutTorConnect { this.show(this.elements.quickstartContainer); this.show(this.elements.configureButton); this.show(this.elements.connectButton, true); - this.elements.connectButton.focus(); - if (tryAgain) { - this.elements.connectButton.textContent = TorStrings.torConnect.tryAgain; - } + this.elements.connectButton.textContent = tryAgain + ? TorStrings.torConnect.tryAgain + : TorStrings.torConnect.torConnectButton; if (potentiallyBlocked) { this.setBreadcrumbsStatus( BreadcrumbStatus.Active, @@ -511,7 +615,6 @@ class AboutTorConnect { } this.hideButtons(); this.show(this.elements.cancelButton); - this.elements.cancelButton.focus(); } showOffline() { @@ -541,7 +644,6 @@ class AboutTorConnect { BreadcrumbStatus.Disabled ); this.showLocationForm(true, TorStrings.torConnect.tryBridge); - this.elements.tryBridgeButton.focus(); } showRegionNotFound() { @@ -557,7 +659,6 @@ class AboutTorConnect { BreadcrumbStatus.Disabled ); this.showLocationForm(false, TorStrings.torConnect.tryBridge); - this.elements.tryBridgeButton.focus(); } showConfirmRegion(error) { @@ -573,7 +674,6 @@ class AboutTorConnect { BreadcrumbStatus.Active ); this.showLocationForm(false, TorStrings.torConnect.tryAgain); - this.elements.tryBridgeButton.focus(); } showFinalError(error) { @@ -722,7 +822,8 @@ class AboutTorConnect { this.elements.connectButton.textContent = TorStrings.torConnect.torConnectButton; this.elements.connectButton.addEventListener("click", () => { - this.beginBootstrapping(); + // Record as userClickedConnect if we are in the Start stage. + this.beginBootstrapping(this.shownStage === "Start"); }); this.populateLocations(); @@ -802,7 +903,13 @@ class AboutTorConnect { this.initObservers(); this.initKeyboardShortcuts(); - this.updateStage(args.stage); + // If we have previously opened about:torconnect and the user tried the + // "Connect" button we want to focus the "Connect" button for easy + // activation. + // Otherwise, we do not want to focus it for first time users so they can + // read the full page first. + const focusConnect = args.userHasEverClickedConnect; + this.updateStage(args.stage, focusConnect); this.updateQuickstart(args.quickstartEnabled); } } ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -680,10 +680,14 @@ export const TorConnectStage = Object.freeze({ * A summary of the user stage. * (This class is mirrored for Android in TorConnectStage.java. Changes should be mirrored there) * - * @property {string} name - The name of the stage. + * @property {string} name - The name of the stage. One of the values in + * `TorConnectStage`. * @property {string} defaultRegion - The default region to show in the UI. - * @property {?string} bootstrapTrigger - The TorConnectStage prior to this + * @property {?string} bootstrapTrigger - The name of the stage prior to this * bootstrap attempt. Only set during the "Bootstrapping" stage. + * @property {boolean} isQuickstart - Whether the current bootstrap attempt was + * triggered by the `TorConnect.quickstart` preference. Will be `false` + * outside of the "Bootstrapping" stage. * @property {?BootstrapError} error - The last bootstrapping error. * @property {boolean} tryAgain - Whether a bootstrap attempt has failed, so * that a normal bootstrap should be shown as "Try Again" instead of @@ -752,6 +756,14 @@ export const TorConnect = { */ _bootstrapTrigger: null, + /** + * Whether the current bootstrapping attempt was triggered by the quickstart + * preference. + * + * @type {boolean} + */ + _isQuickstart: false, + /** * The alternative stage that we should move to after bootstrapping completes. * @@ -807,6 +819,7 @@ export const TorConnect = { name: this._stageName, defaultRegion: this._defaultRegion, bootstrapTrigger: this._bootstrapTrigger, + isQuickstart: this._isQuickstart, error: this._errorDetails ? { code: this._errorDetails.code, @@ -935,7 +948,7 @@ export const TorConnect = { // And the previous bootstrap attempt must have succeeded. !Services.prefs.getBoolPref(TorConnectPrefs.prompt_at_startup, true) ) { - this.beginBootstrapping(); + this._beginBootstrappingInternal(undefined, true); } }, @@ -1303,6 +1316,19 @@ export const TorConnect = { * an auto-bootstrap attempt. */ async beginBootstrapping(regionCode) { + await this._beginBootstrappingInternal(regionCode, false); + }, + + /** + * Begin a bootstrap attempt. + * + * @param {string} [regionCode] - An optional region code string to use, or + * "automatic" to automatically determine the region. If given, will start + * an auto-bootstrap attempt. + * @param {boolean} isQuickstart - Whether this was triggered by the + * quickstart option. + */ + async _beginBootstrappingInternal(regionCode, isQuickstart) { lazy.logger.debug("TorConnect.beginBootstrapping()"); if (!this._confirmBootstrapping(regionCode)) { @@ -1331,6 +1357,7 @@ export const TorConnect = { } this._requestedStage = null; this._bootstrapTrigger = beginStage; + this._isQuickstart = isQuickstart; this._setStage(TorConnectStage.Bootstrapping); this._bootstrapAttempt = bootstrapAttempt; @@ -1349,6 +1376,7 @@ export const TorConnect = { const requestedStage = this._requestedStage; this._requestedStage = null; this._bootstrapTrigger = null; + this._isQuickstart = false; this._bootstrapAttempt = null; if (bootstrapAttempt.detectedRegion) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f5c281… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f5c281… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41397: Fix linux-packages following changes from #41040
by morgan (＠morgan) 17 Mar '25

17 Mar '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 74163819 by Nicolas Vigier at 2025-03-17T20:29:51+00:00 Bug 41397: Fix linux-packages following changes from #41040 - move var/linux-packages and var/linux-packages-aarch64 definition to the root, since the browser-linux-* targets are no longer used when building all platforms - fix calls to linux-packages. Some var/browser-linux-* had not been updated to var/browser_platforms/linux-*. - in projects/linux-packages/config, remove test on the browser not being mullvadbrowser to enable i686 packages, since that part is now handled outside - - - - - 2 changed files: - projects/linux-packages/config - projects/release/config Changes: ===================================== projects/linux-packages/config ===================================== @@ -113,7 +113,7 @@ targets: browser-linux-x86_64: 1 browser-linux-i686: var: - browser-linux-i686: '[% c("var/browser_type") != "mullvadbrowser" %]' + browser-linux-i686: 1 browser-linux-aarch64: var: browser-linux-aarch64: 1 ===================================== projects/release/config ===================================== @@ -8,6 +8,9 @@ var: publish_dir: '[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %]' containers_target: with_containers + linux-packages: '[% ( c("var/browser_platforms/linux-i686") || c("var/browser_platforms/linux-x86_64") ) && ( c("var/mullvad-browser") || c("var/nightly") ) %]' + linux-packages-aarch64: '[% c("var/browser_platforms/linux-aarch64") && (c("var/mullvad-browser") || c("var/nightly")) %]' + targets: browser-all: - browser-src @@ -37,7 +40,6 @@ targets: var: browser_platforms: linux-x86_64: 1 - linux-packages: '[% c("var/mullvad-browser") || c("var/tor-browser-linux-packages") %]' browser-linux-x86_64-asan: var: browser_platforms: @@ -47,12 +49,10 @@ targets: var: browser_platforms: linux-i686: 1 - linux-packages: '[% c("var/mullvad-browser") || c("var/tor-browser-linux-packages") %]' browser-linux-aarch64: var: browser_platforms: linux-aarch64: 1 - linux-packages-aarch64: '[% (! c("var/browser-all-target") || c("var/testbuild") || c("var/nightly")) && (c("var/mullvad-browser") || c("var/tor-browser-linux-packages")) %]' browser-windows-i686: var: browser_platforms: @@ -96,7 +96,6 @@ targets: var: browser_type: torbrowser git_tag_prefix: tbb - tor-browser-linux-packages: '[% c("var/nightly") %]' basebrowser: var: browser_type: basebrowser @@ -201,13 +200,13 @@ input_files: - name: deb-packages project: linux-packages - enable: '[% c("var/browser_platforms/packages") %]' + enable: '[% c("var/linux-packages") %]' # Add $browser_type-linux-x86_64 target for container config target: - '[% IF c("var/testbuild") %]testbuild[% END %]' - '[% c("var/build_target") %]' - - '[% IF c("var/browser-linux-i686") %]browser-linux-i686[% END %]' - - '[% IF c("var/browser-linux-x86_64") %]browser-linux-x86_64[% END %]' + - '[% IF c("var/browser_platforms/linux-i686") %]browser-linux-i686[% END %]' + - '[% IF c("var/browser_platforms/linux-x86_64") %]browser-linux-x86_64[% END %]' - deb - '[% c("var/browser_type") %]-linux-x86_64' @@ -231,8 +230,8 @@ input_files: target: - '[% IF c("var/testbuild") %]testbuild[% END %]' - '[% c("var/build_target") %]' - - '[% IF c("var/browser-linux-i686") %]browser-linux-i686[% END %]' - - '[% IF c("var/browser-linux-x86_64") %]browser-linux-x86_64[% END %]' + - '[% IF c("var/browser_platforms/linux-i686") %]browser-linux-i686[% END %]' + - '[% IF c("var/browser_platforms/linux-x86_64") %]browser-linux-x86_64[% END %]' - '[% IF c("var/linux-packages-aarch64") %]browser-linux-aarch64[% END %]' - rpm - '[% c("var/browser_type") %]-linux-x86_64' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-14.0] 7 commits: Bug 41374: Remove support for migrate_archs and migrate_langs in update_responses
by morgan (＠morgan) 17 Mar '25

17 Mar '25

morgan pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build Commits: ae7a43c7 by Nicolas Vigier at 2025-03-13T10:36:59+01:00 Bug 41374: Remove support for migrate_archs and migrate_langs in update_responses Those options have not been used for some time, and removing them simplifies the following changes we're doing to split files per platform. - - - - - 5abd1cb7 by Nicolas Vigier at 2025-03-13T10:37:22+01:00 Bug 40799: Remove legacy locale iteration in update-responses - - - - - 7c05ce80 by Nicolas Vigier at 2025-03-17T10:38:03+01:00 Bug 40799: Remove legacy locale support in tools/dmg2mar - - - - - b1bd59c3 by Nicolas Vigier at 2025-03-17T10:38:51+01:00 Bug 41363: Split update_responses files per platform To make reverting update for a single platform easier, we split update response files, using a separate directory for each platform. - - - - - 7945d332 by Nicolas Vigier at 2025-03-17T10:39:15+01:00 Bug 41363: Make separate update_responses commit for each platform - - - - - 80a959de by Nicolas Vigier at 2025-03-17T10:39:26+01:00 Bug 41363: Fix error message about $update_responses_repository_dir being undefined - - - - - 03e261aa by Nicolas Vigier at 2025-03-17T10:40:27+01:00 Bug 41394: Don't try to add download-android-*.json files for Mullvad Browser - - - - - 6 changed files: - projects/release/create_update_responses_tar - projects/release/update_responses_config.yml - tools/dmg2mar - tools/signing/functions - tools/signing/upload-update_responses-to-staticiforme - tools/update-responses/update_responses Changes: ===================================== projects/release/create_update_responses_tar ===================================== @@ -1,9 +1,10 @@ #!/bin/bash [% c("var/set_default_env") -%] [% SET channel = c('var/channel') -%] +rm -Rf [% shell_quote(c("basedir")) %]/tools/update-responses/htdocs/[% channel %] [% shell_quote(c("basedir")) %]/tools/update-responses/update_responses [% channel %] mkdir -p [% shell_quote(path(dest_dir)) %]/update-responses mv [% shell_quote(c("basedir")) %]/tools/update-responses/htdocs/[% channel %] [% channel %] -chmod 775 [% channel %] -chmod 664 [% channel %]/.htaccess [% channel %]/* +find [% channel %] -type d -exec chmod 775 {} \; +find [% channel %] -type f -exec chmod 664 {} \; tar cf [% shell_quote(path(dest_dir)) %]/update-responses/update-responses-[% channel %]-[% c("version") %].tar [% channel %] ===================================== projects/release/update_responses_config.yml ===================================== @@ -53,10 +53,6 @@ versions: - [% ver %] [% END; END -%] - # for example, osx32: osx64 - migrate_archs: - # for example, pt-PT: pt-BR - migrate_langs: # minSupportedOsVersion on macOS corresponds to the Darwin version ( https://en.wikipedia.org/wiki/Darwin_(operating_system) ) macos: # macOS v10.15.0 ===================================== tools/dmg2mar ===================================== @@ -102,7 +102,7 @@ sub get_dmg_files_from_sha256sums { next unless $filename; chomp $filename; next unless $filename =~ m/^$appname_dmg-macos-(.+)\.dmg$/; - push @files, { filename => $filename, version => $1, lang => 'ALL' }; + push @files, { filename => $filename, version => $1 }; } return @files; } @@ -116,11 +116,7 @@ sub convert_files { print "Finished $_[2]\n"; }); foreach my $file (get_dmg_files_from_sha256sums) { - # The 'ja' locale is a special case: it is called 'ja-JP-mac' - # internally on OSX, but the dmg file still uses 'ja' to avoid - # confusing users. - my $mar_lang = $file->{lang} eq 'ja' ? 'ja-JP-mac' : $file->{lang}; - my $output = "$appname_mar-macos-$file->{version}_$mar_lang.mar"; + my $output = "$appname_mar-macos-$file->{version}_ALL.mar"; my $step_name = "$file->{filename} -> $output"; print "Starting $step_name\n"; $pm->start($step_name) and next; ===================================== tools/signing/functions ===================================== @@ -23,7 +23,7 @@ function check_update_responses_repository_dir { if test -z "$update_responses_repository_dir" || ! test -d "$update_responses_repository_dir" then cat << 'EOF' > /dev/stderr -$aus1_repository_dir is not defined, or the directory does not exist +$update_responses_repository_dir is not defined, or the directory does not exist You should clone git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git and set $update_responses_repository_dir in set-config.update-responses EOF ===================================== tools/signing/upload-update_responses-to-staticiforme ===================================== @@ -39,8 +39,34 @@ do mv "$file" "$tbb_version_type/$fname" done +# Keep directory from previous release if they are not in the new release. +# This happens when a release does not include some platforms. +for file in $(ls -1 "$old_ur/$tbb_version_type") +do + test -d "$old_ur/$tbb_version_type/$file" || continue + test -d "$tbb_version_type/$file" && continue + mv -f "$old_ur/$tbb_version_type/$file" "$tbb_version_type/$file" +done + +# Commit each sub-directory separately +for file in $(ls -1 "$tbb_version_type") +do + test -d "$tbb_version_type/$file" || continue + git add "$tbb_version_type/$file" + git add "$tbb_version_type/download-$file.json" + git diff --quiet --cached --exit-code || \ + git commit -m "$tbb_version_type: new version, $tbb_version ($file)" +done + +if is_project torbrowser; then + git add "$tbb_version_type"/download-android-*.json + git diff --quiet --cached --exit-code || \ + git commit -m "$tbb_version_type: new version, $tbb_version (android)" +fi + git add "$tbb_version_type" -git commit -m "$tbb_version_type: new version, $tbb_version" +git diff --quiet --cached --exit-code || \ + git commit -m "$tbb_version_type: new version, $tbb_version" git push # we just need to push mullvadbrowser's update responses to git, not deploy to staticiforme ===================================== tools/update-responses/update_responses ===================================== @@ -29,7 +29,6 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); -my %htdocsfiles; my $releases_dir = $config->{releases_dir}; $releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; @@ -51,12 +50,6 @@ sub get_tmpdir { : ()); } -sub build_targets_by_os { - exit_error "Unknown build target for OS $_[0]" unless $config->{build_targets}{$_[0]}; - my $r = $config->{build_targets}{$_[0]}; - return ref $r eq 'ARRAY' ? @$r : ($r); -} - sub get_nbprocs { return $ENV{NUM_PROCS} if defined $ENV{NUM_PROCS}; if (-f '/proc/cpuinfo') { @@ -80,19 +73,11 @@ sub setup_martools { } sub write_htdocs { - my ($channel, $file, $content) = @_; + my ($channel, $dir, $file, $content) = @_; mkdir $htdocsdir unless -d $htdocsdir; mkdir "$htdocsdir/$channel" unless -d "$htdocsdir/$channel"; - write_file("$htdocsdir/$channel/$file", $content); - $htdocsfiles{$channel}->{$file} = 1; -} - -sub clean_htdocs { - my ($channel) = @_; - opendir(my $d, "$htdocsdir/$channel"); - my @files = grep { ! $htdocsfiles{$channel}->{$_} } readdir $d; - closedir $d; - unlink map { "$htdocsdir/$channel/$_" } @files; + mkdir "$htdocsdir/$channel/$dir" unless -d "$htdocsdir/$channel/$dir"; + write_file("$htdocsdir/$channel/$dir/$file", $content); } sub get_sha512_hex_of_file { @@ -113,9 +98,9 @@ sub get_version_files { foreach my $file (readdir $d) { next unless -f "$vdir/$file"; if ($file !~ m/incremental\.mar$/ && - $file =~ m/^$appname-(.+)-${version}_(.+)\.mar$/) { - my ($os, $lang) = ($1, $2); - $files->{$os}{$lang}{complete} = { + $file =~ m/^$appname-(.+)-${version}_ALL\.mar$/) { + my $os = $1; + $files->{$os}{complete} = { type => 'complete', URL => "$download_url/$file", size => -s "$vdir/$file", @@ -126,9 +111,9 @@ sub get_version_files { }; next; } - if ($file =~ m/^$appname-(.+)--(.+)-${version}_(.+)\.incremental\.mar$/) { - my ($os, $from_version, $lang) = ($1, $2, $3); - $files->{$os}{$lang}{partial}{$from_version} = { + if ($file =~ m/^$appname-(.+)--(.+)-${version}_ALL\.incremental\.mar$/) { + my ($os, $from_version) = ($1, $2); + $files->{$os}{partial}{$from_version} = { type => 'partial', URL => "$download_url/$file", size => -s "$vdir/$file", @@ -235,14 +220,14 @@ sub extract_mar { } sub mar_filename { - my ($config, $appname, $version, $os, $lang) = @_; - version_dir($config, $version) . "/$appname-$os-${version}_$lang.mar"; + my ($config, $appname, $version, $os) = @_; + version_dir($config, $version) . "/$appname-$os-${version}_ALL.mar"; } sub create_incremental_mar { - my ($config, $pm, $from_version, $new_version, $os, $lang, $channel) = @_; + my ($config, $pm, $from_version, $new_version, $os, $channel) = @_; my $appname = $config->{appname_marfile}; - my $mar_file = "$appname-$os--${from_version}-${new_version}_$lang.incremental.mar"; + my $mar_file = "$appname-$os--${from_version}-${new_version}_ALL.incremental.mar"; my $mar_file_path = version_dir($config, $new_version) . '/' . $mar_file; if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) { print "Skipping $mar_file\n"; @@ -253,7 +238,7 @@ sub create_incremental_mar { my $finished_file = sub { exit_error "Error creating $mar_file" unless $_[1] == 0; print "Finished $mar_file\n"; - $config->{versions}{$new_version}{files}{$os}{$lang}{partial}{$from_version} = { + $config->{versions}{$new_version}{files}{$os}{partial}{$from_version} = { type => 'partial', URL => "$download_url/$mar_file", size => -s $mar_file_path, @@ -267,9 +252,9 @@ sub create_incremental_mar { my $tmpdir = get_tmpdir($config); my $mar_c_from = get_config($config, $from_version, $os, 'mar_compression'); my $mar_c_new = get_config($config, $new_version, $os, 'mar_compression'); - extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), + extract_mar(mar_filename($config, $appname, $from_version, $os), "$tmpdir/A", $mar_c_from); - extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), + extract_mar(mar_filename($config, $appname, $new_version, $os), "$tmpdir/B", $mar_c_new); # bug 26054: make sure previous macOS version is code signed if (!$ENV{NO_CODESIGNATURE} && ($os eq 'macos') @@ -306,10 +291,8 @@ sub create_incremental_mars_for_version { get_version_files($config, $from_version); my $from_v = $config->{versions}{$from_version}; foreach my $os (keys %{$v->{files}}) { - foreach my $lang (keys %{$v->{files}{$os}}) { - next unless defined $from_v->{files}{$os}{$lang}{complete}; - create_incremental_mar($config, $pm, $from_version, $version, $os, $lang, $channel); - } + next unless defined $from_v->{files}{$os}{complete}; + create_incremental_mar($config, $pm, $from_version, $version, $os, $channel); } } $pm->wait_all_children; @@ -333,31 +316,29 @@ sub get_buildinfos { setup_martools; my $files = $config->{versions}{$version}{files}; foreach my $os (keys %$files) { - foreach my $lang (keys %{$files->{$os}}) { - next unless $files->{$os}{$lang}{complete}; - my $tmpdir = get_tmpdir($config); - my $mar_compression = get_config($config, $version, $os, 'mar_compression'); - extract_mar( - mar_filename($config, $config->{appname_marfile}, $version, $os, $lang), - "$tmpdir", - $mar_compression); - my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; - $appfile = "$tmpdir/Contents/Resources/application.ini" - if -f "$tmpdir/Contents/Resources/application.ini"; - exit_error "Could not find application.ini" unless $appfile; - foreach my $line (read_file($appfile)) { - if ($line =~ m/^BuildID=(.*)$/) { - $config->{versions}{$version}{buildID} = $1; - return; - } + next unless $files->{$os}{complete}; + my $tmpdir = get_tmpdir($config); + my $mar_compression = get_config($config, $version, $os, 'mar_compression'); + extract_mar( + mar_filename($config, $config->{appname_marfile}, $version, $os), + "$tmpdir", + $mar_compression); + my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; + $appfile = "$tmpdir/Contents/Resources/application.ini" + if -f "$tmpdir/Contents/Resources/application.ini"; + exit_error "Could not find application.ini" unless $appfile; + foreach my $line (read_file($appfile)) { + if ($line =~ m/^BuildID=(.*)$/) { + $config->{versions}{$version}{buildID} = $1; + return; } - exit_error "Could not extract buildID from application.ini"; } + exit_error "Could not extract buildID from application.ini"; } } sub get_response { - my ($config, $versions, $os, $lang, $from_version) = @_; + my ($config, $versions, $os, $from_version) = @_; my $res; my $writer = XML::Writer->new(OUTPUT => \$res, ENCODING => 'UTF-8'); $writer->xmlDecl; @@ -384,13 +365,13 @@ sub get_response { defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), defined $mininstruc ? ( minSupportedInstructionSet => $mininstruc ) : (), ); - if (my $patch = $config->{versions}{$version}{files}{$os}{$lang}{complete}) { + if (my $patch = $config->{versions}{$version}{files}{$os}{complete}) { my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch; $writer->startTag('patch', @sorted_patch); $writer->endTag('patch'); } if ($from_version) { - if (my $patch = $config->{versions}{$version}{files}{$os}{$lang}{partial}{$from_version}) { + if (my $patch = $config->{versions}{$version}{files}{$os}{partial}{$from_version}) { my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch; $writer->startTag('patch', @sorted_patch); $writer->endTag('patch'); @@ -407,87 +388,69 @@ sub get_response { sub write_responses { my ($config, $channel) = @_; my $versions = as_array($config->{channels}{$channel}); - my (%oses, %langs, %from_versions); + my (%oses, %from_versions); foreach my $version (@$versions) { get_version_files($config, $version); get_buildinfos($config, $version); my $files = $config->{versions}{$version}{files}; - my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; - foreach my $old_os (keys %$migrate_archs) { - my $new_os = $migrate_archs->{$old_os}; - foreach my $lang (keys %{$files->{$new_os}}) { - $files->{$old_os}{$lang}{complete} = - $files->{$new_os}{$lang}{complete}; - } - } foreach my $os (keys %$files) { $oses{$os} = 1; - foreach my $lang (keys %{$files->{$os}}) { - $langs{$lang} = 1; - foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { - $from_versions{$from_version} = 1; - } + foreach my $from_version (keys %{$files->{$os}{partial}}) { + $from_versions{$from_version} = 1; } } } my $versions_str = join('+', @$versions); foreach my $os (keys %oses) { - foreach my $lang (keys %langs) { - my $resp = get_response($config, $versions, $os, $lang); - write_htdocs($channel, "$versions_str-$os-$lang.xml", $resp); - foreach my $from_version (keys %from_versions) { - $resp = get_response($config, $versions, $os, $lang, $from_version); - write_htdocs($channel, "$from_version-$versions_str-$os-$lang.xml", $resp); - } + my $resp = get_response($config, $versions, $os); + write_htdocs($channel, $os, "$versions_str-$os.xml", $resp); + foreach my $from_version (keys %from_versions) { + $resp = get_response($config, $versions, $os, $from_version); + write_htdocs($channel, $os, "$from_version-$versions_str-$os.xml", $resp); } + write_htdocs($channel, $os, 'no-update.xml', + '<?xml version="1.0" encoding="UTF-8"?>' + . "\n<updates></updates>\n"); } - write_htdocs($channel, 'no-update.xml', - '<?xml version="1.0" encoding="UTF-8"?>' - . "\n<updates></updates>\n"); } sub write_htaccess { my ($config, $channel) = @_; - my $flags = "[last]"; - my $htaccess = "RewriteEngine On\n"; - $htaccess .= $config->{htaccess_rewrite_rules}{$channel} // ''; + + my $htaccess_main = "RewriteEngine On\n"; + $htaccess_main .= $config->{htaccess_rewrite_rules}{$channel} // ''; my $versions = as_array($config->{channels}{$channel}); my $versions_str = join('+', @$versions); - my (%oses, %langs, %from_versions); - my $migrate_langs; + foreach my $os (sort keys %{$config->{build_targets}}) { + foreach my $bt (@{ as_array($config->{build_targets}{$os}) }) { + $htaccess_main .= "RewriteRule ^$bt/(.*) $os/\$1 [last]\n"; + } + } + write_htdocs($channel, '.', '.htaccess', $htaccess_main); + + my (%oses, %from_versions); foreach my $version (@$versions) { - $migrate_langs = $config->{versions}{$version}{migrate_langs} - if $config->{versions}{$version}{migrate_langs}; my $files = $config->{versions}{$version}{files}; foreach my $os (keys %$files) { $oses{$os} = 1; - foreach my $lang (keys %{$files->{$os}}) { - $langs{$lang} = 1; - foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { - $from_versions{$from_version} = 1; - } + foreach my $from_version (keys %{$files->{$os}{partial}}) { + $from_versions{$from_version} = 1; } } - $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; } - foreach my $os (sort keys %oses) { - foreach my $bt (build_targets_by_os($os)) { - foreach my $lang (sort keys %langs) { - foreach my $from_version (sort keys %from_versions) { - $htaccess .= "RewriteRule ^$bt/$from_version/$lang " - . "$from_version-$versions_str-$os-$lang.xml $flags\n"; - } - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$versions_str-$os-$lang.xml $flags\n"; - } - foreach my $lang (sort keys %$migrate_langs) { - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$versions_str-$os-$migrate_langs->{$lang}.xml $flags\n"; + foreach my $version (@$versions) { + my $files = $config->{versions}{$version}{files}; + foreach my $os (sort keys %oses) { + my $htaccess_os = "RewriteEngine On\n"; + $htaccess_os .= "RewriteRule ^$version/ no-update.xml [last]\n"; + foreach my $from_version (sort keys %from_versions) { + $htaccess_os .= "RewriteRule ^$from_version/ " + . "$from_version-$versions_str-$os.xml [last]\n"; } - $htaccess .= "RewriteRule ^$bt/ $versions_str-$os-ALL.xml $flags\n"; + $htaccess_os .= "RewriteRule ^[^\/]+/ $versions_str-$os.xml [last]\n"; + write_htdocs($channel, $os, '.htaccess', $htaccess_os); } } - write_htdocs($channel, '.htaccess', $htaccess); } sub write_downloads_json { @@ -501,11 +464,11 @@ sub write_downloads_json { tag => "$tag", downloads => get_version_downloads($config, $version), }; - write_htdocs($channel, 'downloads.json', + write_htdocs($channel, '.', 'downloads.json', JSON->new->utf8->canonical->encode($data)); my $pp_downloads = get_perplatform_downloads($config, $version, $tag); foreach my $os (keys %{$pp_downloads}) { - write_htdocs($channel, "download-$os.json", + write_htdocs($channel, '.', "download-$os.json", JSON->new->utf8->canonical->encode($pp_downloads->{$os})); } } @@ -567,28 +530,26 @@ sub check_update_responses_channel { my $channel_versions = as_array($config->{channels}{$channel}); my ($channel_version) = @$channel_versions; foreach my $build_target (build_targets_list()) { - foreach my $lang (qw(en-US de)) { - my $url = "$base_url/$channel/$build_target/1.0/$lang"; - my $dom = get_remote_xml($url); - if ($dom) { - my $version = check_get_version($dom); - log_step($url, 'version', $version eq $channel_version, - "expected: $channel_version received: $version"); - } - $url = "$base_url/$channel/$build_target/$channel_version/$lang"; + my $url = "$base_url/$channel/$build_target/1.0/ALL"; + my $dom = get_remote_xml($url); + if ($dom) { + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + } + $url = "$base_url/$channel/$build_target/$channel_version/ALL"; + $dom = get_remote_xml($url); + log_step($url, 'no_update', check_no_update($dom)) if $dom; + my @inc = @{$config->{versions}{$channel_version}{incremental_from}} + if $config->{versions}{$channel_version}{incremental_from}; + foreach my $inc_from (@inc) { + my $url = "$base_url/$channel/$build_target/$inc_from/ALL"; $dom = get_remote_xml($url); - log_step($url, 'no_update', check_no_update($dom)) if $dom; - my @inc = @{$config->{versions}{$channel_version}{incremental_from}} - if $config->{versions}{$channel_version}{incremental_from}; - foreach my $inc_from (@inc) { - my $url = "$base_url/$channel/$build_target/$inc_from/$lang"; - $dom = get_remote_xml($url); - next unless $dom; - my $version = check_get_version($dom); - log_step($url, 'version', $version eq $channel_version, - "expected: $channel_version received: $version"); - log_step($url, 'has_incremental', check_has_incremental($dom)); - } + next unless $dom; + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + log_step($url, 'has_incremental', check_has_incremental($dom)); } } } @@ -667,11 +628,9 @@ my %actions = ( exit_error "Wrong arguments" unless @ARGV == 1; my $channel = $ARGV[0]; exit_error "Unknown channel $channel" unless $config->{channels}{$channel}; - $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; write_responses($config, $channel); write_htaccess($config, $channel); write_downloads_json($config, $channel); - clean_htdocs($channel); }, gen_incrementals => sub { my ($config) = @_; 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][base-browser-128.8.0esr-14.5-1] fixup! BB 41631: Prevent weird initial window dimensions caused by subpixel computations
by Pier Angelo Vendrame (＠pierov) 17 Mar '25

17 Mar '25

Pier Angelo Vendrame pushed to branch base-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 23e53d28 by Pier Angelo Vendrame at 2025-03-17T21:08:55+01:00 fixup! BB 41631: Prevent weird initial window dimensions caused by subpixel computations BB 42670: Sometimes LB is applied even when disabled. - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -603,7 +603,7 @@ class _RFPHelper { log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); - if (!(isInitialSize || this.letterboxingEnabled)) { + if (!this.letterboxingEnabled) { // just round size to int return r(aWidth, aHeight); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/23e53d2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/23e53d2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.8.0esr-14.5-1] fixup! BB 41631: Prevent weird initial window dimensions caused by subpixel computations
by Pier Angelo Vendrame (＠pierov) 17 Mar '25

17 Mar '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: a8407f55 by Pier Angelo Vendrame at 2025-03-17T21:08:16+01:00 fixup! BB 41631: Prevent weird initial window dimensions caused by subpixel computations BB 42670: Sometimes LB is applied even when disabled. - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -603,7 +603,7 @@ class _RFPHelper { log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); - if (!(isInitialSize || this.letterboxingEnabled)) { + if (!this.letterboxingEnabled) { // just round size to int return r(aWidth, aHeight); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/a84… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/a84… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-bundle-testsuite][main] Bug 40084: Add browser-single-platform target to Mullvad/Tor Browser nightly builds
by morgan (＠morgan) 17 Mar '25

17 Mar '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-bundle-testsuite Commits: 4299c5eb by Nicolas Vigier at 2025-03-12T19:42:29+01:00 Bug 40084: Add browser-single-platform target to Mullvad/Tor Browser nightly builds With the changes from tor-browser-build#41040, the `browser-single-platform` target is needed when building a single platform. - - - - - 1 changed file: - TBBTestSuite/TestSuite/TorBrowserBuild.pm Changes: ===================================== TBBTestSuite/TestSuite/TorBrowserBuild.pm ===================================== @@ -36,6 +36,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-linux-x86_64', 'torbrowser', ], @@ -56,6 +57,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-linux-i686', 'torbrowser', ], @@ -76,6 +78,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-linux-aarch64', 'torbrowser', ], @@ -96,6 +99,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-windows-i686', 'torbrowser', ], @@ -116,6 +120,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-windows-x86_64', 'torbrowser', ], @@ -136,6 +141,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-macos', 'torbrowser', ], @@ -156,6 +162,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-android-armv7', 'torbrowser', ], @@ -169,6 +176,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-android-x86', 'torbrowser', ], @@ -182,6 +190,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-android-x86_64', 'torbrowser', ], @@ -195,6 +204,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-android-aarch64', 'torbrowser', ], @@ -209,6 +219,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-linux-x86_64', 'mullvadbrowser', ], @@ -229,6 +240,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-linux-aarch64', 'mullvadbrowser', ], @@ -249,6 +261,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-windows-x86_64', 'mullvadbrowser', ], @@ -269,6 +282,7 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', + 'browser-single-platform', 'browser-macos', 'mullvadbrowser', ], View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.8.0esr-14.5-1] fixup! BB 41631: Prevent weird initial window dimensions caused by subpixel computations
by Pier Angelo Vendrame (＠pierov) 17 Mar '25

17 Mar '25

Pier Angelo Vendrame pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: f5c2815d by Pier Angelo Vendrame at 2025-03-17T19:13:24+01:00 fixup! BB 41631: Prevent weird initial window dimensions caused by subpixel computations BB 42670: Sometimes LB is applied even when disabled. - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -603,7 +603,7 @@ class _RFPHelper { log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); - if (!(isInitialSize || this.letterboxingEnabled)) { + if (!this.letterboxingEnabled) { // just round size to int return r(aWidth, aHeight); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f5c2815… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f5c2815… 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 41389: Remove `\` mistakenly added in the middle of a line.
by morgan (＠morgan) 17 Mar '25

17 Mar '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 5752074b by Nicolas Vigier at 2025-03-17T19:46:58+00:00 Bug 41389: Remove `\` mistakenly added in the middle of a line. Fixup for 810e8e207b5e4f568c25c3b3817873fa11684606. - - - - - 181c3a6a by Nicolas Vigier at 2025-03-17T19:46:58+00:00 Bug 41389: tbb_version_build is now `buildN` instead of `N`. Fixup for 810e8e207b5e4f568c25c3b3817873fa11684606. - - - - - ecd7d21b by Nicolas Vigier at 2025-03-17T19:46:58+00:00 Bug 41389: don't generate config in staticiforme-prepare-cdn-dist-upload staticiforme-prepare-cdn-dist-upload is being run on staticiforme, so configuration should not be generated from rbm. Fixup for 4c29020e99aac0d2a06b6ca9b9a3b17e04c7f3de. - - - - - ca6a15eb by Nicolas Vigier at 2025-03-17T19:46:58+00:00 Bug 41394: Don't try to add download-android-*.json files for Mullvad Browser - - - - - 6 changed files: - tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo - tools/signing/functions - tools/signing/staticiforme-prepare-cdn-dist-upload - tools/signing/sync-builder-unsigned-to-local-signed - tools/signing/upload-update_responses-to-staticiforme - tools/signing/wait-for-finished-build Changes: ===================================== tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo ===================================== @@ -11,14 +11,14 @@ do chmod 644 "$tmpfile" if test "$builder" = 'jb'; then file="$file.gpg" - urls=("https://cdn.stagemole.eu/hashes/$SIGNING_PROJECTNAME/$tbb_version-build$tbb…") + urls=("https://cdn.stagemole.eu/hashes/$SIGNING_PROJECTNAME/$tbb_version-$tbb_vers…") else file="$file.asc" urls=( \ - "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ - "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ - "https://tb-build-02.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ - "https://tb-build-03.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ + "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ + "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ + "https://tb-build-02.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ + "https://tb-build-03.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ ) fi for url in "${urls[@]}" ===================================== tools/signing/functions ===================================== @@ -40,7 +40,7 @@ function generate_config { "$SIGNING_PROJECTNAME" --target "$tbb_version_type") echo "SIGNING_PROJECTNAMES=(\"$p1\" \"$p2\" \"$p3\" \"$p4\")" > \ "$script_dir/set-config.generated-config" - local tbb_version_type=$("$rbm" showconf browser \ var/browser_default_channel \ + local tbb_version_type=$("$rbm" showconf browser var/browser_default_channel \ --target "$SIGNING_PROJECTNAME") local tbb_version=$("$rbm" showconf browser var/torbrowser_version \ --target "$SIGNING_PROJECTNAME" --target \ ===================================== tools/signing/staticiforme-prepare-cdn-dist-upload ===================================== @@ -1,5 +1,6 @@ #!/bin/bash set -e +no_generate_config=1 script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" ===================================== tools/signing/sync-builder-unsigned-to-local-signed ===================================== @@ -5,4 +5,4 @@ source "$script_dir/functions" var_is_defined ssh_host_builder builder_tor_browser_build_dir -rsync $rsync_options "$ssh_host_builder:$builder_tor_browser_build_dir/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/" "$signed_version_dir/" +rsync $rsync_options "$ssh_host_builder:$builder_tor_browser_build_dir/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-$tbb_version_build/" "$signed_version_dir/" ===================================== tools/signing/upload-update_responses-to-staticiforme ===================================== @@ -56,9 +56,11 @@ do git commit -m "$tbb_version_type: new version, $tbb_version ($file)" done -git add "$tbb_version_type"/download-android-*.json -git diff --quiet --cached --exit-code || \ - git commit -m "$tbb_version_type: new version, $tbb_version (android)" +if is_project torbrowser; then + git add "$tbb_version_type"/download-android-*.json + git diff --quiet --cached --exit-code || \ + git commit -m "$tbb_version_type: new version, $tbb_version (android)" +fi git add "$tbb_version_type" git diff --quiet --cached --exit-code || \ ===================================== tools/signing/wait-for-finished-build ===================================== @@ -14,7 +14,7 @@ var_is_defined ssh_host_builder builder_tor_browser_build_dir while true do - ssh "$ssh_host_builder" test -f "$builder_tor_browser_build_dir/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/sha256sums-unsigned-build.incrementals.txt" && \ + ssh "$ssh_host_builder" test -f "$builder_tor_browser_build_dir/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-$tbb_version_build/sha256sums-unsigned-build.incrementals.txt" && \ exit 0 echo "$(date -Iseconds): Waiting for build to finish..." sleep 5m 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