Security bump, bug #388769

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

5 files changed, 274 insertions, 5 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 6c622e7f83f0..7d621b5c31ab 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,14 @@
 # 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.284 2011/10/08 21:52:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.285 2011/10/28 18:20:03 blueness Exp $
+
+*tor-0.2.3.6_alpha (28 Oct 2011)
+*tor-0.2.2.34 (28 Oct 2011)
+*tor-0.2.1.31 (28 Oct 2011)
+
+  28 Oct 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.1.31.ebuild,
+  +tor-0.2.2.34.ebuild, +tor-0.2.3.6_alpha.ebuild:
+  Security bump, bug #388769
 
   08 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
   -tor-0.2.3.4_alpha.ebuild:
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 1e735d22a41a..3d29276b0fc1 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -13,18 +13,24 @@ AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d46a2 SHA1 01ebc6c28b4d1753266bf34ef72de92937865c4f SHA256 b60b3f454eb0d475c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14
 DIST tor-0.2.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da26a09e9cf SHA1 f25b89d8c677c83ee0559036d5b13d49b272b3b0 SHA256 f352a1a8ffa469ae251324f89386074074bcffef1a7c6a72caa7e4c2d12ce109
+DIST tor-0.2.1.31.tar.gz 2558057 RMD160 31d95b71675c845ae657a0bcc522599015a2c088 SHA1 21c2ef68c0276c3d37253a5965044e254dd5c6f2 SHA256 eccda3412c5d8d533895828ebb9019fa26ea571e4ef93d955ee609a9a3917dfe
 DIST tor-0.2.2.33.tar.gz 2719888 RMD160 7b47c08a4ecfa0864f28d5beb3ab26b5292f3170 SHA1 2bbeb73cf866cc2701c0d28d3438e8626c1e8cca SHA256 5af42b1cc07704fcbde8bb44380e5a02ebedc75470a132c70022ecb5f8476bcf
+DIST tor-0.2.2.34.tar.gz 2752710 RMD160 3cbf6f00ab88010ed2f916526c4acef9a8514c37 SHA1 81d777d07d01513da483bcd27dc92bc36112e771 SHA256 a027a535b35e5f9ca7091e4c83a06b4be48f0f95d6906bdd467ccc0659e7e798
 DIST tor-0.2.3.5-alpha.tar.gz 2835138 RMD160 96e5d0fb571d0b62907574957a58828e3cb26057 SHA1 739a2a8892cc105a41e29b4f663b18074030c7ba SHA256 9b5467f4c1229b81e3c4d7e1ffdd17c01b1f5c3b9c5ce030108690d3ef5488d0
+DIST tor-0.2.3.6-alpha.tar.gz 2901597 RMD160 0121f76d6c9d0b55ec39d7d182f4dc4a34af3517 SHA1 b761fe79a90c58c445980d0d31a68e025d742b69 SHA256 f4562ddfdd673f25811cf3b0c29a7c5d7e81b99e352d9585bc80e1ab010c9c67
 EBUILD tor-0.2.1.30-r2.ebuild 2894 RMD160 a6aaaaf83e6608f02bd4496ee9600346863f675f SHA1 dc1dc79ed78585c7c64baddc425996a8052662d6 SHA256 82109558a7fa00240306b0f354c5337d8643183b4b66735dcda48cc34566fe54
 EBUILD tor-0.2.1.30.ebuild 2646 RMD160 507a8939e024a5c9829e4ad5b598945fb8f26014 SHA1 5b2246b1f1b7db206558157801fe58b72cf6165a SHA256 e3e386af1fb917b2da75f45e110176b4fc2cfc776df98fac45719f9827f028ff
+EBUILD tor-0.2.1.31.ebuild 2856 RMD160 d0f4d326b7e761a546e3da04f8513ab95b715514 SHA1 6af834b213fa70f26ba9d14ad59a18b9af444d60 SHA256 0e7586cca58c9baa4af672aa1a8e00a7747e292514bfe27f92dafd4092c029a5
 EBUILD tor-0.2.2.33.ebuild 2223 RMD160 516b19345851a48fff3032ce733e394cb906b41b SHA1 3fa3c2e2d48a1467c1c48fb6f8371264b1e56356 SHA256 a2f847f7bf8aff436058b0e6868473fb06ca0bbda83c95e22ca616ed8cf27591
