Add new 2.6 alpha branch

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 125 insertions, 17 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/Manifest b/net-misc/tor/Manifest
index aa4e1c5be4a4..a998541cd174 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -12,25 +12,27 @@ AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf6
 DIST tor-0.2.4.23.tar.gz 2977006 SHA256 05a3793cfb66b694cb5b1c8d81226d0f7655031b0d5e6a8f5d9c4c2850331429 SHA512 8941a296c613ae30e98933ec05810cb655f3fe345ed9942f7c76799e00b893aa17a5e023b020aeca0b730834e6df4fb86927fc4e3d66ebd0cb26a36e6d94103b WHIRLPOOL 2b461eee1d31a338167f6a8267e63f2b6b1999668a82d2d9db3fc99f83cd6e959c922d2102e356815b776c0fc15780f46ed2bf0b7afcb9d0d95aee88979c0bd8
 DIST tor-0.2.4.25.tar.gz 2987749 SHA256 84693bf5875857bf1aef3a8ff8109da4cc10e64269208054bbcf94fb615da627 SHA512 0b89628be737087078fc4955ffb1824da4c5a8d614ccb39052ea65b2926b8a381bc3accb394a3b84fcea68170f23e163d147ace3683a946fb23b27960b32228b WHIRLPOOL 35668c31070a4f6dcd1a95d43986088e6f4e3fe59565e3a0abc19c0716b5bb3dd95937b7de249d7e80f9505f6ea77769582d37449e464d9acf9bffb57d20ca92
 DIST tor-0.2.5.10.tar.gz 3166480 SHA256 b3dd02a5dcd2ffe14d9a37956f92779d4427edf7905c0bba9b1e3901b9c5a83b SHA512 0e6522964ac84231f7753ebe80239ce8c906c62bd35e5bd65ae5f85f246d488e32fbf121c58e501cbf0b8271468f6c10bef756080a7120479240486d6af22a8f WHIRLPOOL e92d2805d134e3fd45e5bc0a1832b793555dc185a6bd6418d622adf447a430bd9932a4bbbbade1b0aa8c19ae05f0e8ea04b1100e3cdba22b2dc2260f2e5f9ec1
+DIST tor-0.2.6.1-alpha.tar.gz 3347886 SHA256 83154b8e5514978722add6c888d050420342405d4567e5945e89ae40b78b8761 SHA512 28cf0ab2a2b3272624855163f2a17e5b5cbc909fa42aabf2626c0e0fb8f92dfeefdfc16aaf9282bcefb9984db482878469c908e9cf38090fa9006c28df304b51 WHIRLPOOL fa86a5b6200724f49c0a663db22402fbbcf5fef2a2af1187a042fc934780c31067785563fb41f57ea1a428902c8aad65b2a3787b9c1039f415b4436398f26347
 EBUILD tor-0.2.4.23.ebuild 2561 SHA256 7fa0c96147cb0d7f0fd97f189b581809453529ac8b34cd912b811dc696012642 SHA512 0c71d01888ebcf04fd8f95ecef4318d6819be280150d02ccc73062174dc4acbed83ed2ef5eef99bdb133d3524b4745d13e5a9d1c0fea96ffe3bef2746e5519f6 WHIRLPOOL 2c93badc8dbaf8df752655396f04af32ca68a17ef5df421368344b1c026f2771b611a200d4406c8b03936a7eecefe118478a098743db77bec5dc5960a8fe4062
 EBUILD tor-0.2.4.25.ebuild 2602 SHA256 2074b49934f027135b0168408179440927fea84f92888ce98946c40e94655e98 SHA512 3a1fe539b738347db30a7af3dcadd20c9df60b2855da6b08c87397800dc1f269c5719b09f0ab12f09ca76d5e4a959d32debe009bf6991fa9ec53e67fcbaf1508 WHIRLPOOL 37453179c739ae305a2db3dca4d442957a3e2376d45deb5cda2aa017ad74c349757d7ef389260b60f41bef74485899ea97160eeba158fa4284b631e6db8b0016
 EBUILD tor-0.2.5.10.ebuild 2804 SHA256 e64004b7975ff49b4f832951cdbf7a65a5aabb4162d582c664fe3d478c3cf148 SHA512 83d9640bcb0bdaaa11fcd1f973ed8e29b7aac1b73b5358b11c50ce5201724527cd77cfed14f886f9c02bc6646194784c104c46686139527d8774734062bd54d4 WHIRLPOOL e3294c6a8581af66a919e887d1075fb4cb3c575eb4402375b6371d2db6562dc48d8872c518b2d2bf66c4e7c2c86bac8356b3e2c684beaebb5864081718cc35cf
