[tor-commits] [Git][tpo/applications/tor-browser-build][maint-13.5] 2 commits: Bug 41166: Use the GitHub repository for firefox-l10n.

Pier Angelo Vendrame (@pierov) git at gitlab.torproject.org
Tue Jul 9 16:20:15 UTC 2024



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


Commits:
abe0d0a3 by Pier Angelo Vendrame at 2024-07-09T17:44:19+02:00
Bug 41166: Use the GitHub repository for firefox-l10n.

Mozilla uplifted Bug 1900421 to 115 to 128, so we have to switch to the
new GitHub repository immediately as well.

- - - - -
902b2dbe by Pier Angelo Vendrame at 2024-07-09T17:44:23+02:00
Bug 41174, 41175: Tor, Mullvad Browser 13.5.1 release preparation

- - - - -


12 changed files:

- README
- projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
- projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
- projects/browser/allowed_addons.json
- projects/firefox-android/config
- projects/firefox-l10n/config
- projects/firefox/config
- projects/geckoview/config
- projects/go/config
- projects/manual/config
- projects/translation/config
- rbm.conf


Changes:

=====================================
README
=====================================
@@ -10,7 +10,7 @@ etc ...). You will need to install the uidmap package, providing the
 newuidmap and newgidmap commands.
 
 The sources of most components are downloaded using git, which needs to
-be installed. The mercurial package is also needed.
+be installed.
 
 Zstandard (zstd) is used to compress some tarballs and needs to be
 installed. You'll also need tar >= 1.31, for zstd support.
@@ -46,7 +46,7 @@ If you are running Debian or Ubuntu, you can install them with:
                   libparallel-forkmanager-perl libpath-tiny-perl \
                   libsort-versions-perl libstring-shellquote-perl \
                   libtemplate-perl libxml-libxml-perl libxml-writer-perl \
-                  libyaml-libyaml-perl git mercurial uidmap zstd
+                  libyaml-libyaml-perl git uidmap zstd
 
 If you are running Fedora, CentOS or RHEL, you can install them with:
 
@@ -57,7 +57,7 @@ If you are running Fedora, CentOS or RHEL, you can install them with:
               "perl(File::Copy::Recursive)" "perl(String::ShellQuote)" \
               "perl(Sort::Versions)" "perl(Digest::SHA)" "perl(Data::UUID)" \
               "perl(Data::Dump)" "perl(DateTime)" "perl(XML::Writer)" \
-              "perl(Parallel::ForkManager)" perl-ph mercurial git zstd
+              "perl(Parallel::ForkManager)" perl-ph git zstd
 
 If you are running an Arch based system, you should be able to install them with:
 


=====================================
projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
=====================================
@@ -1,3 +1,17 @@
+Mullvad Browser 13.5.1 - July 09 2024
+ * All Platforms
+   * Updated Firefox to 115.13.0esr
+   * Bug 317: Rebase Mullvad Browser stable onto 115.13.0esr [mullvad-browser]
+   * Bug 42693: Backports security fixes from Firefox 128 [tor-browser]
+ * Linux
+   * Bug 314: Mullvad Browser is not listed as a possible default browser application for Gnome on Ubuntu / Fedora [mullvad-browser]
+ * Build System
+   * All Platforms
+     * Bug 41166: Use the GitHub repository for firefox-l10n [tor-browser-build]
+     * Bug 41173: Fix permission issue on files in the debian directory [tor-browser-build]
+   * Windows
+     * Bug 41177: Include Windows installer without -portable- in download json files [tor-browser-build]
+
 Mullvad Browser 13.5 - June 17 2024
  * All Platforms
    * Bug 222: Hide "List all tabs" when the tabs don't overflow [mullvad-browser]


=====================================
projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
=====================================
@@ -1,3 +1,18 @@
+Tor Browser 13.5.1 - July 09 2024
+ * All Platforms
+   * Bug 42689: Rebase Tor Browser onto 115.13.0esr [tor-browser]
+   * Bug 42693: Backports security fixes from Firefox 128 [tor-browser]
+ * Windows + macOS + Linux
+   * Updated Firefox to 115.13.0esr
+ * Android
+   * Updated GeckoView to 115.13.0esr
+ * Build System
+   * All Platforms
+     * Updated Go to 1.21.12
+     * Bug 41166: Use the GitHub repository for firefox-l10n [tor-browser-build]
+   * Windows
+     * Bug 41177: Include Windows installer without -portable- in download json files [tor-browser-build]
+
 Tor Browser 13.5 - June 17 2024
  * All Platforms
    * Bug 40856: Add a default for preferences in TorSettings [tor-browser]


=====================================
projects/browser/allowed_addons.json
=====================================
Binary files a/projects/browser/allowed_addons.json and b/projects/browser/allowed_addons.json differ


=====================================
projects/firefox-android/config
=====================================
@@ -16,7 +16,7 @@ container:
 var:
   fenix_version: 115.2.1
   browser_branch: 13.5-1
-  browser_build: 12
+  browser_build: 13
   variant: Beta
   # This should be updated when the list of gradle dependencies is changed.
   gradle_dependencies_version: 1


