From 456029e934713841af700754ac827753cae70405 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 3 Mar 2015 05:34:09 +0000 Subject: [PATCH] Avoid using gksu and always use sudo #541708 by Kelly Price. Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- net-misc/chrome-remote-desktop/ChangeLog | 9 +- net-misc/chrome-remote-desktop/Manifest | 30 ++--- ...rome-remote-desktop-41.0.2272.41-r1.ebuild | 106 ++++++++++++++++++ ...ote-desktop-41.0.2272.41-always-sudo.patch | 18 +++ 4 files changed, 148 insertions(+), 15 deletions(-) create mode 100644 net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41-r1.ebuild create mode 100644 net-misc/chrome-remote-desktop/files/chrome-remote-desktop-41.0.2272.41-always-sudo.patch diff --git a/net-misc/chrome-remote-desktop/ChangeLog b/net-misc/chrome-remote-desktop/ChangeLog index 07dde69d247d..3f0f70c39024 100644 --- a/net-misc/chrome-remote-desktop/ChangeLog +++ b/net-misc/chrome-remote-desktop/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/chrome-remote-desktop # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/chrome-remote-desktop/ChangeLog,v 1.2 2015/02/27 08:05:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/chrome-remote-desktop/ChangeLog,v 1.3 2015/03/03 05:34:08 vapier Exp $ + +*chrome-remote-desktop-41.0.2272.41-r1 (03 Mar 2015) + + 03 Mar 2015; Mike Frysinger + +chrome-remote-desktop-41.0.2272.41-r1.ebuild, + +files/chrome-remote-desktop-41.0.2272.41-always-sudo.patch: + Avoid using gksu and always use sudo #541708 by Kelly Price. *chrome-remote-desktop-41.0.2272.41 (27 Feb 2015) diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest index 5bedc55dcc3b..d33913547ab0 100644 --- a/net-misc/chrome-remote-desktop/Manifest +++ b/net-misc/chrome-remote-desktop/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX chrome-remote-desktop-41.0.2272.41-always-sudo.patch 665 SHA256 5c1b6f23e7abe449280ed30c53ff99a6e253b81d96ca0f794fe835a342493cce SHA512 6b183236d8a23621c203b323ec08f2dfbb3225cddcb0b61e3c5fea9bfe14c62504317b5273951a5a818c31983061f724caf6a6cf4c7a7633852c8cfd06fde249 WHIRLPOOL d44622f2078152683306d324496bc75cc0e9ea1ef4a6991ba9c889b5f31ab8afb1b3b41f0f98ef24b7576953d737d25e72c7d7b7a419e93b7c654a6cfe4abb6f AUX chrome-remote-desktop.conf.d 374 SHA256 9eddab8def60886b47885a94c25b6bf4c9932d4f245d5a54976aef1177044176 SHA512 ac6bcb41acef3c4cad31e22fa08034a953882c326f76e0102984ffa3650f99b39a410ec70008a0d67262feadbe4e4f4fa8068f41893673a20f6c96becbc32894 WHIRLPOOL cfbb9b54f6c22c15b1241213ede871de1a36ddbc95a2e07b9a4bc5f84c4e75845ae9951834382c84cb0d39b661a61aca5af11af5d99a4c1168d6ec9e6cd778e0 AUX chrome-remote-desktop.rc 1696 SHA256 c58ae3677d12e7069608dffb8caf3c6f74ccb00305b4f1aa2969bd86f9c1bae7 SHA512 ad454d1755fb51202bb10ba428f5e31773829c166f57131f39b741c50985b4720e1269d7376558df7fd89a9fd7f284d580411d30eb63cfcae8507403f29d015a WHIRLPOOL 4c35e73d6349435b591ee8a028ffd6d11fe446eeda64e0f71898012efb882ab00af26bb6a40dffd5bc81329c2e3bec33eb0188ebc0c36b160a1e942fc828cd93 DIST chrome-remote-desktop_40.0.2214.44_amd64.deb 14745924 SHA256 ad808f914e7929d98ec030a13749139f51fc58a8372cd95eb893cf98f4c7d0d8 SHA512 eeeda7c30e38d8af4e02e7462db0abcf21a3d04410eba82b880f2752b43dcdc970ae835d9fba4f5c7484537394d935e33503eb6e9338475d708a88f9a22058f9 WHIRLPOOL 85d88bc3f417e16a8144eb3c6210c7800c7007d1c92464665c60ac9cd49fb126e887f703000d4e761770ac26029f9a685e49687ff6f2b96a0bb1ffd5d2aa42b1 @@ -8,23 +9,24 @@ DIST chrome-remote-desktop_40.0.2214.44_i386.deb 15490864 SHA256 97e9acefa7330f2 DIST chrome-remote-desktop_41.0.2272.41_amd64.deb 14857068 SHA256 3d6ed3c527bf0b069f2602b318ee2b39451bbb86768ea5f325ce48e3d75476dd SHA512 41720c209966fd7458f9f5b8b10b7aa19e8ba12b45a9676fa0cfddc54d880c8ece019b2e943daad8d1d8acc1df04c4879fe98272e43ea023e406faedf84a1fa3 WHIRLPOOL e699797fd2b4936851e00655f7204541a56be4b89f53236d70010b4e184ce29bba7afc100e428b4e7d3c51ae98d8350f0ada415f78fc7ab2e4ead62486e8e568 DIST chrome-remote-desktop_41.0.2272.41_i386.deb 15534358 SHA256 b591a3815366832229902b1d15d9d2cb246651b715c08f58d7d52df1f4d2dad0 SHA512 d9610e93df2e636163935debdeeee25843ca5bd0071330de9c9ce63fda717e6e4d29791822867c37466b80e8136eac4a86678c9d1536300701510f2a8c10658f WHIRLPOOL 94fe2c5eabfb15e4f12d9babac1bb08c406eef21d156051969304411311654ff0d087d44aefbb07b79eb9f3bf93a50ab10ed9f8bc54d0607eee60e5a402b07e7 EBUILD chrome-remote-desktop-40.0.2214.44.ebuild 3566 SHA256 5be255a38afd76c843f51dc80fc7749a65bb5f8e00541c1a4cccf03bae7b5902 SHA512 f4f51ff983da12438c902170728b9b3d615737534de27f30f2398a897d9aa7d80d85860abeb6ced5b76d64b362b453c9035eaac9f8398892d90bd0e13efe25e6 WHIRLPOOL f46dcd68c0faaff266d2f577985199a77fc2a095b1a3cfadd316498f364c2836a8f8ec59d276f0811b3565e77de2b81b186d1e76e8879f974606ad56f115b2c6 +EBUILD chrome-remote-desktop-41.0.2272.41-r1.ebuild 3655 SHA256 f9a3f5875a77e45dec2e805176b26962438b2acf0f41edb105aacb967ba1c86e SHA512 c08f1ab113f3c794c18672a290929025907b19bdabb573a5f15677dfec7bc4e0fe83da88029aa40d1fef5ef505e8c9041c5337c5a4c66b33d93a284a7ab2be95 WHIRLPOOL 66a495756a2d7350a19f037601ee75235693b4b4345a0a7529e5f19691419fa7034fcfb115733e569bc668b2cd045ca795a67f86351002c527384d455434706e EBUILD chrome-remote-desktop-41.0.2272.41.ebuild 3566 SHA256 d45056d384c2e90559cfb40117cb061e8ae9903f7fb63a63b30304d638364971 SHA512 626759c3d62bc5bdac371ad23761317009939d21fa4d1cac09df6ca3272301738f99bcf746a75469cc995029c3733a648884cc6e0085773261460b2fcaa0349d WHIRLPOOL eb55b1bcc3bd6d026be80848aeb921a2c335f170bc00f8d5865731dcf916f0b412f1117986bc04f7f24bfce4227308f596bde13dcbd1c4239a6cffe30976f983 -MISC ChangeLog 651 SHA256 8ea4bddfbb183bd1ccf682c539b3087d90dc08085dc186145251f75c9f33abb6 SHA512 8e11a5c8253b8e396ba1eed9edfc84452dc573e5807e61a1cb537848d579f8e5f8c9168ac9f6c33625b6847568249bbda27b6d1aaf780164082dae948a718b0f WHIRLPOOL c967395e5744be4d369a9256d3d06ab08586fd8d649a32691a86b1667917f7b41e718759d41c10e555dd0f1858c6b7a57a90f77f5cfe365396e164e0d0cc8209 +MISC ChangeLog 931 SHA256 c7f35f8ff2ef1e477b63e4dc97ae5f0ed027c039515c2078dba6f98792eb535f SHA512 90600eb9048524b22f65e6c371111d94638d8e09b5ab4e1840f3dbd6f7376697271df3f66e6f8ea8c42abc791bde87d4e082c6eed93e5b53e265681fcb765fb3 WHIRLPOOL f5f61de99a6caa730b0fd3499566679ff52d57a147eae00058af4bd8876619bbe5bc8f0ab6778cf24b3d71bb638b114f1fec4a87f8fa08ca78247d7ac9a432a6 MISC metadata.xml 200 SHA256 eb63f2affd0b8e3f5149df2f2f964910eb2127b650919a9e7892fae011e2b22b SHA512 da94c752d3f451652f15c0c459caa079e1d11f37278f86da057ed915ba167688ea62ec62c3c6406200fa951f8f495e9dd782d0e12f9e315187ba4de305f13a1d WHIRLPOOL 80bd517227281caf99e291cd59cd6e5deec972d693473727c7dcd6195450ea9dca63a151e52111c7c2456831f19113008ec60a5c1a66cc3b24f8b17c74e2c373 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU8CU8AAoJEPGu1DbS6WIAyScP/1KvFypC+89b2PPTtcBBrhTE -DNtpSQSVT4BZ0PZ+yRgGUXZsAYspibdzcQuOI/ym0Y4/FsBltejkQT0tgNLg/GHr -rRMKEhbm+GT/uF+lE8+BiOCiR6siAm+gQzpe1JdNd11DPEjIXi3MWCueTD8iMVuA -rRpOc+Jr8gUxk2gW5S3lKHQGLZpEglQhvskzZzV+mFUjUw0j9qNq1WYNbXRp+tAk -fPpNKygS3XiRcMct4BY92liiFbYnSNfJt3Mij6b+/OqJO+R5q/Ksz7USIRf1q7PC -rPfKIVPI47vSNVs5g+ixZtQIhrSyCvYapNdmM249pBYbRtJ5NuCQNvsXzC4AktsA -0I/Zx5ophtTSvVPlZLt4Qs0ZN0pn0+0PwhHv5OmmEkbKBZgpvUzZUZzyUOrSLwm9 -F5UGtvUdtVI6kMrYawqRz0HJdIQMpWJttFr3HyzjCNplPTfKfKoQZvaNa97ruxvn -OC85aL5LWr2YcGLlafmOdIKm/uPtBnWxH7h1ESIVShD4faJhdNnsZPscLHrNcHFk -ufdZAYx7MhRM6M5V4DDanzmgHaLQwK5ARLpuARA99lD6puylItCIV+rZY4iMihDZ -/srWirC+vZM8S+CIYB2YZv8LI2HrS3eN5kRJn/bkANWrDeNCvgIf958+nbx/fQMw -JoOC63reCZCfXQKOUOJb -=Rh9Q +iQIcBAEBCAAGBQJU9UfSAAoJEPGu1DbS6WIAY2gQAJjcu3bYD6wXcYqnYsQ8sgzw +qqAgoNz9B2rE+bO9+cm/mffhfReZGrS53+yASOlOO3gHMguDDCVJ1DiHBEixF7Mu +yAKQewaD0L88Y1gksK2MUm7oUzzQR8/Ohj1s++4a08xFPBEDGBlmA6UHhWULxVBT +IiL2ubT615zy3B1o9BcwgkCBPPO9AWlLYZygPsZdm/z4h8lGgKfa6pEv5OM4RuhL +4iu7ENubYf/k4e4r2cMiW5CkcIjRYYMyZ413LcJYiW+9W200Nl+EApPljKCZw1JS +6yhJxHx0A7+Dk9/cy4NIfpovw5m8/PXn0QdX4nD/J9NfraZvbwCgjHhH8Mtt+9O/ +guvQr53lcKPscf2kymMlrjmC/pEEXJvt6Kf4pKBHci7kq75TZ76s0pHOow9+cXvR +Kj5YqjNOaN1taIYdmuj8LyD/vh/kQkxRVk/doNF1Y9+pvO/PdzrEuL+NEnKCo3Hw +2+/g8gs0+pGGYe0w0upa5n6bXFWekUNMzMv5JDaTgMWSWz3Sz0DjGHMaVNyYawNi +JOoPUjuokQCo4BGoXPw1Q1+iiDrFLBh37MFKqKJY4fBUTzOwIrgFqdWx69Zi2wG+ +AdwE0j8K9rUyWZUwbqGVCQvrKzaEl/ML7ksNDtepw/xRrNZOthd2DkIq/67/3f14 +PQHWEf8AAtmH94F0SfOK +=4kz+ -----END PGP SIGNATURE----- diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41-r1.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41-r1.ebuild new file mode 100644 index 000000000000..039dd6ef16e9 --- /dev/null +++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41-r1.ebuild,v 1.1 2015/03/03 05:34:08 vapier Exp $ + +# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/ +# Fetch the Release file: +# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release +# Which gives you the Packages file: +# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages +# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages +# And finally gives you the file name: +# pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb +# +# Use curl to find the answer: +# curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages | grep ^Filename + +EAPI="4" + +inherit unpacker + +DESCRIPTION="access remote computers via Chrome!" +PLUGIN_URL="https://chrome.google.com/remotedesktop" +HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}" +BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}" +SRC_URI="amd64? ( ${BASE_URI}_amd64.deb ) + x86? ( ${BASE_URI}_i386.deb )" + +LICENSE="google-chrome" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="" + +# All the libs this package links against. +RDEPEND="app-admin/sudo + dev-lang/python + >=dev-libs/expat-2 + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + dev-python/psutil + gnome-base/gconf:2 + media-libs/fontconfig + media-libs/freetype:2 + sys-devel/gcc + sys-libs/glibc + sys-libs/pam + x11-libs/cairo + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXtst + x11-libs/pango" +# Settings we just need at runtime. +RDEPEND+=" + x11-base/xorg-server[xvfb]" +DEPEND="" + +S=${WORKDIR} + +QA_PREBUILT="/opt/google/chrome-remote-desktop/*" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-41.0.2272.41-always-sudo.patch #541708 +} + +src_install() { + insinto /etc + doins -r etc/opt + + insinto /opt + doins -r opt/google + chmod a+rx "${ED}"/opt/google/${PN}/* || die + + dodir /etc/pam.d + dosym system-remote-login /etc/pam.d/${PN} + + dodoc usr/share/doc/${PN}/changelog* + + newinitd "${FILESDIR}"/${PN}.rc ${PN} + newconfd "${FILESDIR}"/${PN}.conf.d ${PN} +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "Two ways to launch the server:" + elog "(1) access an existing desktop" + elog " (a) install the Chrome plugin on the server & client:" + elog " ${PLUGIN_URL}" + elog " (b) on the server, run the Chrome plugin & enable remote access" + elog " (c) on the client, connect to the server" + elog "(2) headless system" + elog " (a) install the Chrome plugin on the client:" + elog " ${PLUGIN_URL}" + elog " (b) visit https://accounts.google.com/o/oauth2/auth?response_type=code&scope=https://www.googleapis.com/auth/chromoting+https://www.googleapis.com/auth/googletalk+https://www.googleapis.com/auth/userinfo.email&access_type=offline&redirect_uri=https://chromoting-auth.googleplex.com/auth&approval_prompt=force&client_id=440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com&hl=en&from_login=1&as=-760f476eeaec11b8&pli=1&authuser=0" + elog " (c) run the command mentioned on the server" + elog " (d) on the client, connect to the server" + elog + elog "Configuration settings you might want to be aware of:" + elog " ~/.${PN}-session - shell script to start your session" + elog " /etc/init.d/${PN} - script to auto-restart server" + fi +} diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-41.0.2272.41-always-sudo.patch b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-41.0.2272.41-always-sudo.patch new file mode 100644 index 000000000000..39e9d27e9d3a --- /dev/null +++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-41.0.2272.41-always-sudo.patch @@ -0,0 +1,18 @@ +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,10 +1092,7 @@ + except KeyError: + logging.info("Group '%s' not found." % CHROME_REMOTING_GROUP_NAME) + +- if os.getenv("DISPLAY"): +- sudo_command = "gksudo --description \"Chrome Remote Desktop\"" +- else: +- sudo_command = "sudo" ++ sudo_command = "sudo" + command = ("sudo -k && exec %(sudo)s -- sh -c " + "\"groupadd -f %(group)s && gpasswd --add %(user)s %(group)s\"" % + { 'group': CHROME_REMOTING_GROUP_NAME, -- 2.26.2