ChangeLog-MB.txt

+projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
\ No newline at end of file

projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt

+Mullvad Browser 12.5 - June 21 2023
+ * All Platforms
+   * Updated uBlock Origin to 1.50.0
+   * Updated mullvad-browser-extension to version 0.8.3
+ * Windows + macOS + Linux
+   * Bug 41577: Disable profile migration [tor-browser]
+   * Bug 41595: Disable pagethumbnails capturing [tor-browser]
+   * Bug 41609: Move the disabling of Firefox Home (Activity Stream) to base-browser [tor-browser]
+   * Bug 41668: Move part of the updater patches to base browser [tor-browser]
+   * Bug 41686: Move the 'Bug 11641: Disable remoting by default' commit from base-browser to tor-browser [tor-browser]
+   * Bug 41695: Port warning on maximized windows without letterboxing from torbutton [tor-browser]
+   * Bug 41701: Reporting an extension does not work [tor-browser]
+   * Bug 41711: Race condition when opening a new window in New Identity [tor-browser]
+   * Bug 41736: Customize the default CustomizableUI toolbar using CustomizableUI.jsm [tor-browser]
+   * Bug 41738: Replace the patch to disable live reload with its preference [tor-browser]
+   * Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp [tor-browser]
+ * Windows + Linux
+   * Bug 41654: UpdateInfo jumped into Data [tor-browser]
+ * Linux
+   * Bug 40860: Improve the transition from the old fontconfig file to the new one [tor-browser-build]
+   * Bug 41163: Many bundled fonts are blocked in Ubuntu/Fedora because of RFP [tor-browser]
+   * Bug 41732: implement linux font whitelist as defense-in-depth [tor-browser]
+ * Build System
+   * All Platforms
+     * Bug 40837: Rebase mullvad-browser build changes onto main [tor-browser-build]
+     * Bug 40870: Remove url without browser name from tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build]
+   * Windows + macOS + Linux
+     * Bug 40826: Correctly set appname_marfile for basebrowser in tools/signing/nightly/update-responses-base-config.yml [tor-browser-build]
+     * Bug 40866: Remove `Using ansible to set up a nightly build machine` from README [tor-browser-build]
+   * macOS
+     * Bug 40858: Create script to assist testers self sign Mac builds to allow running on Arm processors [tor-browser-build]

projects/browser/build

@@ -237,7 +237,7 @@ do
       [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] \
       -c . | tar -C "$tbdir[% IF ! c("var/macos") %]/[% c('var/ProjectName') %][% END %]" -x
   [% ELSIF c("var/mullvad-browser") -%]
-    cp -a Bundle-Data/Docs-PB/* "$tbdir/$DOCSPATH"
+    cp -a Bundle-Data/Docs-MB/* "$tbdir/$DOCSPATH"
   [% END -%]
 done
 

projects/browser/config

@@ -106,13 +106,13 @@ input_files:
   - URL: https://addons.mozilla.org/firefox/downloads/file/4111078/noscript-11.4.22.xpi
     name: noscript
     sha256sum: 46a84c85df4c6be11905388ad2b66aeb5a010ed615484112c8c1710ad13bc36e
-  - URL: https://addons.mozilla.org/firefox/downloads/file/4103048/ublock_origin-1.49.2.xpi
+  - URL: https://addons.mozilla.org/firefox/downloads/file/4121906/ublock_origin-1.50.0.xpi
     name: ublock-origin
-    sha256sum: 39266486f720cd31d291d2fdad78625b079782a05517e1936eec7e780bc2a84d
+    sha256sum: 10618003e70b528c3f17996e373146d39e6b15f777ac4ca1f214da2ffdb7a5b3
     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
+  - URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.3-firefox-beta/mullvad-browser-extension-0.8.3.xpi
     name: mullvad-extension
-    sha256sum: 17ce31b32e8be0f0db86a5a5ed93607cc84d5e2092341aee0b8eaba1c0746390
+    sha256sum: e531ce6e809091eb40848874ea9e695bce61196397b6d8238ab582a152e02ac7
     enable: '[% c("var/mullvad-browser") %]'
   - filename: 'gtk3-settings.ini'
     enable: '[% c("var/linux") %]'

projects/firefox/config

@@ -85,7 +85,7 @@ targets:
     git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git
     var:
       branding_directory_prefix: 'mb'
-      browser_build: 1
+      browser_build: 2
       gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
 
   linux-x86_64:

rbm.conf

@@ -277,8 +277,7 @@ targets:
       exe_name: mullvadbrowser
       mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]'
       locales: []
-      torbrowser_incremental_from:
-        - 12.5a6
+      torbrowser_build: 'build1'
 
   torbrowser-testbuild:
     - testbuild

tools/changelog-format-blog-post

@@ -12,7 +12,7 @@ sub version_type {
 
 my ($changelog, $current_tbversion, $last_tbversion);
 
-if (!open(CHANGELOG, '<', "$FindBin::Bin/../ChangeLog.txt")) {
+if (!open(CHANGELOG, '<', "$FindBin::Bin/../ChangeLog-TBB.txt")) {
   print STDERR "Error opening changelog file\n";
   exit 1;
 }
@@ -49,6 +49,6 @@ if (! ( $current_tbversion =~ m/a/ ) ) {
   my @v = split(/\./, $current_tbversion);
   $changelog_branch = "maint-$v[0].$v[1]";
 }
-print "The full changelog since [Tor Browser $last_tbversion](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$changelog_branch/projects/browser/Bundle-Data/Docs/ChangeLog.txt) is:\n\n";
+print "The full changelog since [Tor Browser $last_tbversion](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$changelog_branch/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt) is:\n\n";
 
 print $changelog;