revert all my changes for bug 268396 as they will break badly with Baselayout 1, see bug 272527

Package-Manager: portage-2.1.6.13/cvs/Linux i686
RepoMan-Options: --force

5 files changed, 27 insertions, 17 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index ce0085f6b82b..ca09b1520fdf 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tor
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.165 2009/06/03 13:02:23 fauli Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.166 2009/06/12 01:02:46 fauli Exp $
+
+  12 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  files/torrc.sample-0.1.2.6.patch, +tor-0.2.0.34.ebuild,
+  -tor-0.2.0.34-r2.ebuild, +files/tor.initd-r4, -files/tor.initd-r6:
+  revert all my changes for bug 268396 as they will break badly with
+  Baselayout 1, see bug 272527
 
 *tor-0.2.0.34-r2 (03 Jun 2009)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index b6d86a36e36b..96f7764007d2 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -4,16 +4,16 @@ Hash: SHA1
 AUX tor-0.2.0.30-logrotate.patch 291 RMD160 256507536cb7629a21c855816428885b3587f14c SHA1 e1592a63df6677c8e2537ae5363eda39c4a3aeb1 SHA256 8c8c4d33d758127eedb234cda6836be625188c09e9eadfea290f6cf575516c22
 AUX tor-0.2.0.33-no-internal-libevent.patch 5026 RMD160 c263d14eaf776ba1ba90bdc86308219dc802705c SHA1 7e9b1595380a518f849901dc7419a3cb4acf5bf3 SHA256 cc57416b5b5fb8562fcf69f5b096a168bf693cd08b4bd02105d84531192f7647
 AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
-AUX tor.initd-r6 1593 RMD160 0b370bb90a26e7990f61671bc0ec72f05edd0518 SHA1 cf010d20533afd3c4d6c3b0e8c0aad3c574267a9 SHA256 ae09780b525f086fdedfdb63c5937e277764da44874736d3adb6e8a88841a78e
-AUX torrc.sample-0.1.2.6.patch 1067 RMD160 77ac6827513cc1fc48a72bf352915887e22c4284 SHA1 6194000ee38cbaf095954bd0f9adebb001ccaf05 SHA256 5e657209f85b52d2c4c8434a1c65d652828be5f58f672f5829db6524a80e9998
+AUX tor.initd-r4 1549 RMD160 6bf8d330624ed21719f2c9a436e0859429178853 SHA1 4ad7409c1309df6d247f876b3d3d4cf418909539 SHA256 842b358791b427afef503b29c4fefd87b042f114b6302eef1671b18910483866
+AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.0.34.tar.gz 2170871 RMD160 a7a1a78b32072524472c6b2973117689aab4823b SHA1 6797b85cf4bd44a3a1c3ff1ccb9c46b55f9391f9 SHA256 1bb19bcc52d365b47dd0e7bc06e3208786447a1cf759d6595c516a0f0cde3cb2
-EBUILD tor-0.2.0.34-r2.ebuild 2620 RMD160 93135fdf7c16cedabb445d0133dbc814bff71243 SHA1 d101e481fc06eabe2f04c6ccea88ba2f18fcc68a SHA256 dc9f6393d2b7e91fe8594a3a66b4689327b2d7c76cfb93fd6e9c6dd6dfdea35a
-MISC ChangeLog 24669 RMD160 fb132320415c9ea9b901e88493cb03e450c3ed42 SHA1 58deeda92ff179ace77ce0766c73f088ad2612f2 SHA256 c951258130e16ae4b815028af4afd03e049c11192dd3beafe15f439c328944e5
+EBUILD tor-0.2.0.34.ebuild 2617 RMD160 894cd61c0eb3fd01727d8c129644e2543424df30 SHA1 1685c14637a877361a72b4e5644e544b937c8b14 SHA256 791d4ef0866c59edbd38a4a41268af584fef2311b582b48ebf9ff73df2839d58
+MISC ChangeLog 24952 RMD160 fa08614914afa2bef2b1fff575f0e2e322055b0d SHA1 7213f0f3a7be1bdfb9437f94c7e13472d53cbdd7 SHA256 b8685123167e410ac38b4bdfecaf300cb3f8bdd89772d32ceed83b1a4660c0e4
 MISC metadata.xml 482 RMD160 8dca0b35cd6e529c49031ba66a4c29fd3075a131 SHA1 909c1148521f411a17bcfd3ec97cc1ccadd4f580 SHA256 43850c54cf0ec6651bf3c4ef826b28d84e284e60891ca39c20284e2a3bbdcec9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkomdGUACgkQNQqtfCuFneMN8wCdF1GYKVlOwBSqIAVBxtLO+InK
