install limits file so tor can open more files on the system than normally allowed, this fixes bug 251171 reported by candrews AT integralblue DOT com

Package-Manager: portage-2.1.4.5

4 files changed, 91 insertions, 5 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 030a67fd2d70..282aaac3ed8e 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,14 @@
 # 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.148 2008/12/10 07:02:37 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.149 2008/12/21 01:33:20 fauli Exp $
+
+*tor-0.2.0.32-r1 (21 Dec 2008)
+
+  21 Dec 2008; Christian Faulhammer <fauli@gentoo.org> +files/tor.conf,
+  +tor-0.2.0.32-r1.ebuild:
+  install limits file so tor can open more files on the system than normally
+  allowed, this fixes bug 251171 reported by candrews AT integralblue DOT
+  com
 
   10 Dec 2008; Christian Faulhammer <fauli@gentoo.org>
   -files/tor-0.2.0.31-sparc.patch, -tor-0.2.0.31-r1.ebuild:
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 26e0d2021d2d..9472be32ac31 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -2,16 +2,18 @@
 Hash: SHA1
 
 AUX tor-0.2.0.30-logrotate.patch 291 RMD160 256507536cb7629a21c855816428885b3587f14c SHA1 e1592a63df6677c8e2537ae5363eda39c4a3aeb1 SHA256 8c8c4d33d758127eedb234cda6836be625188c09e9eadfea290f6cf575516c22
+AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
 AUX tor.initd-r4 1549 RMD160 2f36cbc9e14c0021139212634b8e0ac585058e44 SHA1 4593e7a1b482bc7b8e787b57d0160f57415b9817 SHA256 0b3c6fdb62b0ce1f4812b0e3ce19dcc7176d4b723cb24b46e4c8474d5b119222
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.0.32.tar.gz 2159864 RMD160 e87bee7d7dadf17280bf0b11245b0bad70d68fc2 SHA1 0e48d0706f1717afc6d19228a8878c3bc379b25d SHA256 66669aa2cb74e7b0cf13db05472d88422f42c9c0129ce95ecd463aa123925d27
+EBUILD tor-0.2.0.32-r1.ebuild 1889 RMD160 f90b4beef3d83fd3d24e5f85e74be12b90ecd66d SHA1 9a81672fd3c3adef09c4995008338924e41989b6 SHA256 ab25eb5c44dfd37e4d767c07989461708b76eab2c6561ac6dcf9bc043120e248
 EBUILD tor-0.2.0.32.ebuild 1750 RMD160 02d0110bac363a35e4934fafa0641bd0df46a6d7 SHA1 21dcf8f7b193071ebe06b60139349433a04d6ba7 SHA256 660fcf355c5fb5ce9706d495d5869d6393d22c08d901643aeed2e90cf4e5414b
-MISC ChangeLog 21789 RMD160 4bd6a86218398bddb2a7795bbc1f3a080266fd2b SHA1 f43881b11fb1aefc38876c4e3d2ba889720cbeb6 SHA256 418dca4ef5b373509f4ac90b4a60836dd4258547ab0da4a810b130a0dc9c1cef
+MISC ChangeLog 22078 RMD160 933a0c88d5b8326afa361aac26c4ecd455592fa5 SHA1 1858ffcca40ea757b734153e18dbd079f05c92a9 SHA256 e2e7e6ab7645e114bc9a640b412b6a3bbf615d378681dc7969d98f672ba7cdb9
 MISC metadata.xml 423 RMD160 4418681fd0a4e22120c6a78f82c915cd6796bf40 SHA1 64cf24b719163a291b87b7909bf46fbef2b49fc2 SHA256 b8ec2e66707ed3e56d10f285c6036ca57135dfe4682f0862392253f2d88b554d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk/aaQACgkQNQqtfCuFneMiDACcCcyvqOlwakEr3ZsFhL/ctGHK
-JSIAn1j6J3K7XrEaDOOsF30v0Kow57Os
-=F4Ok
+iEYEARECAAYFAklNnPMACgkQNQqtfCuFneMTqwCaAzeTq2pvgilTxogZ9Q9Dmt/l
+kE4AnixPKbm8ERtVqZLmLSyjqOYsD1Bd
+=1DyB
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor.conf b/net-misc/tor/files/tor.conf
new file mode 100644
index 000000000000..4e4c63960391
--- /dev/null
+++ b/net-misc/tor/files/tor.conf
@@ -0,0 +1,3 @@
+tor           hard    nofile          30000
+tor           soft    nofile          30000
+
diff --git a/net-misc/tor/tor-0.2.0.32-r1.ebuild b/net-misc/tor/tor-0.2.0.32-r1.ebuild
new file mode 100644
index 000000000000..7cb85054f9b4
--- /dev/null
+++ b/net-misc/tor/tor-0.2.0.32-r1.ebuild
@@ -0,0 +1,73 @@
+# 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.32-r1.ebuild,v 1.1 2008/12/21 01:33:20 fauli 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}"/${PN}-0.2.0.30-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
+
+	# allow the tor user more open files to avoid errors, see bug 251171
+	insinto /etc/security/limits.d/
+	doins "${FILESDIR}"/tor.conf
+}
+
+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"
+}