Bug 40843: Prepare Tor Browser Alpha 12.5a6

projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt

+Tor Browser 12.5a6 - May 22 2023
+ * All Platforms
+   * Updated Translations
+   * Updated Go to 11.9.9
+   * Bug 40860: Improve the transition from the old fontconfig file to the new one [tor-browser-build]
+   * Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key [tor-browser]
+   * Bug 41738: Replace the patch to disable live reload with its preference [tor-browser]
+   * Bug 41757: Rebase Tor Browser Alpha to 102.11.0esr [tor-browser]
+   * Bug 41763: TTP-02-003 WP1: Data URI allows JS execution despite safest security level (Low) [tor-browser]
+   * Bug 41764: TTP-02-004 OOS: No user-activation required to download files (Low) [tor-browser]
+   * Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp [tor-browser]
+ * Windows + macOS + Linux
+   * Updated Firefox to 102.11esr
+   * Bug 41607: Update "New Circuit" icon [tor-browser]
+   * Bug 41736: Customize the default CustomizableUI toolbar using CustomizableUI.jsm [tor-browser]
+   * Bug 41770: Keyboard navigation broken leaving the toolbar tor circuit button [tor-browser]
+   * Bug 41777: Internally shippped manual does not adapt to RTL languages (it always align to the left) [tor-browser]
+ * Windows + Linux
+   * Bug 41654: UpdateInfo jumped into Data [tor-browser]
+ * Linux
+   * Bug 41732: implement linux font whitelist as defense-in-depth [tor-browser]
+   * Bug 41776: System fonts are temporarily leaked on Linux after the browser is updated from 12.5a4 or earlier [tor-browser]
+ * Android
+   * Updated GeckoView to 102.11esr
+ * Build System
+   * All Platforms
+     * Bug 33953: Provide a way for easily updating Go dependencies of projects [tor-browser-build]
+     * Bug 40673: Avoid building each go module separately [tor-browser-build]
+     * Bug 40818: Enable wasm target for rust compiler [tor-browser-build]
+     * Bug 40841: Adapt signing scripts to new signing machines [tor-browser-build]
+     * Bug 40849: Move Go dependencies to the projects dependent on them, not as a standalone projects [tor-browser-build]
+     * Bug 40856: Unblock nightly builds [tor-browser-build]
+   * Windows
+     * Bug 40846: Temporarily disable Windows signing [tor-browser-build]
+
+Tor Browser 12.0.6 - May 09 2023
+ * All Platforms
+   * Updated Translations
+   * Updated Go to 11.9.9
+   * Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key [tor-browser]
+   * Bug 41756: Rebase Tor Browser Stable to 102.11.0esr [tor-browser]
+ * Windows + macOS + Linux
+   * Updated Firefox to 102.11esr
+   * Bug 40501: High CPU load after tor exits unexpectedly [tor-browser]
+ * Windows
+   * Bug 41683: Disable the network process on Windows [tor-browser]
+ * Android
+   * Updated GeckoView to 102.11esr
+ * Build System
+   * Windows + macOS + Linux
+     * Bug 41730: Bridge lines in tools/torbrowser/bridges.js out of date [tor-browser]
+   * macOS
+     * Bug 40844: Fix DMG reproducibility problem on 12.0.5 [tor-browser-build]
+
 Tor Browser 12.5a5 - April 18 2023
  * All Platforms
    * Updated Translations

projects/browser/config

@@ -103,9 +103,9 @@ input_files:
     enable: '[% ! c("var/android") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.mozilla.org/firefox/downloads/file/4090970/noscript-11.4.21.xpi
+  - URL: https://addons.mozilla.org/firefox/downloads/file/4111078/noscript-11.4.22.xpi
     name: noscript
-    sha256sum: 0fd3b66a2780d03a5b3cd460216105f3df2b27c6d3a552c1769c5de48c9e2338
+    sha256sum: 46a84c85df4c6be11905388ad2b66aeb5a010ed615484112c8c1710ad13bc36e
   - URL: https://addons.mozilla.org/firefox/downloads/file/4079064/ublock_origin-1.47.4.xpi
     name: ublock-origin
     sha256sum: a35a6c8758ba74616afc09648c96d74ec2e7d27fe30f311d1db6e9a4966e7858

projects/firefox/config

@@ -11,7 +11,7 @@ container:
   use_container: 1
 
 var:
-  firefox_platform_version: 102.10.0
+  firefox_platform_version: 102.11.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   browser_series: '12.5'
   browser_branch: '[% c("var/browser_series") %]-1'

projects/geckoview/config

@@ -11,7 +11,7 @@ container:
   use_container: 1
 
 var:
-  geckoview_version: 102.10.0esr
+  geckoview_version: 102.11.0esr
   browser_branch: 12.5-1
   browser_build: 3
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'

projects/go/config

 # vim: filetype=yaml sw=2
-version: 1.19.8
+version: 1.19.9
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 container:
   use_container: 1
@@ -121,7 +121,7 @@ input_files:
     enable: '[% ! c("var/linux") %]'
   - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
     name: go
-    sha256sum: 1d7a67929dccafeaf8a29e55985bc2b789e0499cb1a17100039f084e3238da2f
+    sha256sum: 131190a4697a70c5b1d232df5d3f55a3f9ec0e78e40516196ffb3f09ae6a5744
   - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
     name: go14
     sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

projects/manual/config

 # 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: 74065
+version: 79869
 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 container:
   use_container: 1
@@ -17,8 +17,8 @@ var:
 
 input_files:
   - project: container-image
-  - URL: 'https://people.torproject.org/~richard/tbb_files/manual_[% c("version") %].zip'
+  - URL: 'https://people.torproject.org/~pierov/tbb_files/manual_[% c("version") %].zip'
     name: manual
-    sha256sum: 788c2dc2bfacbc6961ce443c5639706cc23fbb7b7730ed7f71a26396511305be
+    sha256sum: ee4c6e4ce4998736ae44dc3e6f92875a481b9e03860517764ea9af6c2bba24e0
   - filename: packagemanual.py
     name: package_script

projects/translation/config

@@ -6,19 +6,19 @@ version: '[% c("abbrev") %]'
 steps:
   base-browser:
     base-browser: '[% INCLUDE build %]'
-    git_hash: 97c76d5183b16b069e66feaaf10e00c1d2c7d9e0
+    git_hash: f1f1204c2421db64ae3d30be31a4d7819b9a3e42
     targets:
       nightly:
         git_hash: 'base-browser'
   base-browser-fluent:
     base-browser-fluent: '[% INCLUDE build %]'
-    git_hash: e016c52705a2663309a7b05b05ac93002eab3ed0
+    git_hash: 3167fc379caac406941ae4fce429c302fd1a6d5d
     targets:
       nightly:
         git_hash: 'basebrowser-newidentityftl'
   tor-browser:
     tor-browser: '[% INCLUDE build %]'
-    git_hash: 69273c40343bd6f8f125109ddac9d949d7bcb605
+    git_hash: 7089eb9ac06e0f6de99c386a09821c8799849206
     targets:
       nightly:
         git_hash: 'tor-browser'
@@ -26,7 +26,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: 0deec2a78dea0013e8c4eaec1d40ef5aac4e43b0
+    git_hash: 65def475aa000981ac3c1b6db203e8e707f72e16
     targets:
       nightly:
         git_hash: 'fenix-torbrowserstringsxml'

rbm.conf

@@ -94,10 +94,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '12.5a5'
+  torbrowser_version: '12.5a6'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 12.5a4
+    - 12.5a5
   updater_enabled: 1
   build_mar: 1
   mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'

tools/fetch-changelogs.py

@@ -111,15 +111,19 @@ if r.status_code == 401:
     print("Unauthorized! Has your token expired?")
     sys.exit(3)
 issue = None
+issues = []
 for i in r.json():
     if i["title"].find(sys.argv[1]) != -1:
-        if issue is None:
-            issue = i
-        else:
-            print("More than one matching issue found!")
-            print("Please use the issue id.")
-            sys.exit(4)
-if not issue:
+        issues.append(i)
+if len(issues) == 1:
+    issue = issues[0]
+elif len(issues) > 1:
+    print("More than one matching issue found:")
+    for idx, i in enumerate(issues):
+        print(f"  {idx + 1}) #{i['iid']} - {i['title']}")
+    print("Please use the issue id.")
+    sys.exit(4)
+else:
     iid = version
     version = None
     if iid[0] == "#":
@@ -161,8 +165,9 @@ for issues in linked:
     print(f" * {issues[0].get_platforms()}")
     for i in issues:
         print(f"   * {i}")
-print(" * Build System")
-for issues in linked_build:
-    print(f"   * {issues[0].get_platforms()}")
-    for i in issues:
-        print(f"     * {i}")
+if linked_build:
+    print(" * Build System")
+    for issues in linked_build:
+        print(f"   * {issues[0].get_platforms()}")
+        for i in issues:
+            print(f"     * {i}")