Pier Angelo Vendrame pushed to branch maint-12.0-mullvad at The Tor Project / Applications / tor-browser-build

Commits:

4 changed files:

Changes:

  • .gitignore
    ... ... @@ -4,7 +4,7 @@
    4 4
     /out
    
    5 5
     /torbrowser
    
    6 6
     /basebrowser
    
    7
    -/privacybrowser
    
    7
    +/mullvadbrowser
    
    8 8
     /testbuild
    
    9 9
     /rbm.local.conf
    
    10 10
     /logs
    

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

  • projects/firefox/config
    ... ... @@ -11,10 +11,10 @@ container:
    11 11
       use_container: 1
    
    12 12
     
    
    13 13
     var:
    
    14
    -  firefox_platform_version: 102.9.0
    
    14
    +  firefox_platform_version: 102.10.0
    
    15 15
       firefox_version: '[% c("var/firefox_platform_version") %]esr'
    
    16
    -  browser_series: '12.5'
    
    17
    -  browser_branch: '[% c("var/browser_series") %]-1'
    
    16
    +  browser_series: '12.0'
    
    17
    +  browser_branch: '[% c("var/browser_series") %]-2'
    
    18 18
       browser_build: 2
    
    19 19
       branding_directory_prefix: 'tb'
    
    20 20
       copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
    
    ... ... @@ -79,10 +79,6 @@ targets:
    79 79
         git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git
    
    80 80
         var:
    
    81 81
           branding_directory_prefix: 'mb'
    
    82
    -      firefox_platform_version: 102.9.0
    
    83
    -      browser_series: '12.0'
    
    84
    -      browser_branch: '[% c("var/browser_series") %]-2'
    
    85
    -      browser_build: 1
    
    86 82
           gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
    
    87 83
     
    
    88 84
       linux-x86_64:
    

  • rbm.conf
    ... ... @@ -71,10 +71,10 @@ buildconf:
    71 71
       git_signtag_opt: '-s'
    
    72 72
     
    
    73 73
     var:
    
    74
    -  torbrowser_version: '12.5a4'
    
    74
    +  torbrowser_version: '12.0.5'
    
    75 75
       torbrowser_build: 'build1'
    
    76 76
       torbrowser_incremental_from:
    
    77
    -    - 12.5a3
    
    77
    +    - 12.0.4
    
    78 78
       updater_enabled: 1
    
    79 79
       build_mar: 1
    
    80 80
       mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
    
    ... ... @@ -252,9 +252,6 @@ targets:
    252 252
           exe_name: mullvadbrowser
    
    253 253
           mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]'
    
    254 254
           locales: []
    
    255
    -      torbrowser_version: '12.0.4'
    
    256
    -      torbrowser_build: 'build1'
    
    257
    -      torbrowser_incremental_from:
    
    258 255
     
    
    259 256
       torbrowser-testbuild:
    
    260 257
         - testbuild