Version bump.

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

3 files changed, 122 insertions, 15 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index da0bff7dd9d5..eb29786a4eea 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.478 2015/05/13 11:24:55 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.479 2015/05/21 11:49:52 blueness Exp $
+
+*tor-0.2.6.8 (21 May 2015)
+
+  21 May 2015; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.6.8.ebuild:
+  Version bump.
 
 *tor-0.2.7.1_alpha (13 May 2015)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 43c3c0261a9e..3d5e2c69017b 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -10,26 +10,28 @@ AUX tor.service 479 SHA256 647572301c444896c6958af4481f443e39f7232f0ad919e4a154a
 AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82 WHIRLPOOL 14a0e40219457b3ea26113fca561db338fb7324c20fee3b30287315974975001fab3cd3272932a1325e8dc9a227e0242bedf9fb424e2c5db755112f3fdeb815d
 DIST tor-0.2.5.12.tar.gz 3311423 SHA256 550fdafffeb4c1e3035bb8cc42e6e49d5af17ad79563bd118af22c1107f72b49 SHA512 67f78a9bb07987b311bd25548ea96cfc91d89dc8bfd29f284b77ab97b9dcb7d9a0f6e6cc0d1e4a2517653c42b3064aa7506227ebf339f56ad3d8f2ebad9258a0 WHIRLPOOL bd217c21318cf775bbf57c7df11b58c48f273d11db2057bb6071971aaa2744c3a910024011141f63cc3d99f7fc1b616e810d348709b5de6f3a84d8926e3f8b36
 DIST tor-0.2.6.7.tar.gz 3595669 SHA256 8c2be88a542ed1b22a8d3d595ec0acd0e28191de273dbcaefc64fdce92b89e6c SHA512 96e3cb5bcafddb1655663091ecf08f708213e47529d9701d67256e88d5fc2e70acffc6c062df6b8f0f4a4e3ef3d0dda76b5127ef9eeee06371ce0a66e53815b0 WHIRLPOOL 5da1f3e2ed1c12a1efba3eee91016beeaa5c40434831e684bb33670ae301e1661096c4a4231cd345c5dd833e8547f71f0c28d22c6d4b51a43bd0d6603160973c
+DIST tor-0.2.6.8.tar.gz 3580783 SHA256 b88b363896454250c3f561b0b48479f18295c93596d2e81baa10c5a3ae609a76 SHA512 905904dd6334d3677f50ff4b810e1545f123d521f357276e401e07b8400702fc2b61cc78d4df14640c32f91e957660741633908c47a3635a5071f52d0d660177 WHIRLPOOL 023358c2490b6e9a75c5e24d404ce652488ba95d840ff33c0ed3aec64f531513ec90130161be4cd93775c1ac643bfbbd269ee40fe342894c20f4c91e768f0cfc
 DIST tor-0.2.7.1-alpha.tar.gz 3603319 SHA256 9afc770a5a795e752f053ae7c2c1ee3a560145adc0aea377c83e602c2cbbed9b SHA512 7e9e27e761ed8ee60687ccdb0b524fa62d643632b8b64033b53ea57bba99e9b37f489a03f38265ce2b29778d7df33f2e596ba1f44f8eec3571505bac0e8a5a82 WHIRLPOOL 26886153252a07e501cce18224f8525dc18981f1ffaeb9dac9f3af034c357bb4fa93719e01605e5bf0ba3c7fdf688aaac594b6020d32c0caa2d136fbbe4ebc02
 EBUILD tor-0.2.5.12.ebuild 2833 SHA256 78597e7df0bf14eb231d46993e2166060cef6e34c30a1f92a6d2c8b5b7eab73c SHA512 676c1b5094970df2f1c7ebdc43a91dbc93b19badf6fef62675be350c3dcf34736fc008dde74747254e23bdd2a9a370b02f5592fcdc01f0c7754697aaae9622f1 WHIRLPOOL f4ad84a3df734ff8ad2543577334fcefd33e027977ff232aabaeccd72b91c96f63957d84ad130f1c12595e1e7956ee2f0e34be8498acaad46db2a75d39383a54
 EBUILD tor-0.2.6.7.ebuild 2870 SHA256 a2fd33c4076656e33318bcb36be45c6cd95d087653e81d3ea4e0c1e15a08fb09 SHA512 e34e3dbc545231beee99eb2e34a95578f68f38935dbf242858fb40961d1327077e15ae81facff7d85b9752b4b075837fad233ae32219de183cc879a1558cee1d WHIRLPOOL eac15271217825affedeb3b68569cf472ecaf9c9ef6084cec0b3dc12551ebc90d89b3ac835ded97b52d35482d1f473c67246a79bb2cdb5ccd920a55a775013f3