-MISC ChangeLog 65808 SHA256 81a06a47444c0313d08b5eccbe3878958abb3f5d701af71205bc74c7f65562d7 SHA512 acc33647ecf13a4e2d4fdd8ff16a1153ed4b0c0f518080b78e8ee448573ef83e371b43dee696935d1477c9b56b8f091b3c6db311b99deae69a4ea80a57ab6847 WHIRLPOOL 20159de5a4d4f31514ee82ec3f68af85c42be4700b7448040359709a2737ec912a9ad6cef0bbfaebcf8a48e0e509fc7e5e600ab95a56cee7bf69dbd09e260b76
-MISC metadata.xml 805 SHA256 b65e1d9314d9a0406c93a7bdf168cee5555a8b5af3c889768c555ecf9c518564 SHA512 b68a4b5c9ef9ec0cbb61f795a574c3111d0f7be6232868e698828db3a68273f109c2ddd559b4c9dec7a9200f5ea7b99cc5faff1ed23fe9247c6c120e856f7875 WHIRLPOOL b42a9dfb6a840451ec1fec757636055ba71a99dc1f1f1a348e7735058125688a62b2433307706fa8f75310a1ba887a75e3a3535b69c413b0a9621c633f52a8c0
+EBUILD tor-0.2.6.1_alpha.ebuild 2874 SHA256 0a3fd2b8e0657e52f23b4092efa022075707325bd91f7c79fb44ac857cf184a2 SHA512 e19e21c7346620b0acf214f7e3ccfd8d4d11fc0127c05c3dc00e54c8e6d7afc308c6f1c22a2a3f4172db630196b88990090566f4163d6a766c686d527b399915 WHIRLPOOL 5e6c489a974a678497fc68f70949ea1b9de58118921f31fd7bd700ab08439155db90bd1ea5aca3431233ba6ef356c5ed79aaa6b2686f082ed4518bb73a31ce4c
+MISC ChangeLog 65968 SHA256 82148ea316c8212442792e333404bf530c5484864ba495289e4cabb467beb519 SHA512 8cc9aaa5785763a71cd1b367bebafdc63f78d99a58ac9073a4d9b5792fab9b40813bfda150be3354177ca89b6a0e7ddbaf8d625622f800d7e14a89ed9b172a20 WHIRLPOOL f9fa15bc7d539b6786a36ef115d612bc33b7b7599be56e0cace1da2c0ae92ccbd89f1ec86b7434f46837cd125705cd90247c0eadc261913526b3a5291233da54
+MISC metadata.xml 871 SHA256 715696a494621f6875696c3f439198a72bc714437a2110578d192a412394d0f7 SHA512 8488e39843e59ff60c18f2ee132b9dceb793183c66a5de1a3d669c51c85626818ded05842d583db9b50956b8f2badf7c392d709ca3ed887d9b516a4ffa358c76 WHIRLPOOL 6176d3a647b59ec8276ba6086e1c8aff5b2e1fe12c3b07217e81ee7da6e56d0c4f6c988b230a75169ac1a2d7749511ccb8eef291746e780cea13995f356dd1c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUU2V4AAoJEJOE+m71LUu6yOMP/3ib2fXjl8lUcFb9wy3ABfht
-jMdHBdsHArV4/HfNRBNu52GImO6KTRdBvpIxL8pNio2OX36P+hOKL35y7AYlKzdY
-qP7FwBZY0xDR4c7JFIFKskPviFwgbDeLQ8Oj4NT7G3f7iFXpiLOYoJX95tfELsTX
-SNHkYdIvTUeQB5E3nt71+qX1Yp8e4e5197G6mgIxZMEFD6Fe/SgGDMONVlv9keIh
-BfUEp8I0DPE0EtCItrYr/dwooMOSgY1Q+unuICCLdZMhgOVVxHHBlc7z725R5fmg
-vT9X3ijvXrQDdXV+EB36fXAuoOPJNraPZJASmdBMpq2tIEv2TNb+MC7JmuOWLHwV
-Wu02U850266YQJ+nfQWwoBDyRSLobJ1QlmoZ2eDJ2+w06W5GO5OnB3WnfYnqai8Z
-ZYnm9M1bwFc+4TSti87MyCZ9UUPeXKH4ouaONrHy6N5G+lSrnoHA0BKPl80g4ZZD
-ZJgCF+si6bWfQisk/Z75bCoJvicPoYuU++pPFHvA6LZeNt+VAnmsVRzLDOy96btz
-0GLRMtMjEg3j0m9ZNtk0azeeCwX9J6Qc4fW/9n41AoP6rkbGTBYYGzTz4ze7/DnW
-XnaeKQU7qXUJqO+ct0Ws9jNPmeP22VVv8MxJC9hOd/xczjf45Rg8/23GJNPgyK6Y
-ixEC1Onesxyogi3P6tOi
-=408W
+iQIcBAEBCAAGBQJUU3d0AAoJEJOE+m71LUu6GlYP+QHTr9GzZEI7C6CsahHvhmI+
+5aDk4Sxu8XjTgLugT39EJBKWOOWPVXUzDEcqO06PawyFOZ5QV+FzXLEw/WBrSojY
+Nzq3VbcIDqlLC+CbR1q5FAAbKa8q+l4NJ4FTRPAv+obel0PVZENL+0eJW+gLWkcJ
+wqNWK5wIOrFZ+Ua0i90WXo1sjc6kQpjNRftKRxQ1BAYUPu/68byW57Bq41WMxLMa
+L6iuqUXpLKmR8QkNfr09ruXQSDvFb43GuFh8FQ36YX9Xe8FqTJ+ofIuHiBCoscuz
+BzobKO+kEo89HTIt36LUfNiJdbrBsMpG4IeaRjAnAFRFVE2FTymcECu6nZlW3kix
+TU1Om4/nmVgXwAP92rY2X5gn4kFwcsqlOVJTi/u7cJQezukXzVgV+O6B751MmB2N
+KwOio7K+bMV6Hqvz1mi5t3dJvLRmV5/etTlBgE2v9qfDkK792Q3MQc1/vc31VSqa
+b2LwxnH4dQoO7CJX4ob+TvM20qDbolyu7IeFzygCHPUEd+95WsmzMKJwXwJ5CIYC
+usMIIJHkJqMNhsAo0rfOK+hlb+zquoJEE1IZHLoaX534WkKXBgpljzoDYab8flDw
+CbcMc+n0WzMt/PZZx+nbK+muEb789KxK8GEKsxFzzrr+iMpT2FENWq2OaFYwPyRC
+6Hflu30Cqd65Hrx3P/NW
+=rOjH
 -----END PGP SIGNATURE-----
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
+}