Add new 2.6 alpha branch

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

3 files changed, 108 insertions, 2 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 9fc058e11ff6..d7b4c9da0974 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.440 2014/10/31 10:31:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.441 2014/10/31 11:48:23 blueness Exp $
+
+*tor-0.2.6.1_alpha (31 Oct 2014)
+
+  31 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.6.1_alpha.ebuild, metadata.xml:
+  Add new 2.6 alpha branch
 
   31 Oct 2014; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.5.9_rc.ebuild:
   Remove older RC
diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
index 895005ebbe16..d05dc9c8ce05 100644
--- a/net-misc/tor/metadata.xml
+++ b/net-misc/tor/metadata.xml
@@ -8,8 +8,9 @@
 	<use>
 		<flag name='bufferevents'>Use libevent's buffered IO implementation (unstable, buggy)</flag>
 		<flag name='ecc'>Enable Elliptical Curve Cyptography</flag>
-		<flag name='stats'>Enable to keep track of how much of each kind of resource we download</flag>
+		<flag name='stats'>Enable tracking of how much of each kind of resource we download</flag>
 		<flag name='nat-pmp'>Enable NAT Port Mapping Protocol</flag>
+		<flag name='seccomp'>Enable seccomp for system call filtering</flag>
 		<flag name='tor-hardening'>Compile tor with hardening on vanilla compilers/linkers</flag>
 		<flag name='transparent-proxy'>Enable transparent proxying</flag>
 		<flag name='web'>Build a tor2web service instead of a tor client</flag>
diff --git a/net-misc/tor/tor-0.2.6.1_alpha.ebuild b/net-misc/tor/tor-0.2.6.1_alpha.ebuild
new file mode 100644
index 000000000000..2923c203d806
--- /dev/null
+++ b/net-misc/tor/tor-0.2.6.1_alpha.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.1_alpha.ebuild,v 1.1 2014/10/31 11:48:23 blueness Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="-bufferevents nat-pmp seccomp selinux stats tor-hardening transparent-proxy test upnp web"
+
+DEPEND="dev-libs/openssl
+	sys-libs/zlib
+	dev-libs/libevent
+	bufferevents? ( dev-libs/libevent[ssl] )
+	nat-pmp? ( net-libs/libnatpmp )
+	seccomp? ( sys-libs/libseccomp )
+	upnp? ( net-libs/miniupnpc )
+	selinux? ( sec-policy/selinux-tor )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.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
+
+	# We disable libscrypt until I get it in the tree
+	econf \
+		--disable-buf-freelists \
+		--disable-libscrypt \
+		--enable-asciidoc \
+		--enable-mempools \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable stats instrument-downloads) \
+		$(use_enable bufferevents) \
+		$(use_enable nat-pmp) \
+		$(use_enable seccomp) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable upnp) \
+		$(use_enable web tor2web-mode) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage)
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r7 tor
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+	emake DESTDIR="${D}" install
+
+	keepdir /var/lib/tor
+
+	dodoc README ChangeLog ReleaseNotes doc/HACKING
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+
+	if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
+		ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
+		ewarn "loop.  See:"
+		ewarn
+		ewarn "    https://trac.torproject.org/projects/tor/ticket/10259"
+		ewarn "    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358"
+		ewarn
+	fi
+}