From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- x11-apps/Manifest.gz | Bin 14678 -> 14687 bytes x11-apps/radeon-profile-daemon/Manifest | 8 +-- ...radeon-profile-daemon-20190603-run_subdir.patch | 33 +++++++++++ ...eon-profile-daemon-20190603-secure_socket.patch | 26 --------- .../files/radeon-profile-daemon.initd-r1 | 19 ------ .../files/radeon-profile-daemon.initd-r2 | 15 +++++ .../radeon-profile-daemon-20190603-r1.ebuild | 61 ++++++++++++++++++++ .../radeon-profile-daemon-20190603.ebuild | 60 ------------------- .../radeon-profile-daemon-99999999.ebuild | 7 ++- x11-apps/radeon-profile/Manifest | 7 +-- .../files/radeon-profile-20200504-run_subdir.patch | 30 ++++++++++ .../radeon-profile/radeon-profile-20190903.ebuild | 58 ------------------- .../radeon-profile-20200504-r1.ebuild | 64 +++++++++++++++++++++ .../radeon-profile/radeon-profile-20200504.ebuild | 58 ------------------- .../radeon-profile/radeon-profile-99999999.ebuild | 10 +++- x11-apps/xauth/Manifest | 4 +- x11-apps/xauth/xauth-1.1.ebuild | 10 +--- x11-apps/xauth/xauth-9999.ebuild | 10 +--- x11-apps/xev/Manifest | 2 + x11-apps/xev/xev-1.2.4.ebuild | 16 ++++++ 20 files changed, 246 insertions(+), 252 deletions(-) create mode 100644 x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-run_subdir.patch delete mode 100644 x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-secure_socket.patch delete mode 100644 x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r1 create mode 100644 x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r2 create mode 100644 x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603-r1.ebuild delete mode 100644 x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603.ebuild create mode 100644 x11-apps/radeon-profile/files/radeon-profile-20200504-run_subdir.patch delete mode 100644 x11-apps/radeon-profile/radeon-profile-20190903.ebuild create mode 100644 x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild delete mode 100644 x11-apps/radeon-profile/radeon-profile-20200504.ebuild create mode 100644 x11-apps/xev/xev-1.2.4.ebuild (limited to 'x11-apps') diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz index f89622024048..284338bc32cb 100644 Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ diff --git a/x11-apps/radeon-profile-daemon/Manifest b/x11-apps/radeon-profile-daemon/Manifest index c75e701c0de7..f220e33dcfe5 100644 --- a/x11-apps/radeon-profile-daemon/Manifest +++ b/x11-apps/radeon-profile-daemon/Manifest @@ -1,6 +1,6 @@ -AUX radeon-profile-daemon-20190603-secure_socket.patch 1006 BLAKE2B 19ed7c899c32b7630d7c5c14b85d98f77ae2aab6d22b5717cb0af2b1192c774a701ec04e60e7c57f5278538ce7311735a11e17415598b39e6373f52b01530db0 SHA512 92c634b365f0bc1614dbc8fb8a463dc7a15b984ca700a05ecb1a765898baccc1032dc87277c436f91e61585b15e3126d3ce3599cb0e5d430e39cbdcae61e3bc4 -AUX radeon-profile-daemon.initd-r1 473 BLAKE2B 039c48a1f16dad58942f709569805ed7102fef347d83771819c4bd0b3765bc453a0d28b85ccf2e6dd6d01fd4ec43d18f3b8e88acff8df5e5c67b8c26b009eab7 SHA512 b24bcdcafaf524f253e1052b910d001ac62014e128e786f69b5bf06dab63bada98823119d19a4040bf7062a8cbbb2d73f194a6fba6dba184eda3d6d09aec6a1e +AUX radeon-profile-daemon-20190603-run_subdir.patch 1189 BLAKE2B b7963eeafcb3db1f48b9945ee797bf8582c0191f0e99a280cdbe3195e7e819f67ef42de11e585748c0de2575482a321243ca01a616f7fa799d3d769f1ea58627 SHA512 a5124700211cce6a506aa139310b48bee20c495c4bae9b60f7450538b2e3389d16ff02dbe802f778565bffe7c86615ea4a176aed296fe658b26f1758b06033df +AUX radeon-profile-daemon.initd-r2 401 BLAKE2B 4965be70c3df07bbb02710f257fa10c43802a681f927792718f693e8369b8f1d6d000cbbf431485ce03ef26bcb4e38326e7430c15bfc9a578dab9008afa11a2f SHA512 f92822b59b17788cfb06a9560176e383c6c978c4e3cdeee3e4af8110e71beeb43308b8887063dff903704ea2a0e69ee4abe0e4e21e4921d030da0f9c8fd91f2d DIST radeon-profile-daemon-20190603.tar.gz 12232 BLAKE2B 3ff02f76178c2a30c8f094a2589aaed7d9e2c8ecc4cd0c8d3b6be1e38dddad39bbb4996ef9b7f87ef999890fbdade6ba3c6bcc39de6ae84bf1c224152a8249f1 SHA512 1c58008400f5acc5bd39353c6e2c109adecc4eb2b5d7976ce240d372cc60996ee93ce50630292ce85b9a1ae92d82e6cce49fd0ccb28f574bc668d212c50a54ab -EBUILD radeon-profile-daemon-20190603.ebuild 1224 BLAKE2B 9c4b42cc95eb1828ab0ba3b5da384aaa1b17c0154a3d424f653132aafe5959e1427f6677d7a397af0fd5d4e866f53df9aa7849f0a52201eee36a4aafec90b8d1 SHA512 6aef53947d4f4c649167bbf9d660011e1bc65cf401c1e0b3a764150a8ad0a85b15d1bc01a450996edf8d7d870177efdd6a40bed123d0724d024d7f504c426f90 -EBUILD radeon-profile-daemon-99999999.ebuild 1224 BLAKE2B 9c4b42cc95eb1828ab0ba3b5da384aaa1b17c0154a3d424f653132aafe5959e1427f6677d7a397af0fd5d4e866f53df9aa7849f0a52201eee36a4aafec90b8d1 SHA512 6aef53947d4f4c649167bbf9d660011e1bc65cf401c1e0b3a764150a8ad0a85b15d1bc01a450996edf8d7d870177efdd6a40bed123d0724d024d7f504c426f90 +EBUILD radeon-profile-daemon-20190603-r1.ebuild 1260 BLAKE2B eeb14f7d278d2d4628313c72e084a1469f4a90872a614855e6b630d1eb00f03f01c9750730be1a51006783ec33a2862fbbd35d7b924a24d7257e310e172a9b66 SHA512 58d65858e98719ab41f69e7bbbfb5954d438215e6f48d07051f715dd8f5cea816cb80136651fdadaba83c9da77b5afe8f5fcf08ce61d9a94a271dbbf9c6377de +EBUILD radeon-profile-daemon-99999999.ebuild 1260 BLAKE2B eeb14f7d278d2d4628313c72e084a1469f4a90872a614855e6b630d1eb00f03f01c9750730be1a51006783ec33a2862fbbd35d7b924a24d7257e310e172a9b66 SHA512 58d65858e98719ab41f69e7bbbfb5954d438215e6f48d07051f715dd8f5cea816cb80136651fdadaba83c9da77b5afe8f5fcf08ce61d9a94a271dbbf9c6377de MISC metadata.xml 358 BLAKE2B 06e855ba85405499bf5eaf5908bdc1f4936021b0be784d647a6d48f5641badb3aa84687744ea834331ff33226b2588e57fbb53b225a9a249b92b1ce1e47426a5 SHA512 6d40ebc0fe08862dc3a2ff138f335ea02184d34f450858a3bc4f9939db147daf5e6d0c4507064fb262018edc74e1e90ed563f41e36a2b442f080556c3aed49f2 diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-run_subdir.patch b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-run_subdir.patch new file mode 100644 index 000000000000..24bc134fdf92 --- /dev/null +++ b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-run_subdir.patch @@ -0,0 +1,33 @@ +From 8aad288652cb7dc9c60eadd85d945ac43a712663 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Wed, 8 Jul 2020 16:08:24 +0200 +Subject: [PATCH] Move radeon-profile-daemon-server socket file into its own + subdir under /run + +The rationale here is that QT has no methods to run chown on some +files but we do not want the socket being world readable. So instead of +writing lenghty C++-code using chown, we simply move the socket file into a +subdir which we can put our preferred permissions on during startup of the +daemon. + +Signed-off-by: Lars Wendler +--- + radeon-profile-daemon/rpdthread.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/radeon-profile-daemon/rpdthread.h b/radeon-profile-daemon/rpdthread.h +index 280fada..f05d031 100644 +--- a/radeon-profile-daemon/rpdthread.h ++++ b/radeon-profile-daemon/rpdthread.h +@@ -31,7 +31,7 @@ + #define SIGNAL_ALIVE '7' + + const QString appVersion = "20190603"; +-const QString serverSocketPath = "/run/radeon-profile-daemon-server"; ++const QString serverSocketPath = "/run/radeon-profile-daemon/radeon-profile-daemon-server"; + + class rpdThread : public QThread + { +-- +2.27.0 + diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-secure_socket.patch b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-secure_socket.patch deleted file mode 100644 index 951e7d12e28f..000000000000 --- a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-secure_socket.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 47ddfbb7b85c3e99eb0d132078c989c0dfa2ea9b Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Thu, 13 Jun 2019 15:58:44 +0200 -Subject: [PATCH] Don't make the socket world writable - -Signed-off-by: Lars Wendler ---- - radeon-profile-daemon/rpdthread.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/radeon-profile-daemon/rpdthread.cpp b/radeon-profile-daemon/rpdthread.cpp -index 8785efa..94a0d6f 100644 ---- a/radeon-profile-daemon/rpdthread.cpp -+++ b/radeon-profile-daemon/rpdthread.cpp -@@ -47,7 +47,7 @@ void rpdThread::createServer() - - QLocalServer::removeServer(serverSocketPath); - daemonServer.listen(serverSocketPath); -- QFile::setPermissions(serverSocketPath, QFile(serverSocketPath).permissions() | QFile::WriteOther | QFile::ReadOther); -+ QFile::setPermissions(serverSocketPath, QFile(serverSocketPath).permissions() | QFile::WriteGroup | QFile::ReadGroup); - } - - void rpdThread::closeConnection() --- -2.22.0 - diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r1 b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r1 deleted file mode 100644 index 813ab9515aeb..000000000000 --- a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r1 +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="Daemon for radeon-profile GUI" - -command="/usr/sbin/radeon-profile-daemon" -command_background="true" -pidfile="/run/${SVCNAME}.pid" - -radeon_socket="/run/radeon-profile-daemon-server" - -start_post() { - if ewaitfile 10 ${radeon_socket} ; then - chgrp video ${radeon_socket} - else - eerror "Failed to find socket file ${radeon_socket}" - fi -} diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r2 b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r2 new file mode 100644 index 000000000000..28ed19d4e846 --- /dev/null +++ b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r2 @@ -0,0 +1,15 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="Daemon for radeon-profile GUI" + +command="/usr/sbin/radeon-profile-daemon" +command_background="true" +pidfile="/run/${SVCNAME}/${SVCNAME}.pid" + +radeon_socket="/run/${SVCNAME}/${SVCNAME}-server" + +start_pre() { + checkpath -q -d -o root:video -m 0750 /run/${SVCNAME} +} diff --git a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603-r1.ebuild b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603-r1.ebuild new file mode 100644 index 000000000000..dc4d37cb3a89 --- /dev/null +++ b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils systemd + +DESCRIPTION="Daemon for radeon-profile GUI" +HOMEPAGE="https://github.com/marazmista/radeon-profile-daemon" +if [[ "${PV}" == 99999999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/marazmista/radeon-profile-daemon.git" +else + SRC_URI="https://github.com/marazmista/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi +LICENSE="GPL-2" +SLOT="0" + +IUSE="" + +RDEPEND=" + ! +Date: Wed, 8 Jul 2020 16:33:38 +0200 +Subject: [PATCH] Read radeon-profile-daemon-server socket from + /run/radeon-profile-daemon/ + +Gentoo has moved the radeon-profile-daemon-server socket file into that +subdir in order to provide secure access permissions. + +Signed-off-by: Lars Wendler +--- + radeon-profile/daemonComm.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/radeon-profile/daemonComm.cpp b/radeon-profile/daemonComm.cpp +index 21ec38f..dff00a0 100644 +--- a/radeon-profile/daemonComm.cpp ++++ b/radeon-profile/daemonComm.cpp +@@ -34,7 +34,7 @@ void DaemonComm::sendConnectionConfirmation() { + void DaemonComm::connectToDaemon() { + qDebug() << "Connecting to daemon..."; + signalSender->abort(); +- signalSender->connectToServer("/run/radeon-profile-daemon-server"); ++ signalSender->connectToServer("/run/radeon-profile-daemon/radeon-profile-daemon-server"); + } + + void DaemonComm::disconnectDaemon() { +-- +2.27.0 + diff --git a/x11-apps/radeon-profile/radeon-profile-20190903.ebuild b/x11-apps/radeon-profile/radeon-profile-20190903.ebuild deleted file mode 100644 index ad6e34fec998..000000000000 --- a/x11-apps/radeon-profile/radeon-profile-20190903.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils - -DESCRIPTION="Read current clocks of ATi/AMD Radeon cards" -HOMEPAGE="https://github.com/marazmista/radeon-profile" -if [[ "${PV}" == 99999999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/marazmista/radeon-profile.git" -else - SRC_URI="https://github.com/marazmista/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi -LICENSE="GPL-2" -SLOT="0" - -IUSE="" - -S="${WORKDIR}/${P}/${PN}" - -RDEPEND=" - dev-qt/qtcharts:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - x11-libs/libX11 - x11-libs/libXrandr -" - -DEPEND=" - ${RDEPEND} - dev-qt/qtconcurrent:5 - media-libs/mesa[X(+)] - x11-libs/libdrm -" - -src_prepare() { - default - sed 's@TrayIcon;@@' -i extra/${PN}.desktop || die -} - -src_configure() { - eqmake5 -} - -src_install() { - emake INSTALL_ROOT="${D}" install -} - -pkg_postinst() { - elog "In order to run ${PN} as non-root user, the" - elog " x11-apps/radeon-profile-daemon" - elog "package needs to be installed and the daemon must run." -} diff --git a/x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild b/x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild new file mode 100644 index 000000000000..d836b3ad1f83 --- /dev/null +++ b/x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils + +DESCRIPTION="Read current clocks of ATi/AMD Radeon cards" +HOMEPAGE="https://github.com/marazmista/radeon-profile" +if [[ "${PV}" == 99999999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/marazmista/radeon-profile.git" +else + SRC_URI="https://github.com/marazmista/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi +LICENSE="GPL-2" +SLOT="0" + +IUSE="" + +S="${WORKDIR}/${P}/${PN}" + +RDEPEND=" + !