version bump, bug 301169 by Tim O'Kelly <bugs_gentoo_org DOT Tim_OKelly AT neverbox DOT org>

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 99 insertions, 3 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index c720cb1fbb84..963a69cb688c 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tor
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.189 2009/12/27 17:27:23 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.190 2010/01/16 11:14:46 fauli Exp $
+
+*tor-0.2.1.21 (16 Jan 2010)
+
+  16 Jan 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.21.ebuild:
+  version bump, bug 301169 by Tim O'Kelly <bugs_gentoo_org DOT Tim_OKelly AT
+  neverbox DOT org>
 
   27 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
   -files/tor-0.2.0.30-logrotate.patch,
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index d3897dd401b6..3e58fe7c945c 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
 AUX tor-0.2.1.19-openssl.patch 3573 RMD160 be6a0d1186e433646b0286082b75d4dd4f4cf764 SHA1 879ecc0dbdf6e0deb72e865120b75eabddfc4933 SHA256 2ff2c5655fc2c454984aebc46b26aa35537db265bdeefd5d3f0f680f730729ce
 AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
@@ -5,7 +8,16 @@ AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe7
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.1.19.tar.gz 2409484 RMD160 3606cc574ade12adfa8f3c7a180958865be077e8 SHA1 8a8af1354ab5b3fea58e2bbffeddc05e3dfedb17 SHA256 cb4f88ad30d6ba4c015734f3058a6e35151cff586f7708691d52d289ee78d183
 DIST tor-0.2.1.20.tar.gz 2412059 RMD160 ae4a4ab22fa9eb5c011c652ddd13033407f48e5a SHA1 bfc6c7e9ccee23abc4e97ca4ba98aa3ad7784262 SHA256 0fa268ef7904dd4e4456525285d49ed3d3ac6fd6df4686de20d9077c05ae0f60
+DIST tor-0.2.1.21.tar.gz 2408983 RMD160 da240ad348acaf88d4b13a4f441523299feecd75 SHA1 51c3a093d14b992dd6330783b38b09f8684ac89e SHA256 7e05ccebb91cbf1fa226a6e77d21901d32dd3c0f59eb9eea5a87e559962a940d
 EBUILD tor-0.2.1.19-r2.ebuild 2438 RMD160 0671bf53f61281c85922ddaec76c3323fc14ad62 SHA1 8cb9398a93d227afa248c2675cfbbfb4339ed5de SHA256 e7abdfeb3fcfdf3617f4e53caa0d31fc898547097db963cbdaa381a2ee042550
 EBUILD tor-0.2.1.20-r1.ebuild 2461 RMD160 e21a870a04210a336e5943f5abf58afa31ca9343 SHA1 ff7311ba01776d076bac97df2d73913803660887 SHA256 8fd11448ffd1995d895b21a2d06420fb9693286909b201cf490ed309eb621464
-MISC ChangeLog 28244 RMD160 b25f9a45de3dae56c5471a6567465bb288056f3e SHA1 707113c3c0fe21b71ac169dc29f9aa943eb35bd0 SHA256 5521528b58bf2f0aae8af5cacf58b7e1ae79ac5c1754acd8136a8acf2e9bc616
+EBUILD tor-0.2.1.21.ebuild 2407 RMD160 2893f3510da24f0d2fd2c0c6bdb3a6eea3974691 SHA1 6a9676f2d4ce58cf0078a62c5343b925f6d4d132 SHA256 e27269ca47d256bf53a59e44442672e50526e4fea262dee7b33942dec2ebd685
+MISC ChangeLog 28448 RMD160 bc474c30b3be5c61bc13beb26e3f809800f1c5c8 SHA1 c0adc8b65367699c434639df8251b0e107349c67 SHA256 30802827ffea4d55d771cf0f9f9a36836d7e272b99c250765e74308fe3fde36f
 MISC metadata.xml 337 RMD160 b52d36bd15113f023f57553c8861d2f3b83c4e30 SHA1 c50a51c903062f5b6ab7eafc567f03efc7e09c6d SHA256 0fedec8d7503c31d7bd78b32c29c8984b042761af32b7e36864b42451a7f32e7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAktRn7IACgkQNQqtfCuFnePUjgCZAYIQRnU3g8PjyMysOk5kJHb6
+Gz0An30k9Ne8pfASayniF8y7EF/mSEca
+=ScVb
+-----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.1.21.ebuild b/net-misc/tor/tor-0.2.1.21.ebuild
new file mode 100644
index 000000000000..9522568df974
--- /dev/null
+++ b/net-misc/tor/tor-0.2.1.21.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2010 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.21.ebuild,v 1.1 2010/01/16 11:14:46 fauli 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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+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_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/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 "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"
+}