+EBUILD tor-0.2.6.8.ebuild 2881 SHA256 a2a903d2cb25bebd1f644cd5ab2d0a4d427372898995dfe1b62bbb4c09d77bab SHA512 edb2a776ac00bdf0c73b04c08104708a645802931f8639b42166c2e4ca70d59d5449cc814a6432b0d34635af21af9e2de981f98d130474f874c9bea63418addb WHIRLPOOL c9520b70b59a1f86dac49a7374a8833992e4d5e474eb268eef926636be8a2c06074aaec2cbe99b08f61f11239a0d1b59aadb793d42b4b399a7c311943cd8e7d5
 EBUILD tor-0.2.7.1_alpha.ebuild 2887 SHA256 8dbb469b5c5aedf54bd7486b717650e7606fe772801134cba19e7109c7e12093 SHA512 8c54e514caad8ec093afebda828fc13b6cdfd9e24e90583569c83a2592f1d9dc1c148dcfdb6a06ed07b710efbfa1d0e74839afb4dd358e643cfb3f69d8e4cd50 WHIRLPOOL e664983a4eb24d9c0622dd8046db0117faea0ad12f290ceacfe1485bc74d78d04ebcacaa6004b5c10e0bf8b29d89bcb3139ca0386e3b7c3bff0e8b5ec1e8f077
-MISC ChangeLog 71562 SHA256 99f0bc66237b19446e33f069e213a418230bd0e66955401393e2aef92c9b9d60 SHA512 e37a3b316a70fb7e6df40f27ba4013ad8c7922d76804983a693e42ffa500f7e4e34ddfd6ddc7217c5c379110ee8298b54ec1e460f904b0606629688803028581 WHIRLPOOL 13e1dc33bc26f1d0e986a98ea960d153862e3f6dd5968310e27c1253025fa838af73adfacc2b89a5f03cb67343c698b2df94bb8a598fea56ee86869ba49ee5a9
+MISC ChangeLog 71683 SHA256 1b28ee1d37d27be4e182d78c419cb1d2dd1a16a509972e21dadd48115b18ac3a SHA512 676e42097406fc302cc2ffbe9183e5689764d6b3ba9173ae404d1a9027bd3d13f35d6abd3a87f9c2c00569f0278fb5bc745d25e5e5648c4b202352160a2bea7b WHIRLPOOL 0b177705c962f3eba11e46263edd97fd98f7a2b2c5f22af61782d7cf964c1d89e1ea9f9b1b1fcf549a1cb5820f14d0453121a876bcd274b1f0f3daff65763ada
 MISC metadata.xml 889 SHA256 9467f665011b14aa6f8069e25d9093f6391df5f712114ce8e77ba21c3506b176 SHA512 9540206e53c4bc6a26cc0b7bda614c3d2a783935a7bb62e9ee378e8fe781feb4bba974ce986ef4112eb8cf85964749208d7cb6dc91baaae8f39120829a6ad6a6 WHIRLPOOL b0535e8563f7ed43bf35eead29fdcc89b1cd639e21a059019de6545c3e5117d92328b0def15f1515b0a6d90579bccb21de64d051d71d4c52d77c6869f7efa31e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVUzSiAAoJEJOE+m71LUu6E9oP/19FsGXLnxegykJug7jp5ruc
