public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-apps/radeon-profile-daemon/, x11-apps/radeon-profile-daemon/files/
@ 2019-05-10 10:01 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2019-05-10 10:01 UTC (permalink / raw
  To: gentoo-commits

commit:     bf12cbcf32c902e9825583425340be3cb404dc09
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 09:59:27 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri May 10 10:01:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf12cbcf

x11-apps/radeon-profile-daemon: Secured socket permissions.

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...eon-profile-daemon-20190309-secure_socket.patch | 26 ++++++++++++++++++++++
 .../files/radeon-profile-daemon.initd              |  4 ++++
 ...ld => radeon-profile-daemon-20190309-r2.ebuild} | 13 ++++++++++-
 .../radeon-profile-daemon-99999999.ebuild          | 13 ++++++++++-
 4 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190309-secure_socket.patch b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190309-secure_socket.patch
new file mode 100644
index 00000000000..5d7132b90b7
--- /dev/null
+++ b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190309-secure_socket.patch
@@ -0,0 +1,26 @@
+From 8e75c8678b874c6813e590634943166daa98124b Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 10 May 2019 11:01:21 +0200
+Subject: [PATCH] Don't make the socket world writable
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ 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 4cf0ac0..137d5b2 100644
+--- a/radeon-profile-daemon/rpdthread.cpp
++++ b/radeon-profile-daemon/rpdthread.cpp
+@@ -47,7 +47,7 @@ void rpdThread::createServer()
+ 
+     QLocalServer::removeServer(serverName);
+     daemonServer.listen(serverName);
+-    QFile::setPermissions("/tmp/" + serverName, QFile("/tmp/" + serverName).permissions() | QFile::WriteOther | QFile::ReadOther);
++    QFile::setPermissions("/tmp/" + serverName, QFile("/tmp/" + serverName).permissions() | QFile::WriteGroup | QFile::ReadGroup);
+ }
+ 
+ void rpdThread::closeConnection()
+-- 
+2.21.0
+

diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd
index e4e7afb04c5..f8ec5179670 100644
--- a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd
+++ b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd
@@ -7,3 +7,7 @@ description="Daemon for radeon-profile GUI"
 command="/usr/sbin/radeon-profile-daemon"
 command_background="true"
 pidfile="/run/${SVCNAME}.pid"
+
+start_post() {
+	chgrp video /tmp/radeon-profile-daemon-server
+}

diff --git a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190309-r2.ebuild
similarity index 81%
copy from x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
copy to x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190309-r2.ebuild
index ca74330cfd3..924760fc909 100644
--- a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
+++ b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190309-r2.ebuild
@@ -27,8 +27,14 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}/${PN}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-secure_socket.patch"
+)
+
 src_prepare() {
-	default
+	eapply -p2 "${PATCHES[@]}"
+	eapply_user
+
 	sed \
 		-e '/^bin\.path/s@/bin@/sbin@' \
 		-e "/^service\.path/s@=.*\$@= $(systemd_get_systemunitdir)@" \
@@ -47,3 +53,8 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 }
+
+pkg_postinst() {
+	elog "Users need to be in the \"video\" group if they want to change"
+	elog "video card settings via ${PN}"
+}

