Version bump alpha

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

4 files changed, 113 insertions, 5 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 2a19caf1fb1f..af231e61a3e4 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.315 2012/01/24 11:23:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.316 2012/01/24 13:06:55 blueness Exp $
+
+*tor-0.2.3.11_alpha (24 Jan 2012)
+
+  24 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.3.11_alpha.ebuild,
+  +files/tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch:
+  Version bump alpha
 
   24 Jan 2012; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.2.34.ebuild:
   Removed old vulnerable stable version
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index d44fb43c768b..10e4c6b4e387 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 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-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch 772 RMD160 74d92ed8018367b9a1b054c47eb8ddd07effc0ac SHA1 d271d6a3f8d0fa290c304cf0af4c9760cab4b232 SHA256 d96d6c3bcf3e8457ba6f1f5f9533b4f9f4ac14576530c5e87588dbb3d416ea2b
 AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
 AUX tor.initd-r6 1627 RMD160 2af137e60ce41bdca06bb254768808f468bbafc4 SHA1 20f2f3af059a98ba0c0880b3eb7c94c77f09d922 SHA256 49da1b5f267927023bc092adcf89d406ec294584039d6bca6b7aea0a9e7c4c4f
 AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738
@@ -10,15 +11,17 @@ AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d46a2 SHA1
 DIST tor-0.2.1.32.tar.gz 2592736 RMD160 1aebc22936e1ec13d18bf4ff19a51c6c1ffd4ec1 SHA1 7f1cbd590672eb16f39567ab47bd7f12d7e61422 SHA256 fafdcf330acd84fb5d09845d73d36f2180cd5ea2170c1fefd30c5d2aa98d288d
 DIST tor-0.2.2.35.tar.gz 2787536 RMD160 9986f0892d410de9f3d496a5db6de29288295e92 SHA1 98408e08c0c616c4c7669d018a66c55fc660cad3 SHA256 f141a41fffd31494a0f96ebbb6b999eab33ce62d5c31f81222a0acd034adbf3a
 DIST tor-0.2.3.10-alpha.tar.gz 2950344 RMD160 26fd5a9388fb90c923d1b885c85651d411e73371 SHA1 fcb9412c8e81540a643dc574f8266beaacf387a9 SHA256 d5634364b2ad9bbdacca45e30ae7cdc86153d714c128eedb36644c4d184cb032
+DIST tor-0.2.3.11-alpha.tar.gz 2979008 RMD160 669385496cef14775e7d1093dac65d7e02429fbd SHA1 a88819f8f4be434f453682a1e4a8910034bc5cbd SHA256 65a760d805ca672fb6a5bda71906759d7dcc1ac1d2f2336e4039c0460d334131
 EBUILD tor-0.2.1.32.ebuild 1824 RMD160 bf35dbca3099ec1657646f4d8eaa8053a2a31ca7 SHA1 b70f0a9cab8fa9318e555f2bd620d89e5ae725b2 SHA256 92096e0c90cf502e2c326b3e23b0108934886f0271924c15f080f83c6c4d00b8
 EBUILD tor-0.2.2.35.ebuild 2084 RMD160 320d0efbc050065e19f1e5f6538ae50bed45caec SHA1 45a7ee02a309f55edd46c346ec45ca8f90efdb3c SHA256 2048e4950cbf4c5e3a72bb0ba3838b48824ed8cb78073fd91e2ef210882625dc
 EBUILD tor-0.2.3.10_alpha.ebuild 2235 RMD160 c285bf6b77f26a07702b92cec2fa43f27bef8886 SHA1 3988a0a43376ae2225af616560cfba09f32ddc13 SHA256 4a1b65966109205874f569cd18886445bc9971552bc381d387b9e983f5ea22ca
-MISC ChangeLog 46529 RMD160 25b89f0b6ae03be7946b7fbdfe263b3242efc7d2 SHA1 913d213965bd78426beb7b311de8f1cfb5b92b4f SHA256 55cd66aa07d623904d3d581d675bbb98acc5947cb18583707594bdd80472eeb7
+EBUILD tor-0.2.3.11_alpha.ebuild 2295 RMD160 74fa080e498c0c3d605323152879cf502e311e86 SHA1 9b7ae75715d952fdff2473ebd0100e842e7948d1 SHA256 5105fd1fd35f71a3942446b2696ead1c6cbd9b010c84de866f4e76b65eff91a7
+MISC ChangeLog 46731 RMD160 05aa7fa37803304ef8660e83ef81385f3130ab4a SHA1 409b2051bf6abdf6ef63aff0d856562590d376f4 SHA256 7ec5fbb121bced5656250e135229feb370175e8d05995067215b4ec37f317f0a
 MISC metadata.xml 596 RMD160 2527172185bb74e5ea6167d56b2e3476c48eb078 SHA1 93be4ae496f77aa63bb77d720f51bf3510798daa SHA256 c7622b255363171fd1b351e14e592beb901d332f976a2e77c409e14ef5ed20bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk8elNQACgkQl5yvQNBFVTUbYwCgj6ZaR2Ho4cjnUksB1IQLSD1+
-zlAAn3/yW9NNI6MHw32dpXv+GLXRujhE
-=HkzM
+iEYEAREIAAYFAk8erPgACgkQl5yvQNBFVTWz6ACcDf+h4dwunmhB8BAzyvKVEV68
+HdUAn08kne8Cqvstuy7kRtJck7OlkdB2
+=N1/R
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch b/net-misc/tor/files/tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch
new file mode 100644
index 000000000000..ab4fccb68906
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch
@@ -0,0 +1,17 @@
+Fixes a regression in tor-fw-helper-natpmp.c where
+a filedescriptor is incorrectly type tor_socket_t.
+
+See https://trac.torproject.org/projects/tor/ticket/4955
+
+diff -Naur tor-0.2.3.11-alpha.orig/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c tor-0.2.3.11-alpha/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
+--- tor-0.2.3.11-alpha.orig/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c	2012-01-21 22:07:30.000000000 -0500
++++ tor-0.2.3.11-alpha/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c	2012-01-24 07:57:42.000000000 -0500
+@@ -87,7 +87,7 @@
+ 
+ /** Use select() to wait until we can read on fd. */
+ static int
+-wait_until_fd_readable(tor_socket_t fd, struct timeval *timeout)
++wait_until_fd_readable(unsigned int fd, struct timeval *timeout)
+ {
+   int r;
+   fd_set fds;
diff --git a/net-misc/tor/tor-0.2.3.11_alpha.ebuild b/net-misc/tor/tor-0.2.3.11_alpha.ebuild
new file mode 100644
index 000000000000..4d81f6850f76
--- /dev/null
+++ b/net-misc/tor/tor-0.2.3.11_alpha.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 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.11_alpha.ebuild,v 1.1 2012/01/24 13:06:55 blueness Exp $
+
+EAPI="4"
+
+inherit 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
+	epatch "${FILESDIR}"/${P}-fix-tor-fw-helper-natpmp.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 --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
+}