Version bump alpha

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 107 insertions, 1 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index cac20b5e1b0b..354be5b71a8e 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.318 2012/02/07 21:13:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.319 2012/02/14 16:24:08 blueness Exp $
+
+*tor-0.2.3.12_alpha (14 Feb 2012)
+
+  14 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.3.12_alpha.ebuild,
+  +files/tor-0.2.3.12_alpha-fix-tor-fw-helper-natpmp.patch:
+  Version bump alpha
 
   07 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
   -tor-0.2.3.10_alpha.ebuild:
diff --git a/net-misc/tor/files/tor-0.2.3.12_alpha-fix-tor-fw-helper-natpmp.patch b/net-misc/tor/files/tor-0.2.3.12_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.12_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.12_alpha.ebuild b/net-misc/tor/tor-0.2.3.12_alpha.ebuild
new file mode 100644
index 000000000000..aaa9de8247ac
--- /dev/null
+++ b/net-misc/tor/tor-0.2.3.12_alpha.ebuild
@@ -0,0 +1,82 @@
+# 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.12_alpha.ebuild,v 1.1 2012/02/14 16:24:08 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 selinux"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2.0.14
+	nat-pmp? ( net-libs/libnatpmp )
+	upnp? ( <net-libs/miniupnpc-1.6 )
+	selinux? ( sec-policy/selinux-tor )"
+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
+}