diff --git a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
index ca74330cfd3..924760fc909 100644
--- a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
+++ b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
@@ -27,8 +27,14 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}/${PN}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-secure_socket.patch"
+)
+
 src_prepare() {
-	default
+	eapply -p2 "${PATCHES[@]}"
+	eapply_user
+
 	sed \
 		-e '/^bin\.path/s@/bin@/sbin@' \
 		-e "/^service\.path/s@=.*\$@= $(systemd_get_systemunitdir)@" \
@@ -47,3 +53,8 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 }
+
+pkg_postinst() {
+	elog "Users need to be in the \"video\" group if they want to change"
+	elog "video card settings via ${PN}"
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-apps/radeon-profile-daemon/, x11-apps/radeon-profile-daemon/files/
@ 2019-06-13 14:27 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2019-06-13 14:27 UTC (permalink / raw
  To: gentoo-commits

commit:     554169d137ed8565b7802bd3dcdf3d274f4ce4f1
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 14:06:14 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 14:27:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=554169d1

x11-apps/radeon-profile-daemon: Adjusted live ebuild

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...eon-profile-daemon-20190603-secure_socket.patch | 26 ++++++++++++++++++++++
 .../files/radeon-profile-daemon.initd-r1           | 19 ++++++++++++++++
 .../radeon-profile-daemon-99999999.ebuild          |  4 ++--
 3 files changed, 47 insertions(+), 2 deletions(-)

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
new file mode 100644
index 00000000000..951e7d12e28
--- /dev/null
+++ b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-secure_socket.patch
@@ -0,0 +1,26 @@
+From 47ddfbb7b85c3e99eb0d132078c989c0dfa2ea9b Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 13 Jun 2019 15:58:44 +0200
+Subject: [PATCH] Don't make the socket world writable
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ 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
new file mode 100644
index 00000000000..813ab9515ae
--- /dev/null
+++ b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r1
@@ -0,0 +1,19 @@
+#!/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/radeon-profile-daemon-99999999.ebuild b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
index 924760fc909..77f7239752b 100644
--- a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
+++ b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}/${PN}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-secure_socket.patch"
+	"${FILESDIR}/${PN}-20190603-secure_socket.patch"
 )
 
 src_prepare() {
@@ -51,7 +51,7 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-apps/radeon-profile-daemon/, x11-apps/radeon-profile-daemon/files/
@ 2019-10-16 10:54 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2019-10-16 10:54 UTC (permalink / raw
  To: gentoo-commits

commit:     8da742249f42f6b77988f852bb27529b7132820b
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 16 10:54:04 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 10:54:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da74224

x11-apps/radeon-profile-daemon: Removed old

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 x11-apps/radeon-profile-daemon/Manifest            |  1 -
 ...eon-profile-daemon-20190309-secure_socket.patch | 26 ----------
 .../files/radeon-profile-daemon.initd              | 27 ----------
 .../radeon-profile-daemon-20190309-r2.ebuild       | 60 ----------------------
 4 files changed, 114 deletions(-)

diff --git a/x11-apps/radeon-profile-daemon/Manifest b/x11-apps/radeon-profile-daemon/Manifest
index dae73dc833e..9a1f922d02f 100644
--- a/x11-apps/radeon-profile-daemon/Manifest
+++ b/x11-apps/radeon-profile-daemon/Manifest
@@ -1,2 +1 @@
-DIST radeon-profile-daemon-20190309.tar.gz 12178 BLAKE2B 931ce4bb123456e349a68c8fe0b18150ff988a83a5e58cf451f68025240a8b4c802e03a567ef41684e91442bf21c02cc00d31ef6c82a67ca7eb7587754c6f32e SHA512 f2bb6f7dc0bf322e5c43c5ca1f99501a4fd3f4532cc9c1686b5cfbc58bdd423e81c25d3ae03fcae9dc15dc92d8ad089b2357b27b0ff399de7ac27213e00b2f37
 DIST radeon-profile-daemon-20190603.tar.gz 12232 BLAKE2B 3ff02f76178c2a30c8f094a2589aaed7d9e2c8ecc4cd0c8d3b6be1e38dddad39bbb4996ef9b7f87ef999890fbdade6ba3c6bcc39de6ae84bf1c224152a8249f1 SHA512 1c58008400f5acc5bd39353c6e2c109adecc4eb2b5d7976ce240d372cc60996ee93ce50630292ce85b9a1ae92d82e6cce49fd0ccb28f574bc668d212c50a54ab

diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190309-secure_socket.patch b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190309-secure_socket.patch
deleted file mode 100644
index 5d7132b90b7..00000000000
--- a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190309-secure_socket.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8e75c8678b874c6813e590634943166daa98124b Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 10 May 2019 11:01:21 +0200
-Subject: [PATCH] Don't make the socket world writable
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- 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 4cf0ac0..137d5b2 100644
---- a/radeon-profile-daemon/rpdthread.cpp
-+++ b/radeon-profile-daemon/rpdthread.cpp
-@@ -47,7 +47,7 @@ void rpdThread::createServer()
- 
-     QLocalServer::removeServer(serverName);
-     daemonServer.listen(serverName);
--    QFile::setPermissions("/tmp/" + serverName, QFile("/tmp/" + serverName).permissions() | QFile::WriteOther | QFile::ReadOther);
-+    QFile::setPermissions("/tmp/" + serverName, QFile("/tmp/" + serverName).permissions() | QFile::WriteGroup | QFile::ReadGroup);
- }
- 
- void rpdThread::closeConnection()
--- 
-2.21.0
-

diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd
deleted file mode 100644
index adbc0195e4b..00000000000
--- a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd
+++ /dev/null
@@ -1,27 +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="/tmp/radeon-profile-daemon-server"
-
-wait_for_socket() {
-	local i=0
-	while [ ${i} -lt 10 ]; do
-		[ -S "${radeon_socket}" ] && return 0
-		i=$((${i}+1))
-		sleep 1
-	done
-
-	return 1
-}
-
-start_post() {
-	wait_for_socket || return 1
-	chgrp video ${radeon_socket}
-}

diff --git a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190309-r2.ebuild b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190309-r2.ebuild
deleted file mode 100644
index 924760fc909..00000000000
--- a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190309-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 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="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-secure_socket.patch"
-)
-
-src_prepare() {
-	eapply -p2 "${PATCHES[@]}"
-	eapply_user
-
-	sed \
-		-e '/^bin\.path/s@/bin@/sbin@' \
-		-e "/^service\.path/s@=.*\$@= $(systemd_get_systemunitdir)@" \
-		-i radeon-profile-daemon.pro || die
-	sed \
-		-e '/^ExecStart/s@/bin/@/sbin/@' \
-		-i extra/${PN}.service || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "Users need to be in the \"video\" group if they want to change"
-	elog "video card settings via ${PN}"
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-10-16 10:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-10 10:01 [gentoo-commits] repo/gentoo:master commit in: x11-apps/radeon-profile-daemon/, x11-apps/radeon-profile-daemon/files/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2019-06-13 14:27 Lars Wendler
2019-10-16 10:54 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox