Added /etc/tor/torrc so tor works out of the box.

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

4 files changed, 102 insertions, 2 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index b4154366c0af..9b8253e9d591 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.234 2011/02/01 02:42:49 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.235 2011/02/10 00:00:45 blueness Exp $
+
+*tor-0.2.1.29-r1 (09 Feb 2011)
+
+  09 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.1.29-r1.ebuild, +files/torrc:
+  Added /etc/tor/torrc so tor works out of the box.
 
 *tor-0.2.2.22_alpha (01 Feb 2011)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 479a0516085d..2567e7438e5f 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,10 +1,12 @@
 AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
 AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
 AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
+AUX torrc 119 RMD160 3b7ec5a87893d371b2659bb49ac77cf3deff0f38 SHA1 c573f42578261ccc7b223261d5083cdff5afe095 SHA256 97a80a09bb3d615b93947f0d1a9c1883ef340860e89b879f2247d61b1c2476f0
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.1.29.tar.gz 2521399 RMD160 2587fc9162852434a395ec796ebdcee1972d9aa9 SHA1 cd534b99c91070504f4e70008ab8940a816b5bc6 SHA256 070d314effd6c08f8b5a8a1ebb4f5c3af644d48a9e38e9cba34fd3f2e981ec64
 DIST tor-0.2.2.22-alpha.tar.gz 2645384 RMD160 97ea57ac0eb060442ae83d145a4f477692d403c2 SHA1 196a6602fdcba9350b3d7099f68cee404f9e5485 SHA256 8ff8be912fcacdb58746852a54ca89d7b1fb09883510fb5303fba2ba5f357db0
+EBUILD tor-0.2.1.29-r1.ebuild 2675 RMD160 802334ca1fe35d5d887af4dee8c38f3302f7986c SHA1 3889a99946e6241621afa20200069e98bc261a86 SHA256 b4053ebc94e225b6a8176907d10554d0e2ee0657ba69a6d04ba167d1429f570e
 EBUILD tor-0.2.1.29.ebuild 2504 RMD160 981010bf04d501e3ee1047fbdcf03b3241c267db SHA1 d513a37e66d6a969677468d8bc09dfea9ff9ea77 SHA256 0289dd56d40d041f4f5cd792ece1910fdfff6046b34da1bb0c483c5907fcd18b
 EBUILD tor-0.2.2.22_alpha.ebuild 1981 RMD160 a15fbaa6a551e2ec635a20d3df706e5a7769cb6c SHA1 a396d36b22321decbb2481d50dfb03c25ebec151 SHA256 14566d6f44039b3b971718252326ba4b9f1b801bc5b0297c8f373a2895dcfb0e
-MISC ChangeLog 33669 RMD160 0ac97e0630a91cdaaa2ef77c3807ffe0c74644cd SHA1 528d64f2235cacf1081043522fe135558cad9fe6 SHA256 6a4bdfa6817fb5c8af1972d9a98f9b17df60ecafc2d58b157d58cf333924c050
+MISC ChangeLog 33852 RMD160 594f33b329c1497760afb47dc11055755710504b SHA1 0e4c22949ed64576157a664cb53491f98243ad9f SHA256 a1ab296249ce4350f643e941873432aefdca480a215b955c85d8be43fdb0577a
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
diff --git a/net-misc/tor/files/torrc b/net-misc/tor/files/torrc
new file mode 100644
index 000000000000..640fea191e95
--- /dev/null
+++ b/net-misc/tor/files/torrc
@@ -0,0 +1,5 @@
+User tor
+Group tor
+PIDFile /var/run/tor/tor.pid
+Log notice file /var/log/tor/tor.log
+DataDirectory   /var/lib/tor/data
diff --git a/net-misc/tor/tor-0.2.1.29-r1.ebuild b/net-misc/tor/tor-0.2.1.29-r1.ebuild
new file mode 100644
index 000000000000..a1b4920d1776
--- /dev/null
+++ b/net-misc/tor/tor-0.2.1.29-r1.ebuild
@@ -0,0 +1,87 @@
+# 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.29-r1.ebuild,v 1.1 2011/02/10 00:00:45 blueness Exp $
+
+EAPI=2
+
+inherit eutils
+
+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
+	# 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() {
+	econf $(use_enable debug)
+}
+
+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
+
+	insinto /etc/tor/
+	doins "${FILESDIR}"/torrc
+
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+
+	# 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
+	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
+}