[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][maint-14.0] 3 commits: Bug 41282: Downgrade to Python 3.9.



Title: GitLab

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

Commits:

  • 6f8d7791
    by Pier Angelo Vendrame at 2024-10-28T10:03:33+01:00
    Bug 41282: Downgrade to Python 3.9.
    
    MozBug 1924022 introduced a dependency on the Python built-in SSL
    module.
    This caused an error in our Linux builds, because we run them in a very
    old version of Debian that still uses OpenSSL 1.1.0, which is not
    compatible with Python SSL module since Python 3.10.
    The less intrusive way to resolve this is to downgrade to Python 3.9.x,
    which is still supported by all our projects.
    
    Also, switch to hashes to verify the Python source tarball, as the
    Python Software Foundation often rotates keys, which reduces the
    advantages of verifying the signature rather than the hash for us.
    
  • bcb2346e
    by Pier Angelo Vendrame at 2024-10-28T10:03:35+01:00
    Bug 41289: Fix --tor-browser in relprep.py.
    
    --tor-browser enabled also Mullvad Browser, probably because of a
    copy-paste error.
    
  • f076e0b0
    by Pier Angelo Vendrame at 2024-10-28T11:56:11+01:00
    Bug 41277: Prepare Tor Browser release 14.0.1.
    

10 changed files:

Changes:

  • keyring/python.gpg deleted
    No preview for this file type
  • projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
    1
    +Tor Browser 14.0.1 - October 29 2024
    
    2
    + * All Platforms
    
    3
    +   * Updated Tor to 0.4.8.13
    
    4
    +   * Bug 43231: Rebase Tor Browser 128-based stable and alpha onto 128.4.0esr [tor-browser]
    
    5
    +   * Bug 43240: Backport security fixes from Firefox 132 [tor-browser]
    
    6
    + * Windows + macOS + Linux
    
    7
    +   * Updated Firefox to 128.4.0esr
    
    8
    + * Android
    
    9
    +   * Updated GeckoView to 128.4.0esr
    
    10
    + * Build System
    
    11
    +   * All Platforms
    
    12
    +     * Bug 41289: Fix single-browser in relprep.py [tor-browser-build]
    
    13
    +   * Linux
    
    14
    +     * Bug 41282: Add SSL to our custom Python for MozBug 1924022 [tor-browser-build]
    
    15
    +
    
    1 16
     Tor Browser 14.0 - October 17 2024
    
    2 17
      * All Platforms
    
    3 18
        * Bug 30543: compat: make spoofed orientation reflect spoofed screen dimensions [1607032 + 1918202] [tor-browser]
    

  • projects/firefox/config
    ... ... @@ -14,12 +14,12 @@ container:
    14 14
       use_container: 1
    
    15 15
     
    
    16 16
     var:
    
    17
    -  firefox_platform_version: '128.3.0'
    
    17
    +  firefox_platform_version: '128.4.0'
    
    18 18
       firefox_version: '[% c("var/firefox_platform_version") %]esr'
    
    19 19
       browser_series: '14.0'
    
    20 20
       browser_rebase: 1
    
    21 21
       browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
    
    22
    -  browser_build: 6
    
    22
    +  browser_build: 2
    
    23 23
       branding_directory_prefix: 'tb'
    
    24 24
       copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
    
    25 25
       nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]'
    
    ... ... @@ -107,7 +107,7 @@ targets:
    107 107
           gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
    
    108 108
           updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/'
    
    109 109
           nightly_updates_publish_dir_prefix: mullvadbrowser-
    
    110
    -      browser_build: 3
    
    110
    +      browser_build: 1
    
    111 111
     
    
    112 112
       linux-x86_64:
    
    113 113
         var:
    

  • projects/geckoview/config
    ... ... @@ -16,12 +16,12 @@ container:
    16 16
         build_apk: 1
    
    17 17
     
    
    18 18
     var:
    
    19
    -  firefox_platform_version: '128.3.0'
    
    19
    +  firefox_platform_version: '128.4.0'
    
    20 20
       geckoview_version: '[% c("var/firefox_platform_version") %]esr'
    
    21 21
       browser_series: '14.0'
    
    22 22
       browser_rebase: 1
    
    23 23
       browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
    
    24
    -  browser_build: 6
    
    24
    +  browser_build: 2
    
    25 25
       copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
    
    26 26
       gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
    
    27 27
       git_commit: '[% exec("git rev-parse HEAD") %]'
    

  • projects/manual/config
    1 1
     # vim: filetype=yaml sw=2
    
    2 2
     # To update, see doc/how-to-update-the-manual.txt
    
    3 3
     # Remember to update also the package's hash, with the version!
    
    4
    -version: 214072
    
    4
    +version: 215922
    
    5 5
     filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    
    6 6
     container:
    
    7 7
       use_container: 1
    
    ... ... @@ -23,6 +23,6 @@ input_files:
    23 23
       - project: container-image
    
    24 24
       - URL: 'https://build-sources.tbb.torproject.org/manual_[% c("version") %].zip'
    
    25 25
         name: manual
    
    26
    -    sha256sum: 744fc65f6dd2cc2b85f4927fbb55ff6e17f06b9c99bd0bae7a311d732438b818
    
    26
    +    sha256sum: b5ed703f54d52e9f197320f3698e936d585a3fed23cc4f9fbf59edce2869f885
    
    27 27
       - filename: packagemanual.py
    
    28 28
         name: package_script

  • projects/python/config
    1 1
     # vim: filetype=yaml sw=2
    
    2
    -version: 3.11.3
    
    2
    +version: 3.9.20
    
    3 3
     filename: 'python-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    
    4 4
     container:
    
    5 5
       use_container: 1
    
    ... ... @@ -24,9 +24,7 @@ input_files:
    24 24
       - project: container-image
    
    25 25
       - name: python
    
    26 26
         URL: 'https://www.python.org/ftp/python/[% c("version") %]/Python-[% c("version") %].tar.xz'
    
    27
    -    gpg_keyring: python.gpg
    
    28
    -    sig_ext: asc
    
    29
    -    file_gpg_id: 1
    
    27
    +    sha256sum: 6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c
    
    30 28
       - name: '[% c("var/compiler") %]'
    
    31 29
         project: '[% c("var/compiler") %]'
    
    32 30
         enable: '[% c("var/linux") %]'

  • projects/tor/config
    1 1
     # vim: filetype=yaml sw=2
    
    2 2
     filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    
    3
    -version: 0.4.8.12
    
    3
    +version: 0.4.8.13
    
    4 4
     git_hash: 'tor-[% c("version") %]'
    
    5 5
     git_url: https://gitlab.torproject.org/tpo/core/tor.git
    
    6 6
     git_submodule: 1
    

  • projects/translation/config
    ... ... @@ -12,13 +12,13 @@ compress_tar: 'gz'
    12 12
     steps:
    
    13 13
       base-browser:
    
    14 14
         base-browser: '[% INCLUDE build %]'
    
    15
    -    git_hash: 547400dd678f476ec38efde2cf703d57c1a3e8c7
    
    15
    +    git_hash: 3b1be2065b54939ed019d94174f137847bcf3c66
    
    16 16
         targets:
    
    17 17
           nightly:
    
    18 18
             git_hash: 'base-browser'
    
    19 19
       tor-browser:
    
    20 20
         tor-browser: '[% INCLUDE build %]'
    
    21
    -    git_hash: 38d5c3b11cfb96833ae2c7dc3122829b29583d6f
    
    21
    +    git_hash: ba63bd165f3fd4bdd472815c9761413d4671cfb7
    
    22 22
         targets:
    
    23 23
           nightly:
    
    24 24
             git_hash: 'tor-browser'
    
    ... ... @@ -32,7 +32,7 @@ steps:
    32 32
         fenix: '[% INCLUDE build %]'
    
    33 33
         # We need to bump the commit before releasing but just pointing to a branch
    
    34 34
         # might cause too much rebuidling of the Firefox part.
    
    35
    -    git_hash: 705bbd235cadf827b6d4e0003d59c290f2feaa44
    
    35
    +    git_hash: 60f82208b8a0a95e91fdb4dcefe8d394c17f64ba
    
    36 36
         compress_tar: 'zst'
    
    37 37
         targets:
    
    38 38
           nightly:
    

  • rbm.conf
    ... ... @@ -73,22 +73,22 @@ buildconf:
    73 73
       git_signtag_opt: '-s'
    
    74 74
     
    
    75 75
     var:
    
    76
    -  torbrowser_version: '14.0'
    
    76
    +  torbrowser_version: '14.0.1'
    
    77 77
       torbrowser_build: 'build1'
    
    78 78
       # This should be the date of when the build is started. For the build
    
    79 79
       # to be reproducible, browser_release_date should always be in the past.
    
    80
    -  browser_release_date: '2024/10/16 16:45:00'
    
    80
    +  browser_release_date: '2024/10/28 09:00:00'
    
    81 81
       browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]'
    
    82 82
       updater_enabled: 1
    
    83 83
       build_mar: 1
    
    84 84
       torbrowser_incremental_from:
    
    85
    -    - 13.5.7
    
    86
    -    - 13.5.6
    
    87
    -    - 13.5.5
    
    85
    +    - '[% IF c("var/tor-browser") %]14.0[% END %]'
    
    86
    +    - '13.5.9'
    
    87
    +    - '13.5.7'
    
    88 88
       mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
    
    89 89
     
    
    90
    -  torbrowser_legacy_version: 13.5.7
    
    91
    -  torbrowser_legacy_platform_version: 115.16.0
    
    90
    +  torbrowser_legacy_version: 13.5.9
    
    91
    +  torbrowser_legacy_platform_version: 115.17.0
    
    92 92
     
    
    93 93
       # By default, we sort the list of installed packages. This allows sharing
    
    94 94
       # containers with identical list of packages, even if they are not listed
    

  • tools/relprep.py
    ... ... @@ -92,7 +92,7 @@ class ReleasePreparation:
    92 92
             self.repo = Repo(self.base_path)
    
    93 93
     
    
    94 94
             self.tor_browser = bool(kwargs.get("tor_browser", True))
    
    95
    -        self.mullvad_browser = bool(kwargs.get("tor_browser", True))
    
    95
    +        self.mullvad_browser = bool(kwargs.get("mullvad_browser", True))
    
    96 96
             if not self.tor_browser and not self.mullvad_browser:
    
    97 97
                 raise ValueError("Nothing to do")
    
    98 98
             self.android = kwargs.get("android", self.tor_browser)
    

  • _______________________________________________
    tor-commits mailing list
    tor-commits@xxxxxxxxxxxxxxxxxxxx
    https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits