Version bump upstream stable 0.2.2

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

3 files changed, 91 insertions, 5 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 56520fadef23..7247d8e5f042 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,11 @@
 # 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.303 2011/12/16 20:58:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.304 2011/12/16 21:16:13 blueness Exp $
+
+*tor-0.2.2.35 (16 Dec 2011)
+
+  16 Dec 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.2.35.ebuild:
+  Version bump upstream stable 0.2.2
 
   16 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
   -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index c2844601d715..e45a31bfc73c 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -10,19 +10,21 @@ AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb
 AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d46a2 SHA1 01ebc6c28b4d1753266bf34ef72de92937865c4f SHA256 b60b3f454eb0d475c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14
 DIST tor-0.2.1.32.tar.gz 2592736 RMD160 1aebc22936e1ec13d18bf4ff19a51c6c1ffd4ec1 SHA1 7f1cbd590672eb16f39567ab47bd7f12d7e61422 SHA256 fafdcf330acd84fb5d09845d73d36f2180cd5ea2170c1fefd30c5d2aa98d288d
 DIST tor-0.2.2.34.tar.gz 2752710 RMD160 3cbf6f00ab88010ed2f916526c4acef9a8514c37 SHA1 81d777d07d01513da483bcd27dc92bc36112e771 SHA256 a027a535b35e5f9ca7091e4c83a06b4be48f0f95d6906bdd467ccc0659e7e798
+DIST tor-0.2.2.35.tar.gz 2787536 RMD160 9986f0892d410de9f3d496a5db6de29288295e92 SHA1 98408e08c0c616c4c7669d018a66c55fc660cad3 SHA256 f141a41fffd31494a0f96ebbb6b999eab33ce62d5c31f81222a0acd034adbf3a
 DIST tor-0.2.3.8-alpha.tar.gz 2909997 RMD160 eec1f3b549b1513d2c39791c79a18496d97a4809 SHA1 7ca5c1cfa5a1a3d1c923298a47fe2430495bedcc SHA256 b7c40f5f4fbd0a42b6863c29a69cc7b06d9e1cc9609f934a550f2019426d8dc4
 DIST tor-0.2.3.9-alpha.tar.gz 2954904 RMD160 7bd2e8c792df453f386563932cf1f147936264f8 SHA1 9973e74e314416f8f68c54d12f7baf050e049e3d SHA256 91cb2403860eb43e466a35a45d7d741e901ddb9c8be42317bc9013fa1927c04d
 EBUILD tor-0.2.1.32.ebuild 1873 RMD160 401810da9013a7ad64c77d628b52f1b21bb2716a SHA1 56c5daa1c98ac895fabb41eace6928812e9a8370 SHA256 b8b10029a8eeffcccd548ce32fd8e59ea6fe92cca25b56262e139290ce710f1c
 EBUILD tor-0.2.2.34-r1.ebuild 2264 RMD160 cfb388ba36e7f7cc78b793090d0d4b785387f4ea SHA1 7a5af2c851672196ce408426d2b159b0f4d390bf SHA256 eced7473565fb8c1b929411e72b17506fee114671f4b69ece02ff2e38c61ef84
 EBUILD tor-0.2.2.34.ebuild 2184 RMD160 9accd89f4236d5e28b9f1b8589818da92a13b561 SHA1 66c6cbd57179923934f1f5b155be082954b59e06 SHA256 4f1b4527429de8050884edb17ff1557f5e61e9eae2a31166736fb5d2b93d75ee
+EBUILD tor-0.2.2.35.ebuild 2188 RMD160 6938d66f727b451e4ee256e625bcacf4f3ba39aa SHA1 743e52d084fcf6e897b9c93f70dc227c7946fd74 SHA256 5b3937dd89c18bfc93068ad1b1f27740257e21ac9bb41913d57271fafaae0f6f
 EBUILD tor-0.2.3.8_alpha.ebuild 2234 RMD160 c0e9f4fe0ef5331af90732667863ee433bd0a968 SHA1 ed36014de8f4daa093a48506dfa576f5b133689f SHA256 99f0d59774241cd4645d05765ec900afbd36706a8b76c3858e55dfd098c65357
 EBUILD tor-0.2.3.9_alpha.ebuild 2234 RMD160 298ac5bcf686559a4802266d854865dd7b149bc0 SHA1 514eba18106d39a4c7585680a2f8fa4fe3867c65 SHA256 f33c5fa4208c9d492a1433fcc419348c85886e595e7467b9a535f1a17c60e977
-MISC ChangeLog 44900 RMD160 06f58b28b89c52bd2c60e1c28a8f82cc0e726719 SHA1 9bf865c7b10d0f2bbbb4cc8a5ce07303313a015c SHA256 b431be08ff1be1fb3ceef3bd858ccc2eb23bebc778aae94ac2fdeb62b302c230
+MISC ChangeLog 45044 RMD160 13460aaa97976212e54623fe96089bdd90d141af SHA1 ef6b3b77f52be2fd3ec7f9c3661c6bdce9b63d1d SHA256 335180791395822ccb617d0226486e9bf6aa2ed140a33cd00bbc1d52a313abcf
 MISC metadata.xml 596 RMD160 2527172185bb74e5ea6167d56b2e3476c48eb078 SHA1 93be4ae496f77aa63bb77d720f51bf3510798daa SHA256 c7622b255363171fd1b351e14e592beb901d332f976a2e77c409e14ef5ed20bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk7rsOoACgkQl5yvQNBFVTUJWwCggwP+OMMgWd0qIqX9LRB0bacn
-+nUAni1XAQzBno0dTBr8hq+qPX6h6b3f
-=NDXG
+iEYEAREIAAYFAk7rtSgACgkQl5yvQNBFVTXBBgCeL7Es1Gefwge9NXtIY/6wyViY
+b9EAoKPtte1ZnG/4KnpyCxmtV7k0y1kv
+=lhxF
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.2.35.ebuild b/net-misc/tor/tor-0.2.2.35.ebuild
new file mode 100644
index 000000000000..4d722f292164
--- /dev/null
+++ b/net-misc/tor/tor-0.2.2.35.ebuild
@@ -0,0 +1,79 @@
+# 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.2.35.ebuild,v 1.1 2011/12/16 21:16:13 blueness Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic versionator
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc tor-hardening +transparent-proxy threads"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2.0"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample.patch
+
+	einfo "Regenerating autotools files ..."
+	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
+	eautoreconf
+}
+
+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 --docdir=/usr/share/doc/${PF}				\
+		$(use_enable doc asciidoc)					\
+		$(use_enable tor-hardening gcc-hardening)	\
+		$(use_enable tor-hardening linker-hardening)\
+		$(use_enable transparent-proxy transparent)	\
+		$(use_enable threads)
+}
+
+src_install() {
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r6 tor
+	emake DESTDIR="${D}" install
+	keepdir /var/lib/tor
+
+	dodoc README ChangeLog ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/README
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+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
+}