[tor-commits] [Git][tpo/applications/tor-browser][base-browser-115.6.0esr-13.5-1] 3 commits: fixup! Base Browser's .mozconfigs.

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch base-browser-115.6.0esr-13.5-1 at The Tor Project / Applications / Tor Browser


Commits:
87e50941 by Pier Angelo Vendrame at 2024-01-15T18:30:54+01:00
fixup! Base Browser's .mozconfigs.

Bug 42337: Enable GeckoDriver for all desktop platforms

- - - - -
2aaaaab1 by Pier Angelo Vendrame at 2024-01-15T18:30:58+01:00
fixup! Base Browser's .mozconfigs.

Bug 42146: Use LLD on Linux.

This should allow us to restore debug symbols on Linux i686.

- - - - -
b6fdd885 by Tom Ritter at 2024-01-15T18:39:37+01:00
Bug 1873526: Refactor the restriction override list from a big if statement to a list r=KrisWright

Differential Revision: https://phabricator.services.mozilla.com/D198081

- - - - -


5 changed files:

- browser/config/mozconfigs/base-browser
- modules/libpref/Preferences.cpp
- mozconfig-linux-i686
- mozconfig-linux-x86_64
- mozconfig-linux-x86_64-dev


Changes:

=====================================
browser/config/mozconfigs/base-browser
=====================================
@@ -50,4 +50,7 @@ if test -z "$WASI_SYSROOT"; then
     ac_add_options --without-wasm-sandboxed-libraries
 fi
 
+# tor-browser#42337
+ac_add_options --enable-geckodriver
+
 ac_add_options --with-relative-data-dir=BaseBrowser/Data/Browser


=====================================
modules/libpref/Preferences.cpp
=====================================
@@ -6024,7 +6024,8 @@ struct PrefListEntry {
 //      StaticPrefList.yml), a string pref, and it is NOT exempted in
 //      sDynamicPrefOverrideList
 //
-// This behavior is codified in ShouldSanitizePreference() below
+// This behavior is codified in ShouldSanitizePreference() below.
+// Exclusions of preferences can be defined in sOverrideRestrictionsList[].
 static const PrefListEntry sRestrictFromWebContentProcesses[] = {
     // Remove prefs with user data
     PREF_LIST_ENTRY("datareporting.policy."),
@@ -6073,6 +6074,15 @@ static const PrefListEntry sRestrictFromWebContentProcesses[] = {
     PREF_LIST_ENTRY("toolkit.telemetry.previousBuildID"),
 };
 
+// Allowlist for prefs and branches blocklisted in
+// sRestrictFromWebContentProcesses[], including prefs from
+// StaticPrefList.yaml and *.js, to let them pass.
+static const PrefListEntry sOverrideRestrictionsList[]{
+    PREF_LIST_ENTRY("services.settings.clock_skew_seconds"),
+    PREF_LIST_ENTRY("services.settings.last_update_seconds"),
+    PREF_LIST_ENTRY("services.settings.server"),
+};
+
 // These prefs are dynamically-named (i.e. not specified in prefs.js or
 // StaticPrefList) and would normally by blocklisted but we allow them through
 // anyway, so this override list acts as an allowlist
@@ -6168,10 +6178,12 @@ static bool ShouldSanitizePreference(const Pref* const aPref) {
   // pref through.
   for (const auto& entry : sRestrictFromWebContentProcesses) {
     if (strncmp(entry.mPrefBranch, prefName, entry.mLen) == 0) {
-      const auto* p = prefName;  // This avoids clang-format doing ugly things.
-      return !(strncmp("services.settings.clock_skew_seconds", p, 36) == 0 ||
-               strncmp("services.settings.last_update_seconds", p, 37) == 0 ||
-               strncmp("services.settings.server", p, 24) == 0);
+      for (const auto& pasEnt : sOverrideRestrictionsList) {
+        if (strncmp(pasEnt.mPrefBranch, prefName, pasEnt.mLen) == 0) {
+          return false;
+        }
+      }
+      return true;
     }
   }
 


=====================================
mozconfig-linux-i686
=====================================
@@ -2,8 +2,11 @@
 
 ac_add_options --target=i686-linux-gnu
 
-ac_add_options --enable-default-toolkit=cairo-gtk3
+# Moz switched to lld for all Linux targets in Bug 1839739.
+# Also, gold used not to work with debug symbols (tor-browser#42146).
+ac_add_options --enable-linker=lld
+
+ac_add_options --disable-strip
+ac_add_options --disable-install-strip
 
-# Bug 31448: ld.gold fails if we don't disable debug-symbols.
-# Also, we keep strip enabled.
-ac_add_options --disable-debug-symbols
+ac_add_options --enable-default-toolkit=cairo-gtk3


=====================================
mozconfig-linux-x86_64
=====================================
@@ -1,9 +1,9 @@
 . $topsrcdir/browser/config/mozconfigs/base-browser
 
-ac_add_options --enable-default-toolkit=cairo-gtk3
+# Moz switched to lld for all Linux targets in Bug 1839739.
+ac_add_options --enable-linker=lld
 
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
 
-# We want to bundle an own geckodriver, so we can use it for QA and other work
-ac_add_options --enable-geckodriver
+ac_add_options --enable-default-toolkit=cairo-gtk3


=====================================
mozconfig-linux-x86_64-dev
=====================================
@@ -4,6 +4,9 @@
 # It is only intended to be used when doing incremental Linux builds
 # during development.
 
+# Moz switched to lld for all Linux targets in Bug 1839739.
+ac_add_options --enable-linker=lld
+
 export MOZILLA_OFFICIAL=
 
 ac_add_options --enable-default-toolkit=cairo-gtk3



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

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ae39cc13b8d1f032dd7c6ff4219a5cc5bb66960c...b6fdd885e01515d697d32790be156d85dd9c670c
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/20240115/0b7af6cf/attachment-0001.htm>