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

28 Oct 2024


      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:

- − keyring/python.gpg
- projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
- projects/firefox/config
- projects/geckoview/config
- projects/manual/config
- projects/python/config
- projects/tor/config
- projects/translation/config
- rbm.conf
- tools/relprep.py


Changes:

=====================================
keyring/python.gpg deleted
=====================================
Binary files a/keyring/python.gpg and /dev/null differ


=====================================
projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
=====================================
@@ -1,3 +1,18 @@
+Tor Browser 14.0.1 - October 29 2024
+ * All Platforms
+   * Updated Tor to 0.4.8.13
+   * Bug 43231: Rebase Tor Browser 128-based stable and alpha onto 128.4.0esr [tor-browser]
+   * Bug 43240: Backport security fixes from Firefox 132 [tor-browser]
+ * Windows + macOS + Linux
+   * Updated Firefox to 128.4.0esr
+ * Android
+   * Updated GeckoView to 128.4.0esr
+ * Build System
+   * All Platforms
+     * Bug 41289: Fix single-browser in relprep.py [tor-browser-build]
+   * Linux
+     * Bug 41282: Add SSL to our custom Python for MozBug 1924022 [tor-browser-build]
+
 Tor Browser 14.0 - October 17 2024
  * All Platforms
    * Bug 30543: compat: make spoofed orientation reflect spoofed screen dimensions [1607032 + 1918202] [tor-browser]


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


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


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


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


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


=====================================
projects/translation/config
=====================================
@@ -12,13 +12,13 @@ compress_tar: 'gz'
 steps:
   base-browser:
     base-browser: '[% INCLUDE build %]'
-    git_hash: 547400dd678f476ec38efde2cf703d57c1a3e8c7
+    git_hash: 3b1be2065b54939ed019d94174f137847bcf3c66
     targets:
       nightly:
         git_hash: 'base-browser'
   tor-browser:
     tor-browser: '[% INCLUDE build %]'
-    git_hash: 38d5c3b11cfb96833ae2c7dc3122829b29583d6f
+    git_hash: ba63bd165f3fd4bdd472815c9761413d4671cfb7
     targets:
       nightly:
         git_hash: 'tor-browser'
@@ -32,7 +32,7 @@ steps:
     fenix: '[% INCLUDE build %]'
     # We need to bump the commit before releasing but just pointing to a branch
     # might cause too much rebuidling of the Firefox part.
-    git_hash: 705bbd235cadf827b6d4e0003d59c290f2feaa44
+    git_hash: 60f82208b8a0a95e91fdb4dcefe8d394c17f64ba
     compress_tar: 'zst'
     targets:
       nightly:


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


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



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/a...

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/a...
You're receiving this email because of your account on gitlab.torproject.org.

    

Pier Angelo Vendrame (＠pierov)

tags

participants (1)