From 3c1aed3083f2550c03286a25d2ef9c58d79e0f92 Mon Sep 17 00:00:00 2001
From: Pier Angelo Vendrame <pierov@torproject.org>
Date: Tue, 14 Jan 2025 17:37:54 +0100
Subject: [PATCH 1/2] Bug 41349: Fix var/copyright_year in Firefox.
GeckoView had the same problem, but the variable is not used anymore,
so I removed the line rather than fix it.
---
projects/firefox/config | 2 +-
projects/geckoview/config | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/projects/firefox/config b/projects/firefox/config
index 4d453027..210cb731 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -21,7 +21,7 @@ var:
browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
browser_build: 2
branding_directory_prefix: 'tb'
- copyright_year: '[% exec("git show -s --format=%ci" _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]'
+ copyright_year: '[% exec("git show -s --format=%ci " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]'
nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]'
gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
git_commit: '[% exec("git rev-parse " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }) %]'
diff --git a/projects/geckoview/config b/projects/geckoview/config
index 069610fb..9f0860c2 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -22,7 +22,6 @@ var:
browser_rebase: 1
browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
browser_build: 2
- copyright_year: '[% exec("git show -s --format=%ci" _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]'
gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
git_commit: '[% exec("git rev-parse " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }) %]'
deps:
--
GitLab
From 8880f6fafc17e95a85eea009fdf3848523902d14 Mon Sep 17 00:00:00 2001
From: Pier Angelo Vendrame <pierov@torproject.org>
Date: Tue, 14 Jan 2025 17:43:43 +0100
Subject: [PATCH 2/2] Bug 41349: Bump 14.5a2 to build2 for reproducibility
issues.
---
projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt | 3 +++
projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt | 3 +++
rbm.conf | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt b/projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
index ae15182a..4ae11038 100644
--- a/projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
+++ b/projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
@@ -21,7 +21,10 @@ Mullvad Browser 14.5a2 - January 14 2025
* All Platforms
* Bug 43373: Do not run all CI jobs for scheduled jobs. [tor-browser]
* Bug 41340: Update kick_devmole_build script with Mullvad's new GitHub workflow endpoint [tor-browser-build]
+ * Bug 41343: Add signing step to clean some files such as test artifacts [tor-browser-build]
* Bug 40081: Support apt option for not installing recommended dependencies [rbm]
+ * Windows + macOS
+ * Bug 41349: Wrong copyright year makes build non-reproducible [tor-browser-build]
* macOS
* Bug 41325: Newer versions of 7z fail to extract our dmg files because of the /Applications symlink [tor-browser-build]
* Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar [tor-browser-build]
diff --git a/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt b/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
index ee31c17d..5866c66c 100644
--- a/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
+++ b/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
@@ -41,7 +41,10 @@ Tor Browser 14.5a2 - January 14 2025
* Bug 43374: Run the `update-translations` jobs independent of others [tor-browser]
* Bug 41326: Remove var/torbrowser_legacy_version from rbm.conf in alpha/nightly [tor-browser-build]
* Bug 41340: Update kick_devmole_build script with Mullvad's new GitHub workflow endpoint [tor-browser-build]
+ * Bug 41343: Add signing step to clean some files such as test artifacts [tor-browser-build]
* Bug 40081: Support apt option for not installing recommended dependencies [rbm]
+ * Windows + macOS
+ * Bug 41349: Wrong copyright year makes build non-reproducible [tor-browser-build]
* macOS
* Bug 41325: Newer versions of 7z fail to extract our dmg files because of the /Applications symlink [tor-browser-build]
* Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar [tor-browser-build]
diff --git a/rbm.conf b/rbm.conf
index 61c70729..b326c9bb 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -74,7 +74,7 @@ buildconf:
var:
torbrowser_version: '14.5a2'
- torbrowser_build: 'build1'
+ torbrowser_build: 'build2'
# 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: '2025/01/13 19:00:00'
--
GitLab