update init script to prevent runtime failures as reported in bug 235208

Package-Manager: portage-2.1.4.4

4 files changed, 146 insertions, 2 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 6e2f2bf89001..c1c88e8bb9e9 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tor
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.123 2008/08/03 16:28:10 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.124 2008/09/03 06:57:13 opfer Exp $
+
+*tor-0.2.0.30-r1 (03 Sep 2008)
+
+  03 Sep 2008; Christian Faulhammer <opfer@gentoo.org> +files/tor.initd-r4,
+  +tor-0.2.0.30-r1.ebuild:
+  update init script to prevent runtime failures as reported in bug 235208
 
 *tor-0.2.0.30 (03 Aug 2008)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 5eeaaff560a1..5c7716da2e49 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tor-0.2.0.30-logrotate.patch 291 RMD160 256507536cb7629a21c855816428885b3587f14c SHA1 e1592a63df6677c8e2537ae5363eda39c4a3aeb1 SHA256 8c8c4d33d758127eedb234cda6836be625188c09e9eadfea290f6cf575516c22
 AUX tor.initd-r3 1568 RMD160 ed03ef5176615af9867af3041fdf24851cd8d14a SHA1 0722b36a30466bf9003b45da3aff7d0298cce4b6 SHA256 c65f92c3eddc1d056eebb948935abb236a235a38ededa1fbd2012f76da7f0241
+AUX tor.initd-r4 1541 RMD160 76fb7156a9c502d61957ebe3cb4e581e0acaa935 SHA1 9ac042fc9fed94ac275ea9f5a67b8d861e23ef1d SHA256 9340f8c0aad86312a0bfc71ec345a5af2af0b8358b594830776d93923ead398b
 AUX tor.logrotate.patch 301 RMD160 47a096ae4e7ddabdd5974df3c8cd1b221641edbb SHA1 b3c158d27b23600cc87f5e0a2ebba732e5fe3f69 SHA256 e64ff0f7442a180bcc8f9bd5fc258058ceae227847e32b69de39b589236f09dc
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.1.2.19.tar.gz 1264275 RMD160 4f1b5474a4bbad2e3c82ef0fce2dd838907e48d5 SHA1 5022dab0de2499e2c6638e1a2e9eee6c79fb707c SHA256 7e57198a0858f5ba8651d75225248c85b619e905f0ff4dbb45fffa2d03a1aa61
 DIST tor-0.2.0.30.tar.gz 2155463 RMD160 e51a38aa1531076bc9722e1584403f917d207dd0 SHA1 c6fbb3bf0141f4b34cc90845373b3dfa8b47ddc4 SHA256 bc9e8bf841ef64f8b06eef91eeab430f91147a3c4d7a6919826fa33b20453387
 EBUILD tor-0.1.2.19-r2.ebuild 1741 RMD160 3d1cd0337bfdabc14a560c04d7424cf31ee74fdb SHA1 fb1bae0f73107e66c74fec3c16961ee4a59c0666 SHA256 b67afb93e6a19ee33cc735b4b9d27e841f4690c245b0073c9ca6044881a2efe8
+EBUILD tor-0.2.0.30-r1.ebuild 1745 RMD160 b217dd41c3cd8313ff4106fec20709a4b2dd70a5 SHA1 4abca4b5ee75681bc8c6d71bbc89bd718b2700b9 SHA256 b441e4fadb47c10d1f8012e648c05924c528a8e8924c9f0fc766cd410cf33c6e
 EBUILD tor-0.2.0.30.ebuild 1742 RMD160 fa96399bb9fd19b3c3f3155318a4cf3853f0a6a4 SHA1 a8dbb096a1d11ed11499e1e209054fa79bdc7682 SHA256 d43747439b0ce3036d0829b50f5313ba2ee21428bded3da5b9c6d0be2a4411ba
-MISC ChangeLog 18549 RMD160 e953a0521b3a199c549afb16baf16bc444b523d2 SHA1 78e6bd83b6fdcd7a05c88cb931766480d30d0a42 SHA256 bf2f9349b896f103469329cc38875e1981ded25370f0ac1139ef434c1ad60d0e
+MISC ChangeLog 18760 RMD160 81b0e018c4e5289ea70554cadfde459628977f5d SHA1 27baf29459f2ad8690e9e5466a1b9b01de15280e SHA256 5e0221b5b80126a50aef7d0989d2e469deff58b3eec6c890fc77dee485345c9b
 MISC metadata.xml 423 RMD160 d053d3997ad9765665ab54fb201840b15c6915d3 SHA1 97fcb174f7c312b3e7a4f9b17f366a726e07345f SHA256 93b2c804410987cf63abb109afb6c6a7bf7bca3d9a207138be0d6d1c50a6c746
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAki+NX8ACgkQNQqtfCuFneO8CgCfTBrE2DpOh7/CSF2r5aZKdibR
+fPcAn0X4UP8EL5Zs+aM19eC9UvShTbdh
+=UpuU
+-----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r4
new file mode 100644
index 000000000000..58631d29965c
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r4
@@ -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-r4,v 1.1 2008/09/03 06:57:13 opfer 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 --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- --runasdaemon 1 --PidFile "${PIDFILE}" &> /dev/null
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping Tor"
+	start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
+        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/tor-0.2.0.30-r1.ebuild b/net-misc/tor/tor-0.2.0.30-r1.ebuild
new file mode 100644
index 000000000000..8476387bc942
--- /dev/null
+++ b/net-misc/tor/tor-0.2.0.30-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 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.30-r1.ebuild,v 1.1 2008/09/03 06:57:13 opfer Exp $
+
+inherit eutils
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://tor.eff.org"
+MY_PV=${PV/_/-}
+SRC_URI="http://tor.eff.org/dist/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug logrotate"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-1.2"
+RDEPEND="${DEPEND}
+	net-proxy/tsocks"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/${P}-logrotate.patch
+}
+
+src_compile() {
+	econf $(use_enable debug)
+	emake || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog AUTHORS ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/*.txt
+
+	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
+
+	if use logrotate; then
+		sed -e "s:/lib::" \
+			-e "s:/rc.d::" \
+			-e "s:\\*:\\*.:" \
+			-e "s:sharedscripts:create 0640 tor tor\n\tsharedscripts:" -i contrib/tor.logrotate || die
+		insinto /etc/logrotate.d
+		newins contrib/tor.logrotate tor
+	fi
+}
+
+pkg_postinst() {
+	elog "You must create /etc/tor/torrc, you can use the sample that is in that directory"
+	elog "To have privoxy and tor working together you must add:"
+	elog "forward-socks4a / localhost:9050 ."
+	elog "(notice the . at the end of the line)"
+	elog "to /etc/privoxy/config"
+}