Use rc_ulimit to set file limit, see bug #268396, comment #19

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 110 insertions, 5 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 5e88cb4edaa3..e642b9f77245 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.255 2011/05/30 23:25:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.256 2011/06/07 21:12:28 blueness Exp $
+
+*tor-0.2.1.30-r2 (07 Jun 2011)
+
+  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.1.30-r2.ebuild,
+  +files/tor.confd:
+  Use rc_ulimit to set file limit, see bug #268396, comment #19
 
 *tor-0.2.2.27_beta (30 May 2011)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index d8619d6c4997..fe3987d57871 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -5,6 +5,7 @@ AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f
 AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
 AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
 AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
+AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
 AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
 AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
@@ -12,15 +13,16 @@ DIST tor-0.2.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da26a09e9cf
 DIST tor-0.2.2.27-beta.tar.gz 2633715 RMD160 5a475497b035e676b953e1c0b531bead45ecbccb SHA1 c49d0970ecd5d418128d068a4db87cc25349f366 SHA256 61e184846ec38f4301ccfc7445567e89168e1d3e6c2e4bfed2d4ba5517ff4d68
 DIST tor-0.2.3.1-alpha.tar.gz 2686119 RMD160 9f6f69db3541395bb34d3f4b3db30577a4cd5f6e SHA1 577d34efa66e5f6ba72d010b38fb48ff5b9796e3 SHA256 8906e80068952a4d3d9f65dfea2f4b0fd76b6b301fd1e62adac6c1b3bebe360e
 EBUILD tor-0.2.1.30-r1.ebuild 3033 RMD160 b4894334d7d4cba5e767028aab50dbf4cef05360 SHA1 0b856a69be0bbf788be2ea5bd1260d33692db4eb SHA256 b6ab977a6933bcfa71dee2c8484252dc3bb429139fd2c408ff203e1624e00154
+EBUILD tor-0.2.1.30-r2.ebuild 3008 RMD160 bce113cab2f227bf7437adb2b9723425845eca3c SHA1 75b4f871d4936576c7645042a226b814f7be2c86 SHA256 53f7482a36cc6a8009f813cd4754756c224daaa787ed666eff2dc7be640caacc
 EBUILD tor-0.2.1.30.ebuild 2646 RMD160 507a8939e024a5c9829e4ad5b598945fb8f26014 SHA1 5b2246b1f1b7db206558157801fe58b72cf6165a SHA256 e3e386af1fb917b2da75f45e110176b4fc2cfc776df98fac45719f9827f028ff
 EBUILD tor-0.2.2.27_beta.ebuild 2374 RMD160 2259e71476d3c66f79a06a1bbcbd90872bd7e4c6 SHA1 a101d3d1bf7597c6d827e3ba6f4858b793c3c440 SHA256 502ab6829671c5ba25e0826f9abd597c30dfedb47be4147de2ac5a163f1206d1
 EBUILD tor-0.2.3.1_alpha.ebuild 2374 RMD160 788f3894443e5f9ebb9a06cf908a0734a26bf479 SHA1 0f1954e58e6bdd563b5ec21e69f3c6b2f8c356dc SHA256 bf8c7bc84c4d15931d00132141b1b8a052bfe95c218d95c71ddb86cd6ecd5667
-MISC ChangeLog 36909 RMD160 d0c0a36eda0865839ae7833840f0e34d2d7f0e54 SHA1 df444f36e1920549c77dcb1d06781b9f2f52603a SHA256 ec263b1dab3cacc7ef03e3ca4025322fb334d03868a4c1a3be07520340810680
+MISC ChangeLog 37106 RMD160 a47b6144d342e4e40e3e809530f7e56b5d19aeac SHA1 434946a864237303bf08f37612ce25471b8502da SHA256 ddae5e71e80ef42ee43cc4189ad7acab201bd597e23e54ca133a47793f0316ff
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk3kJ4IACgkQl5yvQNBFVTVhYACeN7SFS7nbIAM585E1J4T+XiNz
-HvoAn2q1xyGKv93VJNffnh+G9typbmPY
-=bP73
+iEYEAREIAAYFAk3ulEYACgkQl5yvQNBFVTXsyACdEVEleu9FvZRppg/TJnLRSYHy
+U5sAn1cGcPWXNvJoAzP/Pxs7797XTJwe
+=7pDi
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
new file mode 100644
index 000000000000..4195bf3237b2
--- /dev/null
+++ b/net-misc/tor/files/tor.confd
@@ -0,0 +1,3 @@
+#
+# Set the file limit
+rc_ulimit="-n 30000"
diff --git a/net-misc/tor/tor-0.2.1.30-r2.ebuild b/net-misc/tor/tor-0.2.1.30-r2.ebuild
new file mode 100644
index 000000000000..d4df00eb4d75
--- /dev/null
+++ b/net-misc/tor/tor-0.2.1.30-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.30-r2.ebuild,v 1.1 2011/06/07 21:12:28 blueness Exp $
+
+EAPI=2
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+MY_PV=${PV/_/-}
+SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-1.2"
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${DEPEND}
+	net-proxy/tsocks[tordns]"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
+
+	einfo "Regenerating autotools files ..."
+	epatch "${FILESDIR}"/${PN}-0.2.1.30-respect-CFLAGS.patch
+	eautoreconf || die "eautoreconf failed"
+
+	# Normally tor uses a bundled libevent fragment to provide
+	# asynchronous DNS requests.  This is generally a bad idea, but at
+	# the moment the official libevent does not have the 0x20 hack, so
+	# anonymity is higher with the bundled variant.  Remove patch as
+	# soon as upstream has installed the autoconf option to use
+	# system's libevent.  This hasn't happened, so we
+	# have to live with the bundled libevent for this release, as the
+	# current version in tree won't suffice for tor to build
+	# See http://bugs.noreply.org/flyspray/index.php?do=details&id=920
+	# for upstream's report
+	# Let's revisit this when libevent-2* is unmasked
+	# use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch
+}
+
+src_configure() {
+	# Upstream isn't sure of all the user provided CFLAGS that
+	# will break tor, but does recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
+	econf $(use_enable debug)
+}
+
+src_install() {
+	# allow the tor user more open files to avoid errors, see bug 251171
+	newconfd "${FILESDIR}"/tor.confd tor
+
+	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}
+
+	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
+
+	insinto /etc/tor/
+	doins "${FILESDIR}"/torrc
+
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+}
+
+pkg_postinst() {
+	elog
+	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
+	elog "change it according to your needs.  Use the torrc.sample that is in"
+	elog "that directory as a guide.  Also, to have privoxy work with tor"
+	elog "just add the following line"
+	elog
+	elog "forward-socks4a / localhost:9050 ."
+	elog
+	elog "to /etc/privoxy/config.  Notice the . at the end!"
+	elog
+}