From a93df088534e6330a8ebc8490fad817909736ad0 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Wed, 21 Feb 2024 11:15:14 +0100 Subject: [PATCH] update patch list drop Enable-ECH-by-default.patch drop Disable-SHA1-Server-Signature.patch add Temp-disable-network-service-windows.patch add Temp-fix-Content-settings-infrastructure.patch --- build/cromite_patches_list.txt | 4 ++-- ...Temp-disable-network-service-windows.patch | 20 ++++++++++++++++ ...-fix-Content-settings-infrastructure.patch | 23 +++++++++++++++++++ .../Disable-SHA1-Server-Signature.patch | 17 -------------- build/patches/Enable-ECH-by-default.patch | 18 --------------- 5 files changed, 45 insertions(+), 37 deletions(-) create mode 100644 build/patches/00Temp-disable-network-service-windows.patch create mode 100644 build/patches/00Temp-fix-Content-settings-infrastructure.patch delete mode 100644 build/patches/Disable-SHA1-Server-Signature.patch delete mode 100644 build/patches/Enable-ECH-by-default.patch diff --git a/build/cromite_patches_list.txt b/build/cromite_patches_list.txt index 81e491650..2ef0f8048 100644 --- a/build/cromite_patches_list.txt +++ b/build/cromite_patches_list.txt @@ -174,7 +174,6 @@ Partition-blobs-by-top-frame-URL.patch Override-Navigator-Language.patch Disable-add-to-home-screen-prompt.patch Remove-HTTP-referrals-in-cross-origin-navigation.patch -Enable-ECH-by-default.patch Disable-StartSurface-feature.patch Enable-PermuteTLSExtensions-by-default.patch Enable-third-party-storage-partitioning.patch @@ -216,7 +215,6 @@ Remove-ChromiumNetworkAdapter.patch Internal-firewall.patch Disable-devtools-remote-and-custom-protocols.patch Remove-detection-of-captive-portals.patch -Disable-SHA1-Server-Signature.patch Remove-auth-header-upon-cross-origin-redirect.patch Clear-CORS-Preflight-Cache-on-clearing-data.patch Multi-Screen-Window-Placement-API-fix.patch @@ -286,6 +284,8 @@ Temp-disable-predictive-back-gesture.patch TEMP-Add-a-log-to-track-strange-behavior.patch Temp-guard-FileSystemAccessPersistentPermissions.patch Fix-chromium-build-bugs.patch +00Temp-disable-network-service-windows.patch +00Temp-fix-Content-settings-infrastructure.patch eyeo-beta-118.0.5993.48-base.patch eyeo-beta-118.0.5993.48-chrome_integration.patch diff --git a/build/patches/00Temp-disable-network-service-windows.patch b/build/patches/00Temp-disable-network-service-windows.patch new file mode 100644 index 000000000..83ee7f78c --- /dev/null +++ b/build/patches/00Temp-disable-network-service-windows.patch @@ -0,0 +1,20 @@ +From: Your Name +Date: Wed, 21 Feb 2024 09:16:27 +0000 +Subject: Temp disable network service windows + +--- + sandbox/policy/features.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sandbox/policy/features.cc b/sandbox/policy/features.cc +--- a/sandbox/policy/features.cc ++++ b/sandbox/policy/features.cc +@@ -217,6 +217,6 @@ SET_CROMITE_FEATURE_ENABLED(kUseRendererProcessPolicy); + SET_CROMITE_FEATURE_ENABLED(kRestrictRendererPoliciesInBaseline); + #endif + #if BUILDFLAG(IS_WIN) +-SET_CROMITE_FEATURE_ENABLED(kNetworkServiceSandbox); ++//SET_CROMITE_FEATURE_ENABLED(kNetworkServiceSandbox); + #endif + } // namespace sandbox::policy::features +-- diff --git a/build/patches/00Temp-fix-Content-settings-infrastructure.patch b/build/patches/00Temp-fix-Content-settings-infrastructure.patch new file mode 100644 index 000000000..e67deb3ec --- /dev/null +++ b/build/patches/00Temp-fix-Content-settings-infrastructure.patch @@ -0,0 +1,23 @@ +From: Your Name +Date: Wed, 21 Feb 2024 09:16:51 +0000 +Subject: Temp fix Content settings infrastructure + +--- + .../content_settings/core/common/content_settings_types.mojom | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/components/content_settings/core/common/content_settings_types.mojom b/components/content_settings/core/common/content_settings_types.mojom +--- a/components/content_settings/core/common/content_settings_types.mojom ++++ b/components/content_settings/core/common/content_settings_types.mojom +@@ -388,6 +388,10 @@ enum ContentSettingsType { + WEB_PRINTING, + + NUM_TYPES_CHROMIUM, ++ TIMEZONE_OVERRIDE, ++ VIEWPORT, ++ WEBGL, ++ WEBRTC, + // #include "components/content_settings/core/common/bromite_content_settings.inc" + NUM_TYPES_BROMITE, + }; +-- diff --git a/build/patches/Disable-SHA1-Server-Signature.patch b/build/patches/Disable-SHA1-Server-Signature.patch deleted file mode 100644 index 67740069c..000000000 --- a/build/patches/Disable-SHA1-Server-Signature.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: uazo -Date: Tue, 18 Apr 2023 14:17:19 +0000 -Subject: Disable SHA1 Server Signature - -License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html ---- - .../net/base/features_cc/Disable-SHA1-Server-Signature.inc | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 cromite_flags/net/base/features_cc/Disable-SHA1-Server-Signature.inc - -diff --git a/cromite_flags/net/base/features_cc/Disable-SHA1-Server-Signature.inc b/cromite_flags/net/base/features_cc/Disable-SHA1-Server-Signature.inc -new file mode 100644 ---- /dev/null -+++ b/cromite_flags/net/base/features_cc/Disable-SHA1-Server-Signature.inc -@@ -0,0 +1 @@ -+SET_CROMITE_FEATURE_DISABLED(kSHA1ServerSignature); --- diff --git a/build/patches/Enable-ECH-by-default.patch b/build/patches/Enable-ECH-by-default.patch deleted file mode 100644 index 20739b767..000000000 --- a/build/patches/Enable-ECH-by-default.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Sun, 30 Oct 2022 18:11:19 +0100 -Subject: Enable ECH by default - -License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ---- - cromite_flags/net/base/features_cc/Enable-ECH-by-default.inc | 2 ++ - 1 file changed, 2 insertions(+) - create mode 100644 cromite_flags/net/base/features_cc/Enable-ECH-by-default.inc - -diff --git a/cromite_flags/net/base/features_cc/Enable-ECH-by-default.inc b/cromite_flags/net/base/features_cc/Enable-ECH-by-default.inc -new file mode 100644 ---- /dev/null -+++ b/cromite_flags/net/base/features_cc/Enable-ECH-by-default.inc -@@ -0,0 +1,2 @@ -+SET_CROMITE_FEATURE_ENABLED(kEncryptedClientHello); -+SET_CROMITE_FEATURE_ENABLED(kEncryptedClientHelloQuic); ---