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

(Portage version: 2.1.6.13/cvs/Linux i686, RepoMan options: --force)

4 files changed, 20 insertions, 10 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/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