Bug 40839: Prepare Mullvad Browser Release 12.0.5

.gitignore

@@ -4,7 +4,7 @@
 /out
 /torbrowser
 /basebrowser
-/privacybrowser
+/mullvadbrowser
 /testbuild
 /rbm.local.conf
 /logs

projects/browser/config

@@ -103,12 +103,12 @@ input_files:
     enable: '[% ! c("var/android") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.mozilla.org/firefox/downloads/file/4086528/noscript-11.4.20.xpi
+  - URL: https://addons.mozilla.org/firefox/downloads/file/4090970/noscript-11.4.21.xpi
     name: noscript
-    sha256sum: 014aec3ce142222338372d227eaadfa2ae13c9e3861f6d43869615b932ce4b53
-  - URL: https://addons.mozilla.org/firefox/downloads/file/4086892/ublock_origin-1.48.0.xpi
+    sha256sum: 0fd3b66a2780d03a5b3cd460216105f3df2b27c6d3a552c1769c5de48c9e2338
+  - URL: https://addons.mozilla.org/firefox/downloads/file/4092158/ublock_origin-1.48.4.xpi
     name: ublock-origin
-    sha256sum: 787950ad4fdbf57ffab136c706918077ed15b0b4fb22b5429ddd0043de3c9720
+    sha256sum: d7666b963c2969b0014937aae55472eea5098ff21ed3bea8a2e1f595f62856c1
     enable: '[% c("var/mullvad-browser") %]'
   - URL: https://github.com/mullvad/browser-extension/releases/download/v0.7.9-firefox-beta/mullvad-browser-extension-0.7.9.xpi
     name: mullvad-extension

projects/firefox/config

@@ -11,10 +11,10 @@ container:
   use_container: 1
 
 var:
-  firefox_platform_version: 102.9.0
+  firefox_platform_version: 102.10.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
-  browser_series: '12.5'
-  browser_branch: '[% c("var/browser_series") %]-1'
+  browser_series: '12.0'
+  browser_branch: '[% c("var/browser_series") %]-2'
   browser_build: 2
   branding_directory_prefix: 'tb'
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
@@ -79,10 +79,6 @@ targets:
     git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git
     var:
       branding_directory_prefix: 'mb'
-      firefox_platform_version: 102.9.0
-      browser_series: '12.0'
-      browser_branch: '[% c("var/browser_series") %]-2'
-      browser_build: 1
       gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
 
   linux-x86_64:

rbm.conf

@@ -71,10 +71,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '12.5a4'
+  torbrowser_version: '12.0.5'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 12.5a3
+    - 12.0.4
   updater_enabled: 1
   build_mar: 1
   mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
@@ -252,9 +252,6 @@ targets:
       exe_name: mullvadbrowser
       mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]'
       locales: []
-      torbrowser_version: '12.0.4'
-      torbrowser_build: 'build1'
-      torbrowser_incremental_from:
 
   torbrowser-testbuild:
     - testbuild