-2YIAoJQ+Ij/cIzHQMoCAlqGoHH73oO4N
-=qdp4
+iEYEARECAAYFAkoxqTwACgkQNQqtfCuFneM34wCfX11FtA5baAbD9obI/dd2BhNo
+imAAnAm+oReX2MXZzu5COe0Dspp4VeLP
+=cNSI
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor.initd-r6 b/net-misc/tor/files/tor.initd-r4
index 42557392fb04..1eed94b5318b 100644
--- a/net-misc/tor/files/tor.initd-r6
+++ b/net-misc/tor/files/tor.initd-r4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r6,v 1.1 2009/06/03 13:02:24 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r4,v 1.4 2009/06/12 01:02:47 fauli Exp $
 
 opts="${opts} checkconfig reload"
 PIDFILE=/var/run/tor/tor.pid
@@ -20,13 +20,13 @@ checkconfig() {
 	fi
 
 	# now verify whether the configuration is valid
-	/usr/bin/tor --verify-config --User tor -f ${CONFFILE} > /dev/null 2>&1
+	/usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1
 	if [ $? -eq 0 ] ; then
 		einfo "Tor configuration (${CONFFILE}) is valid."
 		return 0
 	else
 		eerror "Tor configuration (${CONFFILE}) not valid."
-		/usr/bin/tor --verify-config --User tor -f ${CONFFILE}
+		/usr/bin/tor --verify-config -f ${CONFFILE}
 		return 1
 	fi
 }
@@ -35,13 +35,13 @@ start() {
 	checkconfig || return 1
         ebegin "Starting Tor"
         HOME=/var/lib/tor
-	start-stop-daemon --start --user tor --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
+	start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
         eend $?
 }
 
 stop() {
         ebegin "Stopping Tor"
-	start-stop-daemon --stop --user tor --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
+	start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
         eend $?
 }
 
diff --git a/net-misc/tor/files/torrc.sample-0.1.2.6.patch b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
index 99959f47a211..7317552c237f 100644
--- a/net-misc/tor/files/torrc.sample-0.1.2.6.patch
+++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
@@ -1,9 +1,13 @@
 --- src/config/torrc.sample.in.orig	2007-01-27 23:41:23.000000000 +0000
 +++ src/config/torrc.sample.in	2007-01-27 23:43:47.000000000 +0000
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,11 @@
  ## With the default Mac OS X installer, Tor will look in ~/.tor/torrc or
  ## /Library/Tor/torrc
  
++## Default username and group the server will run as
++User tor
++Group tor
++
 +PIDFile /var/run/tor/tor.pid
  
  ## Replace this with "SocksPort 0" if you plan to run Tor only as a
diff --git a/net-misc/tor/tor-0.2.0.34-r2.ebuild b/net-misc/tor/tor-0.2.0.34.ebuild
index 1b5d2a9b99d9..cfb2b7cec424 100644
--- a/net-misc/tor/tor-0.2.0.34-r2.ebuild
+++ b/net-misc/tor/tor-0.2.0.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.0.34-r2.ebuild,v 1.1 2009/06/03 13:02:23 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.0.34.ebuild,v 1.7 2009/06/12 01:02:46 fauli Exp $
 
 EAPI=1
 
@@ -49,7 +49,7 @@ src_compile() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r6 tor
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
 	emake DESTDIR="${D}" install || die
 	keepdir /var/{lib,log,run}/tor