diff --git a/CHANGELOG.md b/CHANGELOG.md index fa91131d..59a90569 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 98.0.4758.116 +* disable minidumps upload +* complete disabling of client hint headers (thanks to @uazo) +* disable another way to activate origin trials (thanks to @uazo) +* fix for gateway attacks via websockets blocking (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1693) + # 98.0.4758.108 * re-introduce flag for text fragments * re-introduce content feature flag to disable field trials diff --git a/build/RELEASE b/build/RELEASE index cd280889..e1de24e5 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -98.0.4758.108 \ No newline at end of file +98.0.4758.116 \ No newline at end of file diff --git a/build/bromite.gn_args b/build/bromite.gn_args index e29a15a6..721b21c6 100644 --- a/build/bromite.gn_args +++ b/build/bromite.gn_args @@ -20,7 +20,7 @@ enable_platform_dolby_vision=true enable_platform_hevc=true enable_remoting=false enable_reporting=false -enable_supervised_users = false +enable_supervised_users=false enable_vr=false exclude_unwind_tables=false ffmpeg_branding="Chrome" @@ -35,7 +35,7 @@ safe_browsing_mode=0 symbol_level=1 system_webview_package_name="org.bromite.webview" target_os="android" -use_cfi_cast = true +use_cfi_cast=true use_debug_fission=true use_errorprone_java_compiler=false use_gnome_keyring=false diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 86dd6e82..ae52b5e6 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -182,3 +182,4 @@ disable-mobile-identity-consistency-by-default.patch Disable-idle-detection.patch Automated-domain-substitution.patch Allow-building-without-supervised-users.patch +Disable-minidump-upload-scheduling.patch diff --git a/build/chromium.gn_args b/build/chromium.gn_args index 3be12180..a3c94d5b 100644 --- a/build/chromium.gn_args +++ b/build/chromium.gn_args @@ -20,6 +20,7 @@ enable_platform_dolby_vision=true enable_platform_hevc=true enable_remoting=false enable_reporting=true +enable_supervised_users=false enable_vr=false exclude_unwind_tables=false ffmpeg_branding="Chrome" @@ -34,7 +35,7 @@ safe_browsing_mode=2 symbol_level=1 system_webview_package_name="com.android.webview" target_os="android" -use_cfi_cast = true +use_cfi_cast=true use_debug_fission=true use_errorprone_java_compiler=false use_gnome_keyring=false diff --git a/build/chromium_patches_list.txt b/build/chromium_patches_list.txt index 188a4659..17c45c93 100644 --- a/build/chromium_patches_list.txt +++ b/build/chromium_patches_list.txt @@ -8,4 +8,5 @@ Switch-to-fstack-protector-strong.patch Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch enable-ftrivial-auto-var-init-zero.patch Disable-feeds-support-by-default.patch +Allow-building-without-supervised-users.patch Chromium-package-name.patch diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index b9253409..71bb92e2 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -29276,7 +29276,7 @@ diff --git a/infra/config/generated/builders/ci/chromeos-amd64-generic-lacros-db diff --git a/infra/config/generated/builders/ci/chromeos-amd64-generic-rel/properties.json b/infra/config/generated/builders/ci/chromeos-amd64-generic-rel/properties.json --- a/infra/config/generated/builders/ci/chromeos-amd64-generic-rel/properties.json +++ b/infra/config/generated/builders/ci/chromeos-amd64-generic-rel/properties.json -@@ -7,7 +7,7 @@ +@@ -59,7 +59,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -29708,7 +29708,7 @@ diff --git a/infra/config/generated/builders/try/chromeos-amd64-generic-dbg/prop diff --git a/infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json b/infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json --- a/infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json +++ b/infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json -@@ -2,7 +2,7 @@ +@@ -48,7 +48,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -41734,7 +41734,7 @@ diff --git a/tools/binary_size/libsupersize/zip_util.py b/tools/binary_size/libs diff --git a/tools/binary_size/trybot_commit_size_checker.py b/tools/binary_size/trybot_commit_size_checker.py --- a/tools/binary_size/trybot_commit_size_checker.py +++ b/tools/binary_size/trybot_commit_size_checker.py -@@ -363,7 +363,7 @@ PASSING Checks: +@@ -365,7 +365,7 @@ PASSING Checks: {} To understand what those checks are and how to pass them, see: diff --git a/build/patches/Disable-minidump-upload-scheduling.patch b/build/patches/Disable-minidump-upload-scheduling.patch new file mode 100644 index 00000000..27d16559 --- /dev/null +++ b/build/patches/Disable-minidump-upload-scheduling.patch @@ -0,0 +1,38 @@ +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Sun, 27 Feb 2022 23:58:22 +0100 +Subject: Disable minidump upload scheduling + +--- + chrome/browser/endpoint_fetcher/endpoint_fetcher.cc | 2 +- + .../minidump_uploader/MinidumpUploadJobService.java | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc +--- a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc ++++ b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc +@@ -297,7 +297,7 @@ void EndpointFetcher::OnResponseFetched( + auto response = std::make_unique(); + // TODO(crbug.com/993393) Add more detailed error messaging + std::string net_error = net::ErrorToString(simple_url_loader_->NetError()); +- VLOG(1) << __func__ << " with response error: " << net_error; ++ LOG(ERROR) << __func__ << " with response error: " << net_error; + response->response = "There was a response error"; + std::move(endpoint_fetcher_callback).Run(std::move(response)); + } +diff --git a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java +--- a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java ++++ b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java +@@ -44,7 +44,10 @@ public abstract class MinidumpUploadJobService extends JobService { + * to build an upload job for scheduling. + */ + public static void scheduleUpload(JobInfo.Builder jobInfoBuilder) { +- Log.i(TAG, "Scheduling upload of all pending minidumps."); ++ Log.i(TAG, "Scheduling upload of all pending minidumps is disabled."); ++ if ((true)) { ++ return; ++ } + JobScheduler scheduler = + (JobScheduler) ContextUtils.getApplicationContext().getSystemService( + Context.JOB_SCHEDULER_SERVICE); +-- +2.25.1 diff --git a/build/ruleset_converter.gn_args b/build/ruleset_converter.gn_args index d9a53ab8..6d801493 100644 --- a/build/ruleset_converter.gn_args +++ b/build/ruleset_converter.gn_args @@ -19,6 +19,7 @@ enable_platform_dolby_vision=true enable_platform_hevc=true enable_remoting=false enable_reporting=false +enable_supervised_users=false enable_vr=false exclude_unwind_tables=false ffmpeg_branding="Chrome" @@ -33,7 +34,7 @@ safe_browsing_mode=0 symbol_level=1 system_webview_package_name="com.android.webview" target_os="linux" -use_cfi_cast = true +use_cfi_cast=true use_debug_fission=true use_errorprone_java_compiler=false use_gnome_keyring=false