From 1b991ad081e52ebaf923311812c7868760e5cb4b Mon Sep 17 00:00:00 2001
From: Francois Marier <francois@brave.com>
Date: Tue, 31 Dec 2019 14:43:53 -0800
Subject: [PATCH 1/2] Revert "Remove Chrome repo erroneously added by
 brave-browser (brave-browser#2927)"

This reverts commit 5827f29b677a4d8d5bb5c3d22465fc684a26193a.

This cleanup, released almost a year ago, should no longer be needed.
---
 .../chrome-installer-linux-common-repo.cron.patch   | 13 ++-----------
 ...chrome-installer-linux-common-rpmrepo.cron.patch | 13 ++-----------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/patches/chrome-installer-linux-common-repo.cron.patch b/patches/chrome-installer-linux-common-repo.cron.patch
index c1a2aaec10bd..650c74d93371 100644
--- a/patches/chrome-installer-linux-common-repo.cron.patch
+++ b/patches/chrome-installer-linux-common-repo.cron.patch
@@ -1,20 +1,11 @@
 diff --git a/chrome/installer/linux/common/repo.cron b/chrome/installer/linux/common/repo.cron
-index 2750e4924da6d0a723c1d649781637e7d08b3562..2b9a3f3591a93a033a93e201b2b1a1d13ebbecd4 100755
+index 2750e4924da6d0a723c1d649781637e7d08b3562..fbe7797e37633de174f4a83d7b11bf04b8813c1a 100755
 --- a/chrome/installer/linux/common/repo.cron
 +++ b/chrome/installer/linux/common/repo.cron
-@@ -17,6 +17,18 @@
+@@ -17,6 +17,9 @@
  # "false" as desired. An empty $DEFAULTS_FILE is the same as setting both values
  # to "false".
  
-+# Remove Chrome repo if erroneously added (brave/brave-browser#2927)
-+if [ -e "/etc/apt/sources.list.d/@@PACKAGE@@.list" ] ; then
-+  if [ ! -e "/etc/apt/sources.list.d/google-chrome.list" -a ! -e "/etc/apt/sources.list.d/google-chrome-beta.list" -a ! -e "/etc/apt/sources.list.d/google-chrome-unstable.list" ] ; then
-+    apt-key del D38B4796
-+  fi
-+  rm -f "/etc/default/@@PACKAGE@@"
-+  rm "/etc/apt/sources.list.d/@@PACKAGE@@.list"
-+fi
-+
 +# Don't add the Chrome repo (brave/brave-browser#1084)
 +exit 0
 +
diff --git a/patches/chrome-installer-linux-common-rpmrepo.cron.patch b/patches/chrome-installer-linux-common-rpmrepo.cron.patch
index 0386d966e537..8c49796541da 100644
--- a/patches/chrome-installer-linux-common-rpmrepo.cron.patch
+++ b/patches/chrome-installer-linux-common-rpmrepo.cron.patch
@@ -1,20 +1,11 @@
 diff --git a/chrome/installer/linux/common/rpmrepo.cron b/chrome/installer/linux/common/rpmrepo.cron
-index f7fe2bcf7d7cbf95b23067f21f87422706c5e4d0..3dbad7d3a412efb023f3d57707fe6723d5a78e66 100755
+index f7fe2bcf7d7cbf95b23067f21f87422706c5e4d0..3541826a03009e2adb8dbd6c258d254d31247a77 100755
 --- a/chrome/installer/linux/common/rpmrepo.cron
 +++ b/chrome/installer/linux/common/rpmrepo.cron
-@@ -14,6 +14,18 @@
+@@ -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".
  
-+# Remove Chrome repo if erroneously added (brave/brave-browser#2927)
-+if [ -e "/etc/yum.repos.d/@@PACKAGE@@.repo" ] ; then
-+  if [ ! -e "/etc/yum.repos.d/google-chrome.repo" -a ! -e "/etc/yum.repos.d/google-chrome-beta.repo" -a ! -e "/etc/yum.repos.d/google-chrome-unstable.repo" ] ; then
-+    rpm -e gpg-pubkey-7fac5991-4615767f
-+    rpm -e gpg-pubkey-d38b4796-570c8cd3
-+  fi
-+  rm "/etc/yum.repos.d/@@PACKAGE@@.repo"
-+fi
-+
 +# Don't add the Chrome repo (brave/brave-browser#1967)
 +exit 0
 +

From 8c58e4ff1f9a0df562cf875e1b9abefb54bf50d5 Mon Sep 17 00:00:00 2001
From: Francois Marier <francois@brave.com>
Date: Tue, 31 Dec 2019 14:49:28 -0800
Subject: [PATCH 2/2] Disable removal of Google repo (fixes
 brave/brave-browser#6912)

---
 patches/chrome-installer-linux-debian-postrm.patch | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 patches/chrome-installer-linux-debian-postrm.patch

diff --git a/patches/chrome-installer-linux-debian-postrm.patch b/patches/chrome-installer-linux-debian-postrm.patch
new file mode 100644
index 000000000000..09ba6425aca9
--- /dev/null
+++ b/patches/chrome-installer-linux-debian-postrm.patch
@@ -0,0 +1,9 @@
+diff --git a/chrome/installer/linux/debian/postrm b/chrome/installer/linux/debian/postrm
+index 85b9961013ff276c13810d32ec8d927859abba37..542e1298f986d90579182ecdf2c870365190f349 100755
+--- a/chrome/installer/linux/debian/postrm
++++ b/chrome/installer/linux/debian/postrm
+@@ -30,4 +30,3 @@ if [ -s "$DEFAULTS_FILE" ]; then
+   rm "$DEFAULTS_FILE" || exit 1
+ fi
+ # Remove any Google repository added by the package.
+-clean_sources_lists