=====================================
projects/firefox-l10n/config
=====================================
@@ -2,15 +2,22 @@
 version: '[% pc("firefox", "abbrev") %]'
 filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-[% c("var/build_id") %]'
 link_input_files: 1
+# We need to specify git_url in the root to make this project recognized as a
+# git project, we canoot specify the git_url only in the step.
+# However, once we specify a git_url, we need to specify a valid git_hash for
+# the final stage, even though we are not going to use it.
+# Any hash will work, as long as we can run git archive on it.
+git_url: https://github.com/mozilla-l10n/firefox-l10n.git
+git_hash: c1523924f0e10259e1a80b8268556f6f7a0b29bf
 
 steps:
   fetch_locale:
-    filename: 'l10n-[% c("input_file_var/locale") %]-[% c("hg_hash") %]-[% c("var/build_id") %].tar.xz'
-    version: '[% c("hg_hash") %]'
+    filename: 'l10n-[% c("input_file_var/locale") %]-[% c("abbrev") %]-[% c("var/build_id") %].tar.xz'
+    version: '[% c("git_hash") %]'
     fetch_locale: |
       [% c("var/set_default_env") -%]
       tar xf '[% project %]-[% c("version") %].tar.[% c("compress_tar") %]'
-      mv [% project %]-[% c("version") %] [% c("input_file_var/locale") %]
+      cd [% project %]-[% c("version") %]
       tar caf '[% dest_dir %]/[% c("filename") %]' [% c("input_file_var/locale") %]
     input_files: []
 --- |
@@ -38,9 +45,7 @@ steps:
           name => $locale,
           project => 'firefox-l10n',
           pkg_type => 'fetch_locale',
-          hg_hash => $revision,
-          hg_url => "https://hg.mozilla.org/l10n-central/$locale",
-          hg_clone_subdir => $locale,
+          git_hash => $revision,
           input_file_var => {
             locale => $locale,
           },


=====================================
projects/firefox/config
=====================================
@@ -14,12 +14,12 @@ container:
   use_container: 1
 
 var:
-  firefox_platform_version: 115.12.0
+  firefox_platform_version: 115.13.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   browser_series: '13.5'
   browser_rebase: 1
   browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
-  browser_build: 3
+  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") %]'


=====================================
projects/geckoview/config
=====================================
@@ -14,9 +14,9 @@ container:
   use_container: 1
 
 var:
-  geckoview_version: 115.12.0esr
+  geckoview_version: 115.13.0esr
   browser_branch: 13.5-1
-  browser_build: 3
+  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/go/config
=====================================
@@ -7,7 +7,7 @@ container:
 
 var:
   use_go_1_20: 0
-  go_1_21: 1.21.11
+  go_1_21: 1.21.12
   go_1_20: 1.20.14
   no_crosscompile: 1
   setup: |
@@ -131,7 +131,7 @@ input_files:
     enable: '[% ! c("var/linux") %]'
   - URL: 'https://go.dev/dl/go[% c("var/go_1_21") %].src.tar.gz'
     name: go
-    sha256sum: 42aee9bf2b6956c75a7ad6aa3f0a51b5821ffeac57f5a2e733a2d6eae1e6d9d2
+    sha256sum: 30e68af27bc1f1df231e3ab74f3d17d3b8d52a089c79bcaab573b4f1b807ed4f
     enable: '[% !c("var/use_go_1_20") %]'
   - URL: 'https://go.dev/dl/go[% c("var/go_1_20") %].src.tar.gz'
     name: go


=====================================
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: 172720
+version: 179205
 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: f2abffe1471ae63046cff06b853685c6614e117cc67bdf51228dc0792344441c
+    sha256sum: ca3489c12f3de44f7ae93eae4d50fb2bc36265f7a319d5046efb760c19658250
   - filename: packagemanual.py
     name: package_script


=====================================
projects/translation/config
=====================================
@@ -12,13 +12,13 @@ compress_tar: 'gz'
 steps:
   base-browser:
     base-browser: '[% INCLUDE build %]'
-    git_hash: dc59db634f066298e903142227834da483ec197d
+    git_hash: 6ff73b6f7a6cec4849c2cd1e1ee1dc6fc8894169
     targets:
       nightly:
         git_hash: 'base-browser'
   tor-browser:
     tor-browser: '[% INCLUDE build %]'
-    git_hash: de4f91a5020d637ab5d66459718525a5f9207be2
+    git_hash: 427819f80eaca95645bf0c1876d6a728d6ce7093
     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: 53faf8718484be3f90c8e7532981f068da76135c
+    git_hash: 09ba85f8320b264467a8a7b2bfbfccd1fea61f86
     compress_tar: 'zst'
     targets:
       nightly:


=====================================
rbm.conf
=====================================
@@ -73,18 +73,18 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '13.5'
-  torbrowser_build: 'build2'
+  torbrowser_version: '13.5.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/06/11 12:00:00'
+  browser_release_date: '2024/07/08 12: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'
     - 13.0.16
     - 13.0.15
-    - 13.0.14
   mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
 
   # By default, we sort the list of installed packages. This allows sharing



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/3879df7090ac19d0d5186fe43df3d9f07658944b...902b2dbe5e35daaf1c25fe9661b97d6b2a0c9a68

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


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240709/21792b62/attachment-0001.htm>


More information about the tor-commits mailing list