patches: merge extra & core into contrib, clean up files (#527)

merged extra & core folders into one "contrib" folder

removed useless/outdated patches:
- upstream-fixes/hardware_destructive_interference_size.patch
- iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
- iridium-browser/Remove-EV-certificates.patch
- inox-patchset/0016-chromium-sandbox-pie.patch
- upstream-fixes/glue_core_pools.patch

merged patches:
- iridium-browser/safe_browsing-disable-incident-reporting.patch and iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch into iridium-browser/safe-browsing-disable-reporting.patch

renamed patches:
- removed sequence numbers from inox patch filenames
This commit is contained in:
wukko
2025-11-27 17:53:54 +06:00
committed by GitHub
parent 9df88459b8
commit fa41ca5fca
105 changed files with 138 additions and 266 deletions

View File

@@ -1,4 +1,3 @@
--- a/chrome/browser/background/extensions/background_mode_manager.cc
+++ b/chrome/browser/background/extensions/background_mode_manager.cc
@@ -350,7 +350,7 @@ BackgroundModeManager::~BackgroundModeMa

View File

@@ -1,3 +1,14 @@
From c89ce946e5328ca8a7df923d421e904bb6bfe9b6 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 7 Jul 2015 18:28:46 +0200
Subject: [PATCH 63/76] safe_browsing: disable reporting of safebrowsing
override
Disables reporting of the safebrowsing override, i.e. the report sent
if a user decides to visit a page that was flagged as "insecure".
This prevents trk:148 (phishing) and trk:149 (malware).
---
From 4dfa8ed0814040317cb82d8545502186daa0a204 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 7 Jul 2015 17:02:09 +0200
@@ -7,13 +18,28 @@ Disables the safebrowsing incident reporting where you could upload
information about a blocked URL to Google (also added a trk prefix to
the URL so we get notified if this happens again in the future).
---
.../incident_reporting/incident_report_uploader_impl.cc | 2 +-
.../incident_reporting/incident_reporting_service.cc | 3 +++
chrome/browser/safe_browsing/safe_browsing_blocking_page.cc | 3 +--
chrome/browser/safe_browsing/safe_browsing_service.cc | 2 +-
.../security_interstitials/core/safe_browsing_loud_error_ui.cc | 1 +
5 files changed, 7 insertions(+), 4 deletions(-)
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -281,6 +281,10 @@ void ClientSideDetectionService::StartCl
return;
}
+#if 1
+ if (!callback.is_null())
+ std::move(callback).Run(GURL(request->url()), false, std::nullopt, std::nullopt);
+#else
std::string request_data;
request->SerializeToString(&request_data);
@@ -363,6 +367,7 @@ void ClientSideDetectionService::StartCl
&WebUIContentInfoSingleton::AddToClientPhishingRequestsSent,
base::Unretained(WebUIContentInfoSingleton::GetInstance()),
std::move(request), access_token));
+#endif
}
void ClientSideDetectionService::HandlePhishingVerdict(
--- a/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc
+++ b/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc
@@ -64,8 +64,7 @@ ChromeSafeBrowsingBlockingPageFactory::C

View File

@@ -1,34 +0,0 @@
From c89ce946e5328ca8a7df923d421e904bb6bfe9b6 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 7 Jul 2015 18:28:46 +0200
Subject: [PATCH 63/76] safe_browsing: disable reporting of safebrowsing
override
Disables reporting of the safebrowsing override, i.e. the report sent
if a user decides to visit a page that was flagged as "insecure".
This prevents trk:148 (phishing) and trk:149 (malware).
---
components/safe_browsing/content/browser/client_side_detection_service.cc | 5 +++++
1 file changed, 5 insertions(+)
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -281,6 +281,10 @@ void ClientSideDetectionService::StartCl
return;
}
+#if 1
+ if (!callback.is_null())
+ std::move(callback).Run(GURL(request->url()), false, std::nullopt, std::nullopt);
+#else
std::string request_data;
request->SerializeToString(&request_data);
@@ -363,6 +367,7 @@ void ClientSideDetectionService::StartCl
&WebUIContentInfoSingleton::AddToClientPhishingRequestsSent,
base::Unretained(WebUIContentInfoSingleton::GetInstance()),
std::move(request), access_token));
+#endif
}
void ClientSideDetectionService::HandlePhishingVerdict(

View File

@@ -1,17 +0,0 @@
--- a/sandbox/linux/BUILD.gn
+++ b/sandbox/linux/BUILD.gn
@@ -299,6 +299,14 @@ if (is_linux || is_chromeos) {
"suid/process_util_linux.c",
"suid/sandbox.c",
]
+
+ cflags = [
+ "-fPIE",
+ ]
+
+ ldflags = [
+ "-pie",
+ ]
}
}

Some files were not shown because too many files have changed in this diff Show More