From afae53dbb9ce7964d796d53b2f97ba2a69f9d3ea Mon Sep 17 00:00:00 2001
From: Morgan <morgan@torproject.org>
Date: Fri, 27 Sep 2024 00:23:09 +0000
Subject: [PATCH] Bug 41241,41242: Prepare Tor,Mullvad Browser 14.0a7
---
.../browser/Bundle-Data/Docs-MB/ChangeLog.txt | 15 +++++++++
.../Bundle-Data/Docs-TBB/ChangeLog.txt | 33 +++++++++++++++++++
projects/browser/config | 4 +--
projects/firefox/config | 6 ++--
projects/geckoview/config | 4 +--
projects/translation/config | 6 ++--
rbm.conf | 6 ++--
7 files changed, 61 insertions(+), 13 deletions(-)
diff --git a/projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt b/projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
index 669c9bdd6..d07633c25 100644
--- a/projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
+++ b/projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
@@ -1,3 +1,18 @@
+Mullvad Browser 14.0a7 - September 27 2024
+ * All Platforms
+ * Updated Firefox to 128.3.0esr
+ * Updated NoScript to 11.4.40
+ * Bug 355: Rebase Mullvad Browser Alpha onto Firefox 128.3.0esr [mullvad-browser]
+ * Bug 42070: Backport Bugzilla 1834307 and hide smooth-scroll UX [tor-browser]
+ * Bug 42362: "New window" missing from File menu [tor-browser]
+ * Bug 42742: Inconsistent use of "New private window" vs "New window" [tor-browser]
+ * Bug 42832: Download spam prevention should not affect browser extensions [tor-browser]
+ * Bug 43163: Disable offscreen canvas until verified it is not fingerprintable [tor-browser]
+ * Bug 41248: Check and update bundled font versions [tor-browser-build]
+ * Build System
+ * All Platforms
+ * Bug 41236: Remove binutils when not needed [tor-browser-build]
+
Mullvad Browser 14.0a6 - September 19 2024
* All Platforms
* Bug 344: set media.navigator.enabled = true [mullvad-browser]
diff --git a/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt b/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
index 36322807e..220ae7ba8 100644
--- a/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
+++ b/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
@@ -1,3 +1,36 @@
+Tor Browser 14.0a7 - September 27 2024
+ * All Platforms
+ * Updated NoScript to 11.4.40
+ * Bug 42832: Download spam prevention should not affect browser extensions [tor-browser]
+ * Bug 43163: Disable offscreen canvas until verified it is not fingerprintable [tor-browser]
+ * Bug 43166: Rebase Tor Browser alpha onto Firefox 128.3.0esr [tor-browser]
+ * Windows + macOS + Linux
+ * Updated Firefox to 128.3.0esr
+ * Bug 42070: Backport Bugzilla 1834307 and hide smooth-scroll UX [tor-browser]
+ * Bug 42362: "New window" missing from File menu [tor-browser]
+ * Bug 42742: Inconsistent use of "New private window" vs "New window" [tor-browser]
+ * Bug 41248: Check and update bundled font versions [tor-browser-build]
+ * Android
+ * Updated GeckoView to 128.3.0esr
+ * Bug 43172: remove remote settings and SERPTelemetry [tor-browser]
+ * Build System
+ * All Platforms
+ * Updated Go to 1.23.1
+ * Bug 41236: Remove binutils when not needed [tor-browser-build]
+ * Windows + macOS + Linux
+ * Bug 41246: Add updater rewriterules to make 13.5a10 a watershed [tor-browser-build]
+
+Tor Browser 13.5a10 - September 25 2024
+ * Windows + macOS + Linux
+ * Updated Firefox to 115.15.0esr
+ * Updated NoScript to 11.4.37
+ * Updated OpenSSL to 3.0.15
+ * Windows + macOS
+ * Bug 42747: Windows 7/8 and macOS 10.12-10.14 Legacy/Maintenance [tor-browser]
+ * Build System
+ * Windows + macOS + Linux
+ * Updated Go to 1.21.12
+
Tor Browser 14.0a6 - September 19 2024
* All Platforms
* Bug 42831: Remove the shopping components [tor-browser]
diff --git a/projects/browser/config b/projects/browser/config
index a1aa6e443..d0d38ed4f 100644
--- a/projects/browser/config
+++ b/projects/browser/config
@@ -108,9 +108,9 @@ input_files:
enable: '[% ! c("var/android") %]'
- filename: Bundle-Data
enable: '[% ! c("var/android") %]'
- - URL: https://addons.mozilla.org/firefox/downloads/file/4349514/noscript-11.4.37.xpi
+ - URL: https://addons.mozilla.org/firefox/downloads/file/4357325/noscript-11.4.40.xpi
name: noscript
- sha256sum: 5e9921599c63e0b357851ea7ca1354554b3af2c676bbbfff5687cafce4396c18
+ sha256sum: 242ead426159d871480a13062cbee08abc97da746cdc5c643aee2692e9adbbb2
- URL: https://addons.mozilla.org/firefox/downloads/file/4328681/ublock_origin-1.59.0.xpi
name: ublock-origin
sha256sum: 1db9c676a07d141f8d36dbbc24f9e3d64a6cc2340dbfc6c848bc4395f96cfb14
diff --git a/projects/firefox/config b/projects/firefox/config
index f88c64e9c..cd864afba 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -14,12 +14,12 @@ container:
use_container: 1
var:
- firefox_platform_version: '128.2.0'
+ firefox_platform_version: '128.3.0'
firefox_version: '[% c("var/firefox_platform_version") %]esr'
browser_series: '14.0'
browser_rebase: 1
browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
- browser_build: 6
+ browser_build: 2
branding_directory_prefix: 'tb'
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]'
@@ -107,7 +107,7 @@ targets:
gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/'
nightly_updates_publish_dir_prefix: mullvadbrowser-
- browser_build: 4
+ browser_build: 1
linux-x86_64:
var:
diff --git a/projects/geckoview/config b/projects/geckoview/config
index b68d83e6f..5274c8f80 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -16,12 +16,12 @@ container:
build_apk: 1
var:
- firefox_platform_version: '128.2.0'
+ firefox_platform_version: '128.3.0'
geckoview_version: '[% c("var/firefox_platform_version") %]esr'
browser_series: '14.0'
browser_rebase: 1
browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
- browser_build: 6
+ browser_build: 2
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
git_commit: '[% exec("git rev-parse HEAD") %]'
diff --git a/projects/translation/config b/projects/translation/config
index 33de6017b..aa0f4bd65 100644
--- a/projects/translation/config
+++ b/projects/translation/config
@@ -18,13 +18,13 @@ steps:
git_hash: 'base-browser'
tor-browser:
tor-browser: '[% INCLUDE build %]'
- git_hash: 92b97bec9c21cc8881bee506bd75e05bab7578a3
+ git_hash: 816fcde248e0e25c8ad921d25ec97a374a59ed94
targets:
nightly:
git_hash: 'tor-browser'
mullvad-browser:
mullvad-browser: '[% INCLUDE build %]'
- git_hash: bff8092bbe5ae93b2c162ade300d739b2cd9e92d
+ git_hash: 78212a3da2439e436ac5f73d8e3eb908145c3ece
targets:
nightly:
git_hash: 'mullvad-browser'
@@ -32,7 +32,7 @@ steps:
fenix: '[% INCLUDE build %]'
# We need to bump the commit before releasing but just pointing to a branch
# might cause too much rebuidling of the Firefox part.
- git_hash: 0f1821e7e70c8ae3d8d59b9d889d95c135913bd9
+ git_hash: 12b033e4192448315794f5fe8203fe91dcc29a8c
compress_tar: 'zst'
targets:
nightly:
diff --git a/rbm.conf b/rbm.conf
index 4504d8ce7..b8323a036 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -73,18 +73,18 @@ buildconf:
git_signtag_opt: '-s'
var:
- torbrowser_version: '14.0a6'
+ torbrowser_version: '14.0a7'
torbrowser_build: 'build1'
# This should be the date of when the build is started. For the build
# to be reproducible, browser_release_date should always be in the past.
- browser_release_date: '2024/09/19 19:03:33'
+ browser_release_date: '2024/09/27 00:19:33'
browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]'
updater_enabled: 1
build_mar: 1
torbrowser_incremental_from:
+ - 14.0a6
- 14.0a5
- 14.0a4
- - 14.0a3
mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
# By default, we sort the list of installed packages. This allows sharing
--
GitLab