net-misc/tor: update openrc init scripts, bug #593794

Package-Manager: portage-2.2.28

diff --git a/net-misc/tor/files/tor.initd-r8 b/net-misc/tor/files/tor.initd-r8
new file mode 100644 (file)
index 0000000..e1f6c59
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r8
@@ -0,0 +1,42 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+command=/usr/bin/tor
+pidfile=/var/run/tor/tor.pid
+command_args="--hush --runasdaemon 1 --pidfile \"${pidfile}\""
+retry=${GRACEFUL_TIMEOUT:-60}
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+description="Anonymizing overlay network for TCP"
+description_checkconfig="Check for valid config file"
+description_reload="Reload the configuration"
+
+checkconfig() {
+       ${command} --verify-config --hush > /dev/null 2>&1
+       if [ $? -ne 0 ] ; then
+               eerror "Tor configuration (/etc/tor/torrc) is not valid."
+               eerror "Example is in /etc/tor/torrc.sample"
+               return 1
+       fi
+}
+
+start_pre() {
+       checkconfig || return 1
+       checkpath -d -m 0755 -o tor:tor /var/run/tor
+}
+
+stop() {
+        ebegin "Stopping Tor (waiting up to ${retry} seconds)"
+       start-stop-daemon -K -s INT -R ${retry} -P -p ${pidfile}
+        eend $?
+}
+
+reload() {
+       checkconfig || return 1
+       ebegin "Reloading Tor configuration"
+       start-stop-daemon -s HUP --pidfile ${pidfile}
+       eend $?
+}

diff --git a/net-misc/tor/tor-0.2.8.8.ebuild b/net-misc/tor/tor-0.2.8.8-r1.ebuild
similarity index 98%
rename from net-misc/tor/tor-0.2.8.8.ebuild
rename to net-misc/tor/tor-0.2.8.8-r1.ebuild
index aeefa9fc3aa7b9c6325ea121bb266dd38c509f8b..ee36db79dda2c67d8effc9b423d1390e98e233be 100644 (file)
--- a/net-misc/tor/tor-0.2.8.8.ebuild
+++ b/net-misc/tor/tor-0.2.8.8-r1.ebuild
@@ -69,7 +69,7 @@ src_install() {
        readme.gentoo_create_doc
 
        newconfd "${FILESDIR}"/tor.confd tor
-       newinitd "${FILESDIR}"/tor.initd-r7 tor
+       newinitd "${FILESDIR}"/tor.initd-r8 tor
        systemd_dounit "${FILESDIR}/${PN}.service"
        systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
 

diff --git a/net-misc/tor/tor-0.2.9.3_alpha.ebuild b/net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild
similarity index 98%
rename from net-misc/tor/tor-0.2.9.3_alpha.ebuild
rename to net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild
index 0f889a958bc9926c0af04c55fbfaff4f9edfca13..cd286ff231254728e431cef0defede97a7578a78 100644 (file)
--- a/net-misc/tor/tor-0.2.9.3_alpha.ebuild
+++ b/net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild
@@ -67,7 +67,7 @@ src_install() {
        readme.gentoo_create_doc
 
        newconfd "${FILESDIR}"/tor.confd tor
-       newinitd "${FILESDIR}"/tor.initd-r7 tor
+       newinitd "${FILESDIR}"/tor.initd-r8 tor
        systemd_dounit "${FILESDIR}/${PN}.service"
        systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"