From d232a490ada8beda5cb356add183047cff3f5ae7 Mon Sep 17 00:00:00 2001
From: Francois Marier <francois@brave.com>
Date: Fri, 25 Jan 2019 10:31:25 -0800
Subject: [PATCH] Remove dl.google.com repository from Linux packages

This disables the cronjob that gets installed by the RPM and DEB packages in
order to forcefully add (or re-add) the Google Chrome package repository and
signing key.

This fixes brave/brave-browser#1084 and fixes brave/brave-browser#1967.
---
 .../chrome-installer-linux-common-repo.cron.patch  | 14 ++++++++++++++
 ...hrome-installer-linux-common-rpmrepo.cron.patch | 14 ++++++++++++++
 ...-installer-linux-rpm-chrome.spec.template.patch | 14 ++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 patches/chrome-installer-linux-common-repo.cron.patch
 create mode 100644 patches/chrome-installer-linux-common-rpmrepo.cron.patch
 create mode 100644 patches/chrome-installer-linux-rpm-chrome.spec.template.patch

diff --git a/patches/chrome-installer-linux-common-repo.cron.patch b/patches/chrome-installer-linux-common-repo.cron.patch
new file mode 100644
index 000000000000..650c74d93371
--- /dev/null
+++ b/patches/chrome-installer-linux-common-repo.cron.patch
@@ -0,0 +1,14 @@
+diff --git a/chrome/installer/linux/common/repo.cron b/chrome/installer/linux/common/repo.cron
+index 2750e4924da6d0a723c1d649781637e7d08b3562..fbe7797e37633de174f4a83d7b11bf04b8813c1a 100755
+--- a/chrome/installer/linux/common/repo.cron
++++ b/chrome/installer/linux/common/repo.cron
+@@ -17,6 +17,9 @@
+ # "false" as desired. An empty $DEFAULTS_FILE is the same as setting both values
+ # to "false".
+ 
++# Don't add the Chrome repo (brave/brave-browser#1084)
++exit 0
++
+ @@include@@apt.include
+ 
+ ## MAIN ##
diff --git a/patches/chrome-installer-linux-common-rpmrepo.cron.patch b/patches/chrome-installer-linux-common-rpmrepo.cron.patch
new file mode 100644
index 000000000000..8c49796541da
--- /dev/null
+++ b/patches/chrome-installer-linux-common-rpmrepo.cron.patch
@@ -0,0 +1,14 @@
+diff --git a/chrome/installer/linux/common/rpmrepo.cron b/chrome/installer/linux/common/rpmrepo.cron
+index f7fe2bcf7d7cbf95b23067f21f87422706c5e4d0..3541826a03009e2adb8dbd6c258d254d31247a77 100755
+--- a/chrome/installer/linux/common/rpmrepo.cron
++++ b/chrome/installer/linux/common/rpmrepo.cron
+@@ -14,6 +14,9 @@
+ # setting "repo_add_once" to "true" or "false" as desired. An empty
+ # $DEFAULTS_FILE is the same as setting the value to "false".
+ 
++# Don't add the Chrome repo (brave/brave-browser#1967)
++exit 0
++
+ @@include@@rpm.include
+ 
+ ## MAIN ##
diff --git a/patches/chrome-installer-linux-rpm-chrome.spec.template.patch b/patches/chrome-installer-linux-rpm-chrome.spec.template.patch
new file mode 100644
index 000000000000..f8f0f71a6f72
--- /dev/null
+++ b/patches/chrome-installer-linux-rpm-chrome.spec.template.patch
@@ -0,0 +1,14 @@
+diff --git a/chrome/installer/linux/rpm/chrome.spec.template b/chrome/installer/linux/rpm/chrome.spec.template
+index 55a35677b9c46a2038cea9ac8dedf40d31a679f4..210f7c15ab98449f2ce121d5e7d8a7f632f5e94f 100644
+--- a/chrome/installer/linux/rpm/chrome.spec.template
++++ b/chrome/installer/linux/rpm/chrome.spec.template
+@@ -127,7 +127,8 @@ if [ ! -e "$DEFAULTS_FILE" ]; then
+   echo 'repo_add_once="true"' > "$DEFAULTS_FILE"
+ fi
+ 
+-. "$DEFAULTS_FILE"
++# Don't install the Chrome repo (brave/brave-browser#1967)
++#. "$DEFAULTS_FILE"
+ 
+ if [ "$repo_add_once" = "true" ]; then
+   determine_rpm_package_manager