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

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

5 files changed, 26 insertions, 42 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/Manifest b/net-misc/tor/Manifest
index b26519de07c8..5654bc296851 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -8,7 +8,7 @@ AUX tor-0.2.3.2_alpha-fix-asneeded.patch 654 RMD160 faf9cc37942dfa7f52dbe849c181
 AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
 AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
 AUX tor.initd-r4 1553 RMD160 df0fc912c2e36797059de07d15a384d9ffe7d393 SHA1 82323d97b6d790b41027eec01e263d226c5b83e9 SHA256 4bf3c0906b0406564394eb51d47c1b5566904ed459e31ec1b1c1162c3b4aee92
-AUX tor.initd-r5 2299 RMD160 d05f3aefc10d9adb5c7d860425054c3e714e16c2 SHA1 d1a2cfd7b8e0098f901c59d4ee778254f393c10f SHA256 3fff84925016cd05349977b219199783674681e285ef2689ab200d37bbafc747
+AUX tor.initd-r6 1634 RMD160 cd4bff1c7f1a76ed703dddcccee2d8092a95ecaa SHA1 f3d9355ad254fd3162d5eb82c540877933be3560 SHA256 07c59520b146626478069f344ac70fe7cdad1ed65008d25278ba7b36fae0bbf8
 AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97
 AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
@@ -18,16 +18,16 @@ DIST tor-0.2.2.32.tar.gz 2701371 RMD160 649c21f7ec89e34774c79db6544b612f0895bb61
 DIST tor-0.2.3.2-alpha.tar.gz 2755750 RMD160 d34ac6b45360af873202a6884ce12ccf0420adee SHA1 020eb00aaaafa1e7102ae8fd95d3d6a719a61289 SHA256 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd
 EBUILD tor-0.2.1.30-r2.ebuild 3008 RMD160 bce113cab2f227bf7437adb2b9723425845eca3c SHA1 75b4f871d4936576c7645042a226b814f7be2c86 SHA256 53f7482a36cc6a8009f813cd4754756c224daaa787ed666eff2dc7be640caacc
 EBUILD tor-0.2.1.30.ebuild 2646 RMD160 507a8939e024a5c9829e4ad5b598945fb8f26014 SHA1 5b2246b1f1b7db206558157801fe58b72cf6165a SHA256 e3e386af1fb917b2da75f45e110176b4fc2cfc776df98fac45719f9827f028ff
-EBUILD tor-0.2.2.32-r1.ebuild 2384 RMD160 e2629335d480b2a8ff620d08fdfefaa9393c946f SHA1 bc72a91ccd08715a13040d06bc52a5c53d6b8100 SHA256 149ac20a49d3307449249653c76fbeb9e8e88d677687d2119c7f19fe50a16460
+EBUILD tor-0.2.2.32-r2.ebuild 2340 RMD160 dd05f3b3bfdebf020bc1154f07ec930cf3a01530 SHA1 b5bf759a9ab4771634ec9cbbffe6fc4ea0df0c66 SHA256 1a79e17781d5255cb86d228b21dbe6a656f73a7c748f59ef7d60713ce2e4bacc
 EBUILD tor-0.2.2.32.ebuild 2523 RMD160 d59c6589453dc077d404b9707f4b991ed63d8841 SHA1 d0179d5192beee04215652b4b2dd2793b6f4b352 SHA256 81f8184da9a9a369ab9310974d377003b918bc2dc99666e0ef1184087dc4bdd8
 EBUILD tor-0.2.3.2_alpha-r2.ebuild 2780 RMD160 60864e8594af4ca28877e0a9b208ac0564228545 SHA1 ec4772246ec7f51716480b853d85f3e95d01a2e4 SHA256 54057e7021db126865a71d8634d751d2b8c88de57f61dafd277320a01077d913
-EBUILD tor-0.2.3.2_alpha-r3.ebuild 2638 RMD160 e3e68d23b0c7b23b569bda973da698d94d683a0e SHA1 9c5f4ebaa56ce803b7da6400afc8d21343a045ca SHA256 d000aa9aa507452b02b8342ab286fd59c3314f9f6e1da5197979b74dc35c8dde
-MISC ChangeLog 39896 RMD160 aaf4df6b1f7659a4c2f25844c3de950373453fcb SHA1 4d3e60bc84be620c62cfc4bdf5f8982112dc71ee SHA256 647d8309063e334981bab2c8730afb9eaf5e8cfb7e48ab003f16b6983961f06e
+EBUILD tor-0.2.3.2_alpha-r4.ebuild 2594 RMD160 b701d707467d10707a3bd89760ef4dfd57778a9e SHA1 94b0c7db81678d537f87b154a68b3393f5653b29 SHA256 df8f4907429403f8212017fd9a7f11cb40fb0e5e48b0dd0366905615bb906f01
+MISC ChangeLog 40228 RMD160 58b117f2baf4ba7a75c54a618d4e336be034c831 SHA1 0e5113af0d30fb61d4ca0b7b655770b8eb38d054 SHA256 e397225380c47a5d1c076762785386633d29ddd3e9863c7fe432d24a64064a7d
 MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk5c7GEACgkQl5yvQNBFVTVtNQCfeqx6DDu/JmARjstPVKaPY1Z2
-5vQAnj3PtdFkWY7TITeUOZJbi6MdkdS1
-=+yE9
+iEYEAREIAAYFAk5fq1EACgkQl5yvQNBFVTVX8QCeKE6OIJeGCUvZIR1QSs5lcJcz
+1BsAn2o13YR6t1o/2wfFv4DTv1IOzMz3
+=d2te
 -----END PGP SIGNATURE-----
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