fixed init issue close 189724

(Portage version: 2.1.3.7)

14 files changed, 75 insertions, 268 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 3ee57217034f..66554053875b 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/tor
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.91 2007/08/09 17:37:37 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.92 2007/08/28 23:31:14 humpback Exp $
+
+*tor-0.1.2.16-r1 (28 Aug 2007)
+
+  28 Aug 2007; Gustavo Felisberto <humpback@gentoo.org>
+  -files/torrc.sample-0.1.0.16.patch, -files/torrc.sample-0.1.1.23.patch,
+  -files/tor.confd, -files/tor.initd, -files/tor.initd-r1,
+  +files/tor.initd-r3, -tor-0.1.1.23.ebuild, -tor-0.1.1.26.ebuild,
+  -tor-0.1.2.14.ebuild, +tor-0.1.2.16-r1.ebuild:
+  Removed older versions and dangled files. Fixed bug with init with
+  baselayout-2 closes 189724. Thanks to Christian Faulhammer (opfer) for the
+  fix.
 
   09 Aug 2007; Robert Buchholz <rbu@gentoo.org> tor-0.1.2.16.ebuild:
   Stable on amd64 (bug #186644)
diff --git a/net-misc/tor/files/digest-tor-0.1.1.23 b/net-misc/tor/files/digest-tor-0.1.1.23
deleted file mode 100644
index 032c6df9d0a9..000000000000
--- a/net-misc/tor/files/digest-tor-0.1.1.23
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 33ce7155f545c4d30cb846d7017cc6c2 tor-0.1.1.23.tar.gz 847906
-RMD160 e958ed22f44e5f06736cadb5406dad04510a69f5 tor-0.1.1.23.tar.gz 847906
-SHA256 a2ac0b10089902c2de8649e07823dc46b8876cd3e0236505e5e7f1f49ee11025 tor-0.1.1.23.tar.gz 847906
diff --git a/net-misc/tor/files/digest-tor-0.1.1.26 b/net-misc/tor/files/digest-tor-0.1.1.26
deleted file mode 100644
index 916d04962bfe..000000000000
--- a/net-misc/tor/files/digest-tor-0.1.1.26
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0667df7a1f670bee5163b607aea172ba tor-0.1.1.26.tar.gz 893367
-RMD160 cc1ce91d96dc25a963d1f49f7965db106890949a tor-0.1.1.26.tar.gz 893367
-SHA256 3be8c89be5b927e73b77a82ca3d83f0f162fceea2d6a14ce1c0cf5333b36cd1c tor-0.1.1.26.tar.gz 893367
diff --git a/net-misc/tor/files/digest-tor-0.1.2.14 b/net-misc/tor/files/digest-tor-0.1.2.14
deleted file mode 100644
index eba8c8ef67cb..000000000000
--- a/net-misc/tor/files/digest-tor-0.1.2.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dc93a52f9c12ec7fe73b3905a28f09ec tor-0.1.2.14.tar.gz 1225040
-RMD160 f7ce98688519bd2d41bc0dd95fb90a120eae4207 tor-0.1.2.14.tar.gz 1225040
-SHA256 bc23e6f826f1f736e9d5e56ba79195099882aef2029a63dd667915bc1eb836a6 tor-0.1.2.14.tar.gz 1225040
diff --git a/net-misc/tor/files/digest-tor-0.1.2.16-r1 b/net-misc/tor/files/digest-tor-0.1.2.16-r1
new file mode 100644
index 000000000000..43a3da1ea29b
--- /dev/null
+++ b/net-misc/tor/files/digest-tor-0.1.2.16-r1
@@ -0,0 +1,3 @@
+MD5 f340777b3f6c3175de976856d2d2e4be tor-0.1.2.16.tar.gz 1254796
+RMD160 813a8726470361ee6629e71a10be67be9cfdd325 tor-0.1.2.16.tar.gz 1254796
+SHA256 1083bd4fef643880eb5eaa7deb0bb45a42c9700a1905c6cd2057de97849f067b tor-0.1.2.16.tar.gz 1254796
diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
deleted file mode 100644
index ae0ce0222502..000000000000
--- a/net-misc/tor/files/tor.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# If you wish to run tor in a chroot, run:
-# ebuild /var/db/pkg/net-misc/<tor-version>/<tor-version>.ebuild config
-# and un-comment the following line.
-# You can specify a different chroot directory but MAKE SURE it's empty.
-# CHROOT="/chroot/tor"
-
-# Location of pid file relative to $CHROOT
-# PIDFILE="/var/run/tor.pid"
diff --git a/net-misc/tor/files/tor.initd b/net-misc/tor/files/tor.initd
deleted file mode 100644
index 02736e8ac7bb..000000000000
--- a/net-misc/tor/files/tor.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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,v 1.4 2005/09/11 23:14:16 humpback Exp $
-
-depend() {
-        need net
-}
-
-checkconfig() {
-        # first check that it exists
-        if [ ! -f /etc/tor/torrc ] ; then
-                eerror "You need to setup /etc/tor/torrc first"
-                eerror "Example is in /etc/tor/torrc.sample"
-                return 1
-        fi
-}
-
-
-
-start() {
-	checkconfig || return 1
-        ebegin "Starting Tor"
-        HOME=/var/lib/tor
-        start-stop-daemon --start --quiet --chuid tor --exec /usr/bin/tor -- --runasdaemon 1
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Tor"
-        start-stop-daemon --stop --quiet --chuid tor --exec /usr/bin/tor
-        eend $?
-}
diff --git a/net-misc/tor/files/tor.initd-r1 b/net-misc/tor/files/tor.initd-r1
deleted file mode 100644
index 2bf4d0f265bf..000000000000
--- a/net-misc/tor/files/tor.initd-r1
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/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-r1,v 1.1 2006/01/04 03:38:09 humpback Exp $
-
-depend() {
-        need net
-}
-
-checkconfig() {
-        # first check that it exists
-        if [ ! -f ${CHROOT}/etc/tor/torrc ] ; then
-                eerror "You need to setup ${CHROOT}/etc/tor/torrc first"
-                eerror "Example is in /etc/tor/torrc.sample"
-                return 1
-        fi
-}
-
-start() {
-	checkconfig || return 1
-        ebegin "Starting ${CHROOT:+chrooted }Tor"
-        HOME=/var/lib/tor
-	if [ "x${CHROOT}" == "x" ] ; then
-	        start-stop-daemon --start --quiet --chuid tor --exec /usr/bin/tor -- --runasdaemon 1
-	else
-	        start-stop-daemon --start --quiet --chuid tor --chroot ${CHROOT} \
-			--exec /usr/bin/tor -- --runasdaemon 1
-	fi
-	
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping ${CHROOT:+chrooted }Tor"
-	checkconfig || return 2
-	if [ "x${CHROOT}" == "x" ] ; then
-        	start-stop-daemon --stop --quiet --chuid tor --exec /usr/bin/tor
-	else
-        	start-stop-daemon --stop --quiet --chuid tor --pidfile ${CHROOT}${PIDFILE}
-	fi
-        eend $?
-}
diff --git a/net-misc/tor/files/tor.initd-r3 b/net-misc/tor/files/tor.initd-r3
new file mode 100644
index 000000000000..0bdf9dac5a33
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r3
@@ -0,0 +1,57 @@
+#!/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-r3,v 1.1 2007/08/28 23:31:14 humpback Exp $
+
+opts="${opts} checkconfig reload"
+PIDFILE=/var/run/tor/tor.pid
+CONFFILE=/etc/tor/torrc
+
+depend() {
+        need net
+}
+
+checkconfig() {
+        # first check that it exists
+        if [ ! -f ${CONFFILE} ] ; then
+                eerror "You need to setup ${CONFFILE} first"
+                eerror "Example is in ${CONFFILE}.sample"
+                return 1
+	fi
+
+	# now verify whether the configuration is valid
+	/usr/bin/tor --verify-config -f ${CONFFILE} &> /dev/null
+	if [ $? -eq 0 ] ; then
+		einfo "Tor configuration (${CONFFILE}) is valid."
+		return 0
+	else
+		eerror "Tor configuration (${CONFFILE}) not valid."
+		/usr/bin/tor --verify-config -f ${CONFFILE}
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+        ebegin "Starting Tor"
+        HOME=/var/lib/tor
+	start-stop-daemon --start --quiet --chuid tor --exec /usr/bin/tor -- --runasdaemon 1 &> /dev/null
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping Tor"
+	start-stop-daemon --stop --quiet --chuid tor --exec /usr/bin/tor
+        eend $?
+}
+
+reload() {
+	if [ ! -f ${PIDFILE} ]; then
+		eerror "${SVCNAME} isn't running"
+		return 1
+	fi
+	checkconfig || return 1
+	ebegin "Reloading Tor configuration"
+	start-stop-daemon --stop --oknodo --signal HUP --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/net-misc/tor/files/torrc.sample-0.1.0.16.patch b/net-misc/tor/files/torrc.sample-0.1.0.16.patch
deleted file mode 100644
index 51fcf8c3e580..000000000000
--- a/net-misc/tor/files/torrc.sample-0.1.0.16.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/config/torrc.sample.in.orig	2006-01-04 03:25:18.000000000 +0000
-+++ src/config/torrc.sample.in	2006-01-04 03:26:45.000000000 +0000
-@@ -14,6 +14,12 @@
- # 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.pid
-+
- 
- ## Replace this with "SocksPort 0" if you plan to run Tor only as a
- ## server, and not make any local application connections yourself.
-@@ -46,6 +52,7 @@
- #Log notice syslog
- ## To send all messages to stderr:
- #Log debug stderr
-+Log notice file /var/log/tor/tor.log
- 
- ## Uncomment this to start the process in the background... or use
- ## --runasdaemon 1 on the command line.
-@@ -63,6 +70,7 @@
- ## The directory for keeping all the keys/etc. By default, we store
- ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
- #DataDirectory @LOCALSTATEDIR@/lib/tor
-+DataDirectory   /var/lib/tor/data
- 
- ## The port on which Tor will listen for local connections from Tor controller
- ## applications, as documented in control-spec.txt.  NB: this feature is
diff --git a/net-misc/tor/files/torrc.sample-0.1.1.23.patch b/net-misc/tor/files/torrc.sample-0.1.1.23.patch
deleted file mode 100644
index c048b45243a5..000000000000
--- a/net-misc/tor/files/torrc.sample-0.1.1.23.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/config/torrc.sample.in.orig	2006-01-04 03:25:18.000000000 +0000
-+++ src/config/torrc.sample.in	2006-01-04 03:26:45.000000000 +0000
-@@ -14,6 +14,12 @@
- # 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
- ## server, and not make any local application connections yourself.
-@@ -46,6 +52,7 @@
- #Log notice syslog
- ## To send all messages to stderr:
- #Log debug stderr
-+Log notice file /var/log/tor/tor.log
- 
- ## Uncomment this to start the process in the background... or use
- ## --runasdaemon 1 on the command line.
-@@ -63,6 +70,7 @@
- ## The directory for keeping all the keys/etc. By default, we store
- ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
- #DataDirectory @LOCALSTATEDIR@/lib/tor
-+DataDirectory   /var/lib/tor/data
- 
- ## The port on which Tor will listen for local connections from Tor controller
- ## applications, as documented in control-spec.txt.  NB: this feature is
diff --git a/net-misc/tor/tor-0.1.1.23.ebuild b/net-misc/tor/tor-0.1.1.23.ebuild
deleted file mode 100644
index 87a2bdf3e3e5..000000000000
--- a/net-misc/tor/tor-0.1.1.23.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.1.23.ebuild,v 1.9 2007/05/15 16:08:36 humpback Exp $
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://tor.eff.org"
-SRC_URI="http://tor.eff.org/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	dev-libs/libevent"
-RDEPEND="net-proxy/tsocks
-		${DEPEND}"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/torrc.sample-0.1.1.23.patch
-}
-
-src_install() {
-	newinitd ${FILESDIR}/tor.initd tor
-	make DESTDIR=${D} install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS INSTALL \
-		doc/{HACKING,TODO} \
-		doc/{control-spec.txt,dir-spec.txt,rend-spec.txt,socks-extensions.txt,tor-spec.txt}
-
-	dodir /var/lib/tor
-	dodir /var/log/tor
-	dodir /var/run/tor
-	fperms 750 /var/lib/tor /var/log/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
-}
-
-pkg_postinst() {
-	einfo "You must create /etc/tor/torrc, you can use the sample that is in that directory"
-	einfo "To have privoxy and tor working together you must add:"
-	einfo "forward-socks4a / localhost:9050 ."
-	ewarn "(notice the . at the end of the line)"
-	einfo "to /etc/privoxy/config"
-}
diff --git a/net-misc/tor/tor-0.1.1.26.ebuild b/net-misc/tor/tor-0.1.1.26.ebuild
deleted file mode 100644
index 9906586f8748..000000000000
--- a/net-misc/tor/tor-0.1.1.26.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.1.26.ebuild,v 1.3 2007/05/15 16:08:36 humpback Exp $
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://tor.eff.org"
-SRC_URI="http://tor.eff.org/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	dev-libs/libevent"
-RDEPEND="net-proxy/tsocks
-		${DEPEND}"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/torrc.sample-0.1.1.23.patch
-}
-
-src_install() {
-	newinitd ${FILESDIR}/tor.initd tor
-	make DESTDIR=${D} install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS INSTALL \
-		doc/{HACKING,TODO} \
-		doc/{control-spec.txt,dir-spec.txt,rend-spec.txt,socks-extensions.txt,tor-spec.txt}
-
-	dodir /var/lib/tor
-	dodir /var/log/tor
-	dodir /var/run/tor
-	fperms 750 /var/lib/tor /var/log/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
-}
-
-pkg_postinst() {
-	einfo "You must create /etc/tor/torrc, you can use the sample that is in that directory"
-	einfo "To have privoxy and tor working together you must add:"
-	einfo "forward-socks4a / localhost:9050 ."
-	ewarn "(notice the . at the end of the line)"
-	einfo "to /etc/privoxy/config"
-}
diff --git a/net-misc/tor/tor-0.1.2.14.ebuild b/net-misc/tor/tor-0.1.2.16-r1.ebuild
index f4d66077779a..38736e9e4a82 100644
--- a/net-misc/tor/tor-0.1.2.14.ebuild
+++ b/net-misc/tor/tor-0.1.2.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.2.14.ebuild,v 1.6 2007/06/02 19:58:38 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.2.16-r1.ebuild,v 1.1 2007/08/28 23:31:14 humpback Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug"
 
 DEPEND="dev-libs/openssl
@@ -38,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r2 tor
+	newinitd "${FILESDIR}"/tor.initd-r3 tor
 	emake DESTDIR="${D}" install || die
 	keepdir /var/{lib,log,run}/tor