9:07 a.m.
commit 122ecd704b3c9dc414c19d8a41747d491d96bfc5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 22 10:06:05 2021 +0100
Add missing file and add crashpad_handler consent patch
chromium-92-crashpad-consent.patch | 46 ++++++++++++++++++++++++++++++++++++++
chromium-freeworld.spec | 8 ++++++-
2 files changed, 53 insertions(+), 1 deletion(-)
---
diff --git a/chromium-92-crashpad-consent.patch b/chromium-92-crashpad-consent.patch
new file mode 100644
index 0000000..956d19e
--- /dev/null
+++ b/chromium-92-crashpad-consent.patch
@@ -0,0 +1,46 @@
+From dad7c5dc4504aa66c39f2a38b3c563d18dd1395a Mon Sep 17 00:00:00 2001
+From: Andrey Lushnikov <lushnikov(a)chromium.org>
+Date: Mon, 12 Jul 2021 18:47:01 +0000
+Subject: [PATCH] Respect stat collection consent for crashpad user metrics collection
+
+With this patch, crashpad will no longer collect metrics if there is no
+user consent for stats collections.
+
+This is a follow-up to the discussion in https://crrev.com/c/2923889
+
+BUG=1210598
+
+Change-Id: I1eceaa10f9d09f95b74cb4a2d2eac03008ec5b40
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2999433
+Reviewed-by: Mark Mentovai <mark(a)chromium.org>
+Reviewed-by: Greg Thompson <grt(a)chromium.org>
+Commit-Queue: Andrey Lushnikov <lushnikov(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#900573}
+---
+
+diff --git a/chrome/app/chrome_crash_reporter_client.cc
b/chrome/app/chrome_crash_reporter_client.cc
+index cd9a053..b34ad0d 100644
+--- a/chrome/app/chrome_crash_reporter_client.cc
++++ b/chrome/app/chrome_crash_reporter_client.cc
+@@ -144,6 +144,8 @@
+ #if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+ bool ChromeCrashReporterClient::GetCrashMetricsLocation(
+ base::FilePath* metrics_dir) {
++ if (!GetCollectStatsConsent())
++ return false;
+ return base::PathService::Get(chrome::DIR_USER_DATA, metrics_dir);
+ }
+ #endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+diff --git a/chrome/app/chrome_crash_reporter_client_win.cc
b/chrome/app/chrome_crash_reporter_client_win.cc
+index 474bf8e..2a66a3aa 100644
+--- a/chrome/app/chrome_crash_reporter_client_win.cc
++++ b/chrome/app/chrome_crash_reporter_client_win.cc
+@@ -160,6 +160,8 @@
+
+ bool ChromeCrashReporterClient::GetCrashMetricsLocation(
+ std::wstring* metrics_dir) {
++ if (!GetCollectStatsConsent())
++ return false;
+ install_static::GetUserDataDirectory(metrics_dir, nullptr);
+ return !metrics_dir->empty();
+ }
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 7f1c6a7..d7cd31c 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -25,7 +25,7 @@
##############################Package Definitions######################################
Name: chromium-freeworld
Version: 92.0.4515.159
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Chromium built with all freeworld codecs and VA-API support
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and
OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
URL: https://www.chromium.org/Home
@@ -148,6 +148,7 @@ ExclusiveArch: x86_64
# Gentoo patches:
Patch201: chromium-92-EnumTable-crash.patch
+Patch202: chromium-92-crashpad-consent.patch
# Fedora patches:
Patch300: chromium-py3-bootstrap.patch
@@ -612,6 +613,7 @@ install -m 644 %{name}.xml
%{buildroot}%{_datadir}/gnome-control-center/default-
install -m 755 %{target}/chrome %{buildroot}%{chromiumdir}/%{name}
install -m 4755 %{target}/chrome_sandbox %{buildroot}%{chromiumdir}/chrome-sandbox
install -m 755 %{target}/chromedriver %{buildroot}%{chromiumdir}/
+install -m 755 %{target}/crashpad_handler %{buildroot}%{chromiumdir}/
install -m 755 %{target}/libEGL.so %{buildroot}%{chromiumdir}/
install -m 755 %{target}/libGLESv2.so %{buildroot}%{chromiumdir}/
%if !%{system_libicu}
@@ -664,6 +666,7 @@ appstream-util validate-relax --nonet
"%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/%{name}
%{chromiumdir}/chrome-sandbox
%{chromiumdir}/chromedriver
+%{chromiumdir}/crashpad_handler
%{chromiumdir}/libEGL.so
%{chromiumdir}/libGLESv2.so
%if !%{system_libicu}
@@ -683,6 +686,9 @@ appstream-util validate-relax --nonet
"%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Sun Aug 22 2021 Leigh Scott <leigh123linux(a)gmail.com> - 92.0.4515.159-2
+- Add missing file and add crashpad_handler consent patch
+
* Sat Aug 21 2021 Leigh Scott <leigh123linux(a)gmail.com> - 92.0.4515.159-1
- Update to 92.0.4515.159