-rjCLpw/I333ZHt4NM529D+KW0wyCJyWqmALkAZMUlHr3JcIcqR5DQ+QoB1tqMKxx
-acQjISHvd1ybszheHv+/WGjwKzlxBPDrgEPM7v9T56lZGP3xmjsQwoi3nrlnH5Ur
-OUR81z7O7JNqKXy/nuFyBCuYzLOQ1ZrVm6XANSbEwDI7LZxS7h24tqWFKEQfH1Z/
-p6lO8HN04OexBYHFOwVomwCllpoAhC2rVe0BMTw38mZLVKDdBWWSdKTJRMOnJ56+
-v20k4dy1N8nr3EFHRd3DxHkA5l6LkXyOx0/Y2h65kepqF5KOpb6OkGDt5sDJmVUQ
-nZGZ7QG7fLJ8FMrvp6s3JYAmgRpVUObZLPpd4dBbic5Bx58Nlo2mQTNLUO96a/HH
-1dgiPz5132dMK1t+J21msNty7saUybuuZgEA4NDlTMuypXzJIKsmttRdDSUqP7Xf
-pNKkE3+2smJCJegkl0IcYexaJyfqArFAPbJNDDoDyxN9lLuS2Oc6IWSWMtjM0sx4
-TuXWYbOWrpoi+Ync67Jo0d//pCdtbNvYgsTUl2hq1FJs7FnOB9kVwImv8MA5sIua
-1ya5S88NEL1c9qlNG5N4p4D7gBBNAl6pRFNqZbECRKyptxkXxqYltEFj1I+H3FYX
-VCs7NUyTGsfsFjGZhu+P
-=Gaz4
+iQIcBAEBCAAGBQJVXcaOAAoJEJOE+m71LUu6S+gQAIdpkrexDrPF3lV0Lq6JEG2n
+LVyi//yyfu8z4sKcI+H8Ng5B1lplrpOFcAoffEGWcw/+7Io5JogEEbDlVNFCUn4F
+Vn6W5bh8Pw2eJbI2SJzEhNq5r3BGKR6SeEVTfmd6O90KqONpfKNnQdn2U/VjBUSJ
+/5uHIBdXikU5auzZqSbJ/FyqQy4txGhe6oLBwnra/tfwCa2lNti3huJJ1V41fkpU
+0bfObmWGruancdBAkvfwl6lvDqySnuNxVXHPG25lkBnVCqLYwOb/XbF0hrgKT1Kl
+06EVWMEfp3o4vaPO3oPoSNwvda+/du5D8OqyrKiwUjNEzywjkWuITXLafx5ekmLG
+fCy7UNOBTtfVM3DCpmB6crl0fMHG2o7l6A9/jkwQu2oTV0rZ+Ow0zfshU7jSyAKP
+Vrs6TjQ6GbFEbrVgcWgUc1pajAnzIQw+TXIDJRFWkano8iHCWbXKZbxrjFjVMCLQ
+vhvA6Iurb0BazKqeU4nMcKvkaDEaEw5TV7jkVti6pee4xx+x1Fej5KbhTSv4V4AE
+kh9fIK0c9CeIdACp2HVY8/qfMK+J83wfVszQJoQp1luF/ZycubvIOQc+K2gGKBxB
+RY1qagoaQUGeodyPFulQEiHBUHo1dPT1ZmO13BQDQJvlAxnOx+CiN8MPcUAd4hV1
+WBUgaqoCl4DBCkgn9hXR
+=FLAg
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.6.8.ebuild b/net-misc/tor/tor-0.2.6.8.ebuild
new file mode 100644
index 000000000000..122a0e6f2f32
--- /dev/null
+++ b/net-misc/tor/tor-0.2.6.8.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 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.8.ebuild,v 1.1 2015/05/21 11:49:52 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"
+IUSE="-bufferevents nat-pmp scrypt seccomp selinux stats systemd 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 )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( sys-libs/libseccomp )
+	upnp? ( net-libs/miniupnpc )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tor )"
+
+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
+	epatch_user
+}
+
+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 \
+		--enable-system-torrc \
+		--enable-asciidoc \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable stats instrument-downloads) \
+		$(use_enable bufferevents) \
+		$(use_enable nat-pmp) \
+		$(use_enable scrypt libscrypt) \
+		$(use_enable seccomp) \
+		$(use_enable systemd) \
+		$(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
+}