richard pushed to branch maint-12.5 at The Tor Project / Applications / tor-browser-build

Commits:

9 changed files:

Changes:

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

  • ChangeLog.txtChangeLog-TBB.txt

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

  • projects/browser/Bundle-Data/Docs-PB/Licenses/uBlockOrigin.txtprojects/browser/Bundle-Data/Docs-MB/Licenses/uBlockOrigin.txt

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

  • projects/browser/config
    ... ... @@ -106,13 +106,13 @@ input_files:
    106 106
       - URL: https://addons.mozilla.org/firefox/downloads/file/4111078/noscript-11.4.22.xpi
    
    107 107
         name: noscript
    
    108 108
         sha256sum: 46a84c85df4c6be11905388ad2b66aeb5a010ed615484112c8c1710ad13bc36e
    
    109
    -  - URL: https://addons.mozilla.org/firefox/downloads/file/4103048/ublock_origin-1.49.2.xpi
    
    109
    +  - URL: https://addons.mozilla.org/firefox/downloads/file/4121906/ublock_origin-1.50.0.xpi
    
    110 110
         name: ublock-origin
    
    111
    -    sha256sum: 39266486f720cd31d291d2fdad78625b079782a05517e1936eec7e780bc2a84d
    
    111
    +    sha256sum: 10618003e70b528c3f17996e373146d39e6b15f777ac4ca1f214da2ffdb7a5b3
    
    112 112
         enable: '[% c("var/mullvad-browser") %]'
    
    113
    -  - URL: https://github.com/mullvad/browser-extension/releases/download/v0.7.9-firefox-beta/mullvad-browser-extension-0.7.9.xpi
    
    113
    +  - URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.3-firefox-beta/mullvad-browser-extension-0.8.3.xpi
    
    114 114
         name: mullvad-extension
    
    115
    -    sha256sum: 17ce31b32e8be0f0db86a5a5ed93607cc84d5e2092341aee0b8eaba1c0746390
    
    115
    +    sha256sum: e531ce6e809091eb40848874ea9e695bce61196397b6d8238ab582a152e02ac7
    
    116 116
         enable: '[% c("var/mullvad-browser") %]'
    
    117 117
       - filename: 'gtk3-settings.ini'
    
    118 118
         enable: '[% c("var/linux") %]'
    

  • projects/firefox/config
    ... ... @@ -85,7 +85,7 @@ targets:
    85 85
         git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git
    
    86 86
         var:
    
    87 87
           branding_directory_prefix: 'mb'
    
    88
    -      browser_build: 1
    
    88
    +      browser_build: 2
    
    89 89
           gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
    
    90 90
     
    
    91 91
       linux-x86_64:
    

  • rbm.conf
    ... ... @@ -277,8 +277,7 @@ targets:
    277 277
           exe_name: mullvadbrowser
    
    278 278
           mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]'
    
    279 279
           locales: []
    
    280
    -      torbrowser_incremental_from:
    
    281
    -        - 12.5a6
    
    280
    +      torbrowser_build: 'build1'
    
    282 281
     
    
    283 282
       torbrowser-testbuild:
    
    284 283
         - testbuild
    

  • tools/changelog-format-blog-post
    ... ... @@ -12,7 +12,7 @@ sub version_type {
    12 12
     
    
    13 13
     my ($changelog, $current_tbversion, $last_tbversion);
    
    14 14
     
    
    15
    -if (!open(CHANGELOG, '<', "$FindBin::Bin/../ChangeLog.txt")) {
    
    15
    +if (!open(CHANGELOG, '<', "$FindBin::Bin/../ChangeLog-TBB.txt")) {
    
    16 16
       print STDERR "Error opening changelog file\n";
    
    17 17
       exit 1;
    
    18 18
     }
    
    ... ... @@ -49,6 +49,6 @@ if (! ( $current_tbversion =~ m/a/ ) ) {
    49 49
       my @v = split(/\./, $current_tbversion);
    
    50 50
       $changelog_branch = "maint-$v[0].$v[1]";
    
    51 51
     }
    
    52
    -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";
    
    52
    +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";
    
    53 53
     
    
    54 54
     print $changelog;