+EBUILD tor-0.2.2.34.ebuild 2188 RMD160 16abd1ba71fb00e9fe699d3e9d6002621c693de9 SHA1 3929107af6b4330ebd31cb945bd090447e866af5 SHA256 48bf184d6004a75a39e2038f27b14601a505c2616a871286f9c45557a7bacad5
 EBUILD tor-0.2.3.5_alpha.ebuild 2399 RMD160 27e7efac0e7d1fd18ec9910b1a1dbd673a3a26bb SHA1 88b2730d0ac7b07ce7a495525cce277c11ed4b0d SHA256 9f1e9278f3624b32511c180c422d7287543be507f33e785c7f571eb86564f63c
-MISC ChangeLog 42144 RMD160 21a654b7bcb7272cf904f83683e9d07856a2940c SHA1 fa79cf42826472ae985d33364ce38149b849854c SHA256 699cd80e1314c1b1a5f88722f15290b31f8a147ccd73b3cba6e39d89c47f2b0a
+EBUILD tor-0.2.3.6_alpha.ebuild 2364 RMD160 6e4828233cc4afd81bf94bedcc8f5ff88232f73e SHA1 c3458c392c70004bb924180c16fbdedff2558a10 SHA256 7472fc8d0487799a841e62a0ced705352955ec8fd7bacda263f9758873718035
+MISC ChangeLog 42392 RMD160 020e19f970718c546932a525fee8fc642989217d SHA1 d1346d829b745702964789aeb7be08b0063d1409 SHA256 8f1986f9bb97a05574004c905c48df8816a68cfc7467528f8b267bf0a81e56e2
 MISC metadata.xml 690 RMD160 1ae6238c81555b6b4bf2f11479e18a5acdb7b418 SHA1 920cafba2dacb7a034e32f782467c96532465434 SHA256 117ed70261e343abf65a93351f6ba7a5bca941c183bf79168953a3efc5afb0b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk6QxjwACgkQl5yvQNBFVTUpHgCfd2HMIrG9+DR7Ht9+z/xEslW7
-9NIAnAjjhogOGRndlzgzv3FnRCHLlMxs
-=ym+p
+iEYEAREIAAYFAk6q8l8ACgkQl5yvQNBFVTVg9QCgjkDgfgd4zLX4JuOjE13IzOCF
+wGAAnjoO/+8YLx94lmg+Yq6swzlChaPo
+=pPWN
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.1.31.ebuild b/net-misc/tor/tor-0.2.1.31.ebuild
new file mode 100644
index 000000000000..1e8f2ce8bdcd
--- /dev/null
+++ b/net-misc/tor/tor-0.2.1.31.ebuild
@@ -0,0 +1,92 @@
+# 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.31.ebuild,v 1.1 2011/10/28 18:20:03 blueness Exp $
+
+EAPI=4
+
+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"
+RDEPEND="${DEPEND}"
+
+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
+
+	# 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
+	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
+}
diff --git a/net-misc/tor/tor-0.2.2.34.ebuild b/net-misc/tor/tor-0.2.2.34.ebuild
new file mode 100644
index 000000000000..5c0b595a5e77
--- /dev/null
+++ b/net-misc/tor/tor-0.2.2.34.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.34.ebuild,v 1.1 2011/10/28 18:20:03 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
+}
diff --git a/net-misc/tor/tor-0.2.3.6_alpha.ebuild b/net-misc/tor/tor-0.2.3.6_alpha.ebuild
new file mode 100644
index 000000000000..2167562b524d
--- /dev/null
+++ b/net-misc/tor/tor-0.2.3.6_alpha.ebuild
@@ -0,0 +1,84 @@
+# 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.3.6_alpha.ebuild,v 1.1 2011/10/28 18:20:03 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="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2.0.14
+	nat-pmp? ( net-libs/libnatpmp )
+	upnp? ( <net-libs/miniupnpc-1.6 )"
+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 bufferevents) \
+		$(use_enable doc asciidoc) \
+		$(use_enable nat-pmp) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable threads) \
+		$(use_enable upnp)
+}
+
+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
+}