diff options
| -rw-r--r-- | app-misc/uptimed/files/uptimed.init | 13 | ||||
| -rw-r--r-- | app-misc/uptimed/files/uptimed.init-r1 | 18 | ||||
| -rw-r--r-- | app-misc/uptimed/uptimed-0.4.0-r1.ebuild (renamed from app-misc/uptimed/uptimed-0.4.0.ebuild) | 2 |
3 files changed, 19 insertions, 14 deletions
diff --git a/app-misc/uptimed/files/uptimed.init b/app-misc/uptimed/files/uptimed.init deleted file mode 100644 index 0f024d0b41fd..000000000000 --- a/app-misc/uptimed/files/uptimed.init +++ /dev/null @@ -1,13 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="uptimed - a daemon to record uptime records" -pidfile="/var/run/uptimed/uptimed.pid" -command="/usr/sbin/uptimed" -command_args="-p ${pidfile}" -start_stop_daemon_args="-u uptimed" - -start_pre() { - checkpath -q -d -o uptimed ${pidfile%/*} -} diff --git a/app-misc/uptimed/files/uptimed.init-r1 b/app-misc/uptimed/files/uptimed.init-r1 new file mode 100644 index 000000000000..96564d8ee541 --- /dev/null +++ b/app-misc/uptimed/files/uptimed.init-r1 @@ -0,0 +1,18 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="uptimed - a daemon to record uptime records" +pidfile="/run/uptimed.pid" +command="/usr/sbin/uptimed" +command_user="uptimed" + +# The uptimed daemon can create its own PID file, but it doesn't know +# how to drop privileges. On the other hand, if we run it as a +# restricted user under start-stop-daemon, the PID file it creates +# will therefore be owned by a non-root user, and that poses a +# security risk. To avoid the issue entirely, we run the daemon in the +# foreground, and then use command_background=true to let OpenRC +# handle the PID file. +command_args="-f" +command_background="true" diff --git a/app-misc/uptimed/uptimed-0.4.0.ebuild b/app-misc/uptimed/uptimed-0.4.0-r1.ebuild index f0ab25d8ac00..2fbdfafd16b3 100644 --- a/app-misc/uptimed/uptimed-0.4.0.ebuild +++ b/app-misc/uptimed/uptimed-0.4.0-r1.ebuild @@ -38,7 +38,7 @@ src_install() { prune_libtool_files --all keepdir /var/spool/uptimed fowners uptimed:uptimed /var/spool/uptimed - newinitd "${FILESDIR}"/${PN}.init uptimed + newinitd "${FILESDIR}"/${PN}.init-r1 uptimed systemd_dounit "${FILESDIR}/${PN}.service" } |