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
-
2aaaaab1
by Pier Angelo Vendrame at 2024-01-15T18:30:58+01:00
-
b6fdd885
by Tom Ritter at 2024-01-15T18:39:37+01:00
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:
... | ... | @@ -50,4 +50,7 @@ if test -z "$WASI_SYSROOT"; then |
50 | 50 | ac_add_options --without-wasm-sandboxed-libraries
|
51 | 51 | fi
|
52 | 52 | |
53 | +# tor-browser#42337
|
|
54 | +ac_add_options --enable-geckodriver
|
|
55 | + |
|
53 | 56 | ac_add_options --with-relative-data-dir=BaseBrowser/Data/Browser |
... | ... | @@ -6024,7 +6024,8 @@ struct PrefListEntry { |
6024 | 6024 | // StaticPrefList.yml), a string pref, and it is NOT exempted in
|
6025 | 6025 | // sDynamicPrefOverrideList
|
6026 | 6026 | //
|
6027 | -// This behavior is codified in ShouldSanitizePreference() below
|
|
6027 | +// This behavior is codified in ShouldSanitizePreference() below.
|
|
6028 | +// Exclusions of preferences can be defined in sOverrideRestrictionsList[].
|
|
6028 | 6029 | static const PrefListEntry sRestrictFromWebContentProcesses[] = {
|
6029 | 6030 | // Remove prefs with user data
|
6030 | 6031 | PREF_LIST_ENTRY("datareporting.policy."),
|
... | ... | @@ -6073,6 +6074,15 @@ static const PrefListEntry sRestrictFromWebContentProcesses[] = { |
6073 | 6074 | PREF_LIST_ENTRY("toolkit.telemetry.previousBuildID"),
|
6074 | 6075 | };
|
6075 | 6076 | |
6077 | +// Allowlist for prefs and branches blocklisted in
|
|
6078 | +// sRestrictFromWebContentProcesses[], including prefs from
|
|
6079 | +// StaticPrefList.yaml and *.js, to let them pass.
|
|
6080 | +static const PrefListEntry sOverrideRestrictionsList[]{
|
|
6081 | + PREF_LIST_ENTRY("services.settings.clock_skew_seconds"),
|
|
6082 | + PREF_LIST_ENTRY("services.settings.last_update_seconds"),
|
|
6083 | + PREF_LIST_ENTRY("services.settings.server"),
|
|
6084 | +};
|
|
6085 | + |
|
6076 | 6086 | // These prefs are dynamically-named (i.e. not specified in prefs.js or
|
6077 | 6087 | // StaticPrefList) and would normally by blocklisted but we allow them through
|
6078 | 6088 | // anyway, so this override list acts as an allowlist
|
... | ... | @@ -6168,10 +6178,12 @@ static bool ShouldSanitizePreference(const Pref* const aPref) { |
6168 | 6178 | // pref through.
|
6169 | 6179 | for (const auto& entry : sRestrictFromWebContentProcesses) {
|
6170 | 6180 | if (strncmp(entry.mPrefBranch, prefName, entry.mLen) == 0) {
|
6171 | - const auto* p = prefName; // This avoids clang-format doing ugly things.
|
|
6172 | - return !(strncmp("services.settings.clock_skew_seconds", p, 36) == 0 ||
|
|
6173 | - strncmp("services.settings.last_update_seconds", p, 37) == 0 ||
|
|
6174 | - strncmp("services.settings.server", p, 24) == 0);
|
|
6181 | + for (const auto& pasEnt : sOverrideRestrictionsList) {
|
|
6182 | + if (strncmp(pasEnt.mPrefBranch, prefName, pasEnt.mLen) == 0) {
|
|
6183 | + return false;
|
|
6184 | + }
|
|
6185 | + }
|
|
6186 | + return true;
|
|
6175 | 6187 | }
|
6176 | 6188 | }
|
6177 | 6189 |
... | ... | @@ -2,8 +2,11 @@ |
2 | 2 | |
3 | 3 | ac_add_options --target=i686-linux-gnu
|
4 | 4 | |
5 | -ac_add_options --enable-default-toolkit=cairo-gtk3
|
|
5 | +# Moz switched to lld for all Linux targets in Bug 1839739.
|
|
6 | +# Also, gold used not to work with debug symbols (tor-browser#42146).
|
|
7 | +ac_add_options --enable-linker=lld
|
|
8 | + |
|
9 | +ac_add_options --disable-strip
|
|
10 | +ac_add_options --disable-install-strip
|
|
6 | 11 | |
7 | -# Bug 31448: ld.gold fails if we don't disable debug-symbols.
|
|
8 | -# Also, we keep strip enabled.
|
|
9 | -ac_add_options --disable-debug-symbols |
|
12 | +ac_add_options --enable-default-toolkit=cairo-gtk3 |
1 | 1 | . $topsrcdir/browser/config/mozconfigs/base-browser
|
2 | 2 | |
3 | -ac_add_options --enable-default-toolkit=cairo-gtk3
|
|
3 | +# Moz switched to lld for all Linux targets in Bug 1839739.
|
|
4 | +ac_add_options --enable-linker=lld
|
|
4 | 5 | |
5 | 6 | ac_add_options --disable-strip
|
6 | 7 | ac_add_options --disable-install-strip
|
7 | 8 | |
8 | -# We want to bundle an own geckodriver, so we can use it for QA and other work
|
|
9 | -ac_add_options --enable-geckodriver |
|
9 | +ac_add_options --enable-default-toolkit=cairo-gtk3 |
... | ... | @@ -4,6 +4,9 @@ |
4 | 4 | # It is only intended to be used when doing incremental Linux builds
|
5 | 5 | # during development.
|
6 | 6 | |
7 | +# Moz switched to lld for all Linux targets in Bug 1839739.
|
|
8 | +ac_add_options --enable-linker=lld
|
|
9 | + |
|
7 | 10 | export MOZILLA_OFFICIAL=
|
8 | 11 | |
9 | 12 | ac_add_options --enable-default-toolkit=cairo-gtk3
|