gentoo resync : 15.06.2021

4 files changed, 27 insertions, 26 deletions

diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 108679cd0932..921df057bf14 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1,6 +1,6 @@
-AUX chrome-remote-desktop-44.0.2403.44-always-sudo.patch 820 BLAKE2B f1e2c9d3a7bf2d53407b9ee4e4f34bf915d59502799bc4d38c9886d6c216dafb8ad957229a454da2ff750b00bc967e668cb022b06d4ad382e7427d61907970a1 SHA512 aa35c9e81b056fded2ff95b6fc7ab9cf3bb89282513b7bf1a04a9d25567d0e59da9c8c9877500e7290e40d712f4be06ae8b482d3f830d818ea5897e6ffde248b
+AUX chrome-remote-desktop-91.0.4472.10-always-sudo.patch 593 BLAKE2B 4cba2a4869437d2d392274c0f0586153406480eb1614297420e161285d981eedf03a4e090a309dfe55163e13387bf4c649586847ccee64dd2e88f9c7263b6b66 SHA512 f4aa5a2473c1872d06fea2611594f63c888717cd93618587b020dcb6aaeb7889443358dbc74da5c7763fb6ef08a6ecf9345d94874c582c799abbf8db8957c790
 AUX chrome-remote-desktop.conf.d 283 BLAKE2B a0146298fa2e18e16911587de10aa3dd229cfb26a2d1865637cc4c69c317f4cb303b98daa7f91b6e69cc34c6fbbab3d19332396d4f5c11eeef4958401e26ff14 SHA512 5391c4a2d5787047f773abbf1c5a9dd3842160d768122edc32f0a0275e198882a41a3ca88526d52347f89d1fb4e1a51b6dc785c4dd4a0c0b5935e1e6eff30f49
 AUX chrome-remote-desktop.rc 1183 BLAKE2B d1d56ac91a2ced2c6f13019f9d5c7f1d554c2fbd3f57842d6d0b791f2e90233e4d6e8a49155b634a5e20c0bad212a5bc5f63924b1a83d45db01b1fd69445fa07 SHA512 831391b6fcaeeda476a3064d6fff1fdcebb8037aba124814a81ad4a1336a68973f319a003d1ed0938eea68f5ddad179fe29fb12efa05fd204f7fa9c5fb8dd735
-DIST chrome-remote-desktop_88.0.4324.33_amd64.deb 33645072 BLAKE2B 5fc565c3a27307e46ff307ad2e68a9a390b5fb86be9d3d8bb5f82f3d22013f70af18002c888d5df82956b6f33b3397cf2cb8b9a7e4c07db480ead81abbb5743c SHA512 0cf6ebe8ce916874be79255faf870b20df892ce4825902996685416cedd8d8ef52215e7f278301fd6ff11e2cbc3b2e82078d7b0ee23ab35669760b1102d5827e
-EBUILD chrome-remote-desktop-88.0.4324.33.ebuild 4752 BLAKE2B c9cf603c748e8a6bf1a6a9a58c95db17f89485d4e8ac1a2e0937e0c04c18e5ef22de03ae2e9c4091bb648459fbca785578215282410d0af315159bc872046e6c SHA512 d172655f950e089f9baf169e55cad9ad2f0162a1c7d8d5917694f22bb96c234fe260f6c73ed4ebc9690a92308d8b8c2391f5187ac24925c4c5786f20ad4dd2a9
+DIST chrome-remote-desktop_91.0.4472.10_amd64.deb 38240812 BLAKE2B 34a91fba76c70abe3ae3aa4704f977f2f4788c412962a77c9c3f4c54aec0452cffb9705f650ee0688a63482ad20ccce8dcd2348cb606db6c2dd143592e68e222 SHA512 882138361926cf0975739ff9cee4105a3b95336021a1c63461a42e1eb76f8ae94fef4a36589da5ccda0c16bf8e9655be2517035e925f1bad08609f8d1f404553
+EBUILD chrome-remote-desktop-91.0.4472.10.ebuild 4787 BLAKE2B ab4a02650efabcfe489d91ace5251a6d69bccd9a484986b1589d3a22d2d57f72e6606643785e2ec31c3750bca12a271b0a687e7d6c7d97a9e40de3151989367a SHA512 286d12360e725a9bc70d01aed9e88e27f84ce7999ef0fd48bf85c5b9bf6e8d906cc347d1f5055aa30d4c3b638cc0b091e29d040cb84d87f8c7a90ec649350222
 MISC metadata.xml 214 BLAKE2B c0c4c0ad9c74c68b5d7e4e539dc441e82a025754b84fa14f01d0f6772b5acacc836523305857e1a8ef54d472e77a339d2361ec4bc70651cbf13e7be34b051d81 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-88.0.4324.33.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-91.0.4472.10.ebuild
index 32d84d049579..f2057d508820 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-88.0.4324.33.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-91.0.4472.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
@@ -77,7 +77,7 @@ S=${WORKDIR}
 QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
+	"${FILESDIR}"/${PN}-91.0.4472.10-always-sudo.patch #541708
 )
 
 src_prepare() {
@@ -89,7 +89,8 @@ src_prepare() {
 	python_fix_shebang chrome-remote-desktop
 
 	cd remoting_locales
-	rm fake-bidi* || die
+	# These isn't always included.
+	rm -f fake-bidi* || die
 	PLOCALES=${PLOCALES//_/-} l10n_find_plocales_changes "${PWD}" '' '.pak'
 }
 
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-44.0.2403.44-always-sudo.patch b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-44.0.2403.44-always-sudo.patch
deleted file mode 100644
index d303e5e753f9..000000000000
--- a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-44.0.2403.44-always-sudo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/541708
-
-just use `sudo` for everything
-
---- a/opt/google/chrome-remote-desktop/chrome-remote-desktop
-+++ b/opt/google/chrome-remote-desktop/chrome-remote-desktop
-@@ -1092,12 +1092,7 @@
-       logging.info("Group '%s' not found." % CHROME_REMOTING_GROUP_NAME)
- 
-     command = [SCRIPT_PATH, '--add-user-as-root', user]
--    if os.getenv("DISPLAY"):
--      # TODO(rickyz): Add a Polkit policy that includes a more friendly message
--      # about what this command does.
--      command = ["/usr/bin/pkexec"] + command
--    else:
--      command = ["/usr/bin/sudo", "-k", "--"] + command
-+    command = ["/usr/bin/sudo", "-k", "--"] + command
- 
-     # Run with an empty environment out of paranoia, though if an attacker
-     # controls the environment this script is run under, we're already screwed
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-91.0.4472.10-always-sudo.patch b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-91.0.4472.10-always-sudo.patch
new file mode 100644
index 000000000000..9e9ebd80c73b
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-91.0.4472.10-always-sudo.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/541708
+
+just use `sudo` for everything
+
+--- a/opt/google/chrome-remote-desktop/chrome-remote-desktop
++++ b/opt/google/chrome-remote-desktop/chrome-remote-desktop
+@@ -1092,12 +1092,7 @@
+ 
+ 
+ def run_command_as_root(command):
+-  if os.getenv("DISPLAY"):
+-    # TODO(rickyz): Add a Polkit policy that includes a more friendly
+-    # message about what this command does.
+-    command = ["/usr/bin/pkexec"] + command
+-  else:
+-    command = ["/usr/bin/sudo", "-k", "--"] + command
++  command = ["/usr/bin/sudo", "-k", "--"] + command
+ 
+   return subprocess.call(command)
+