Switch sanity check for /var/run/tor to checkpath

(Portage version: 2.1.10.11/cvs/Linux x86_64)

4 files changed, 19 insertions, 35 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 6098f372a36a..25b860f1b9be 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.270 2011/08/30 13:57:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.271 2011/09/01 15:56:55 blueness Exp $
+
+*tor-0.2.3.2_alpha-r4 (01 Sep 2011)
+*tor-0.2.2.32-r2 (01 Sep 2011)
+
+  01 Sep 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.2.32-r1.ebuild,
+  +tor-0.2.2.32-r2.ebuild, -tor-0.2.3.2_alpha-r3.ebuild,
+  +tor-0.2.3.2_alpha-r4.ebuild, +files/tor.initd-r6, -files/tor.initd-r5:
+  Switch sanity check for /var/run/tor to checkpath
 
 *tor-0.2.3.2_alpha-r3 (30 Aug 2011)
 *tor-0.2.2.32-r1 (30 Aug 2011)
diff --git a/net-misc/tor/files/tor.initd-r5 b/net-misc/tor/files/tor.initd-r6
index 9f102ed4ba25..579a5cb931d5 100644
--- a/net-misc/tor/files/tor.initd-r5
+++ b/net-misc/tor/files/tor.initd-r6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r5,v 1.3 2011/08/30 13:57:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r6,v 1.3 2011/09/01 15:56:56 blueness Exp $
 
 opts="${opts} checkconfig checkvarrun reload"
 PIDDIR="/var/run/tor"
@@ -12,28 +12,6 @@ depend() {
         need net
 }
 
-checkvarrun()
-{
-	# Check if /var/run/tor exists, create it if it doesn't 
-	[ ! -d /var/run/tor ] && mkdir -p ${PIDDIR}
-	[ ! -d /var/run/tor ] && return 1
-
-	# The directory definitly exists now, but does it belong to tor:tor?
-	local dir=$(find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor)
-	[ -z "$dir" ] && chown tor:tor ${PIDDIR}
-	dir=$(find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor)
-	[ -z "$dir" ] && return 1
-
-	# And does it have the right perms?
-	dir=$(find ${PIDDIR} -maxdepth 0 -perm 0755)
-	[ -z "$dir" ] && chmod 0755 ${PIDDIR}
-	dir=$(find ${PIDDIR} -maxdepth 0 -perm 0755)
-	[ -z "$dir" ] && return 1
-
-	# If any of the above failed, we would not be here
-	return 0
-}
-
 checkconfig() {
         # first check that it exists
         if [ ! -f ${CONFFILE} ] ; then
@@ -56,7 +34,7 @@ checkconfig() {
 
 start() {
 	checkconfig || return 1
-	checkvarrun || return 1
+	checkpath -d -m 0755 -o tor:tor /var/run/tor
         ebegin "Starting Tor"
         HOME=/var/lib/tor
 	start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
diff --git a/net-misc/tor/tor-0.2.2.32-r1.ebuild b/net-misc/tor/tor-0.2.2.32-r2.ebuild
index b17b77ebae80..476aa3a014d4 100644
--- a/net-misc/tor/tor-0.2.2.32-r1.ebuild
+++ b/net-misc/tor/tor-0.2.2.32-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.32-r1.ebuild,v 1.1 2011/08/30 13:57:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.32-r2.ebuild,v 1.1 2011/09/01 15:56:55 blueness Exp $
 
 EAPI=4
 
@@ -52,17 +52,16 @@ src_configure() {
 
 src_install() {
 	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r5 tor
+	newinitd "${FILESDIR}"/tor.initd-r6 tor
 	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,run}/tor
+	keepdir /var/lib/tor
 
 	dodoc README ChangeLog ReleaseNotes \
 		doc/{HACKING,TODO} \
 		doc/spec/README
 
 	fperms 750 /var/lib/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/run/tor
+	fowners tor:tor /var/lib/tor
 
 	insinto /etc/tor/
 	newins "${FILESDIR}"/torrc-r1 torrc
diff --git a/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild b/net-misc/tor/tor-0.2.3.2_alpha-r4.ebuild
index ef8818c18acd..9aa74b315cff 100644
--- a/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild
+++ b/net-misc/tor/tor-0.2.3.2_alpha-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild,v 1.1 2011/08/30 13:57:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.2_alpha-r4.ebuild,v 1.1 2011/09/01 15:56:55 blueness Exp $
 
 EAPI=4
 
@@ -58,17 +58,16 @@ src_configure() {
 
 src_install() {
 	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r5 tor
+	newinitd "${FILESDIR}"/tor.initd-r6 tor
 	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,run}/tor
+	keepdir /var/lib/tor
 
 	dodoc README ChangeLog ReleaseNotes \
 		doc/{HACKING,TODO} \
 		doc/spec/README
 
 	fperms 750 /var/lib/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/run/tor
+	fowners tor:tor /var/lib/tor
 
 	insinto /etc/tor/
 	newins "${FILESDIR}"/torrc-r1 torrc