Version bump.

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

3 files changed, 129 insertions, 2 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 27e1b7360909..1f802049bb4d 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.482 2015/06/17 02:28:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.483 2015/07/13 08:53:44 blueness Exp $
+
+*tor-0.2.6.10 (13 Jul 2015)
+
+  13 Jul 2015; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.6.10.ebuild:
+  Version bump.
 
   17 Jun 2015; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Remove unneeded useflag descriptions from metadata.xml
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 0345673403cb..4807e9daa8e2 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX README.gentoo 316 SHA256 bd1a5d6a0973d89d3c89e52d1046c202f52d59aa45ca60d2ee33551ac77de1b9 SHA512 6ca305c710562c0f9a3f0cba07760adf300ea166c8baa47e8872719190d779fb63d4dd6c9193fb60ddb51015138790aaa93935668423e0f861f05496d22ce660 WHIRLPOOL da7f4eaaccab8172dba2f8d264dc6d010b98fdb70ed60eff71175a24b423df3101c8a93d162b309b0a51441ca9b01dcf7257bbecc8fa83f1903a0577d28a47d6
 AUX tor-0.2.3.14_alpha-torrc.sample.patch 1363 SHA256 f7c1e9470dd84034a959b5bea4e4c0f7f57980da0fb3381c902acaff7a5e1013 SHA512 523b004c2ca0020620a5970208f7e0782663ad5ab6f333130be9071e858fd04454d53424b2ffc59bdb5c72600132357144ac9cd9639b55b2a6b979efa2d32bae WHIRLPOOL 384ef4094126b8ee420e58457a669626cf942bbb62a7e89c9dc11c5a002ea34e395a9f1eb5f6d1b87cb6012958ec37eac27741d240df8e4901da4c71eb55815d
 AUX tor.conf 62 SHA256 809f5f09758c1eec5fd3cef94536ec83358dc380f3ece0bc4890b1c2e49f9293 SHA512 e81517218bc036b42559f2dee5b09ff8873d7944bdf8375b6721a842990a29a21da1a524fb6b8e912da57f3cc6d3330663d78be3458833fc77692ce30386fbbc WHIRLPOOL 88aea378baeeafb7a6b95de011fff58da40d9894245e3b001320cfeab176453ef5736e02805b09da2d28193beb2c14fe4b4e6bbd4bf90ed1a23e402eab1227ce
@@ -5,11 +8,30 @@ AUX tor.confd 44 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b7
 AUX tor.initd-r7 2421 SHA256 666b0cacc53515fb8409ada05d7e92b1de4d9a4814ba145f4982ffd164958aae SHA512 291e72eb07f013e1c3c271772232a00d27d8b2252ddac072a8df0a1878d2ff1d660c8600663e072f19b205eae56344fa58989f6dafaa34bc4967212a252659d6 WHIRLPOOL ec1c02cd6ba6dc830b378bcc352f4d0056416ccc70b2bc793f3141f19abf51c300cfaeb569307ca2e457a369420c15fa95cc4594680a50502fce5149ed456917
 AUX tor.service 479 SHA256 647572301c444896c6958af4481f443e39f7232f0ad919e4a154a27733aae709 SHA512 5eab6d99bc9210546b750596e6b660904a098868a07d4df41e14e39586a12965cbed94e7bda2bf315472fd40b4df4f68f1a8393c12e085524b80e02e26de9c14 WHIRLPOOL bf23275b4a847e5a806d7052b17ac9bbbc6c16e23a9add351bc6f7ee3afde844914ed0505fcadd3b15bcf2519fc7a352cb09d2e46cebec19b88ba7ece3c3835d
 AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82 WHIRLPOOL 14a0e40219457b3ea26113fca561db338fb7324c20fee3b30287315974975001fab3cd3272932a1325e8dc9a227e0242bedf9fb424e2c5db755112f3fdeb815d
+DIST tor-0.2.6.10.tar.gz 3587211 SHA256 0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d SHA512 4d1fd794d48ada725af829e1c1f3f3b7d8d04f2d1dd22e4f175ddc49401834f2001f04d78b011cdc7e953fe44972f2859d87078489a08ae126b44f93f6b9a438 WHIRLPOOL ba2685454ecb0dd94c568e05fb14526cd06beea6e9c6f7b27328f85c555392b6f42f35dc7860ae25299a830c7f6643963a9b9719a2557c28a7216019c96caf21
 DIST tor-0.2.6.7.tar.gz 3595669 SHA256 8c2be88a542ed1b22a8d3d595ec0acd0e28191de273dbcaefc64fdce92b89e6c SHA512 96e3cb5bcafddb1655663091ecf08f708213e47529d9701d67256e88d5fc2e70acffc6c062df6b8f0f4a4e3ef3d0dda76b5127ef9eeee06371ce0a66e53815b0 WHIRLPOOL 5da1f3e2ed1c12a1efba3eee91016beeaa5c40434831e684bb33670ae301e1661096c4a4231cd345c5dd833e8547f71f0c28d22c6d4b51a43bd0d6603160973c
 DIST tor-0.2.6.9.tar.gz 3581981 SHA256 4a6c29ad89a98d7832c599d9480d6d8e55355fb3b8f4b506c5df557f15942f9c SHA512 13ba139ccc264aeaed0aff82ed4e115848ec33fa7c760edb01ce3fd4122acb8da3cb3f473834a00c3a007c08f1a4e1fb089458de23f58b94f28d937f8f3e986c WHIRLPOOL 78b5e82db1c8b56db296b9220d792a5c7ba264b537bd2aa587150799a94dd53e4f4dcfe875326e1ccef58335de5b64f634080d516300eeca12c75c9c61823d95
 DIST tor-0.2.7.1-alpha.tar.gz 3603319 SHA256 9afc770a5a795e752f053ae7c2c1ee3a560145adc0aea377c83e602c2cbbed9b SHA512 7e9e27e761ed8ee60687ccdb0b524fa62d643632b8b64033b53ea57bba99e9b37f489a03f38265ce2b29778d7df33f2e596ba1f44f8eec3571505bac0e8a5a82 WHIRLPOOL 26886153252a07e501cce18224f8525dc18981f1ffaeb9dac9f3af034c357bb4fa93719e01605e5bf0ba3c7fdf688aaac594b6020d32c0caa2d136fbbe4ebc02
+EBUILD tor-0.2.6.10.ebuild 2884 SHA256 8346b38a5f9e64e86fbef8bf2ec07ce564f0b52188541dc2217378e780b68819 SHA512 b4d7fcdf5bfa073a8d1cdd820a8259180d9b68ee0c22ff9cf46d147110126f3c79519f9c0b5aee00d9a02314b78afba9420a802ffaa12277a8831694ab034b02 WHIRLPOOL 5689f31adf6a934413a222c09569903549000143dfdf31e2623bffc980ef4e307949f16d1432349dfc56616a6fdf441f0a4702cfab359039f0648072db311340
 EBUILD tor-0.2.6.7.ebuild 2870 SHA256 a2fd33c4076656e33318bcb36be45c6cd95d087653e81d3ea4e0c1e15a08fb09 SHA512 e34e3dbc545231beee99eb2e34a95578f68f38935dbf242858fb40961d1327077e15ae81facff7d85b9752b4b075837fad233ae32219de183cc879a1558cee1d WHIRLPOOL eac15271217825affedeb3b68569cf472ecaf9c9ef6084cec0b3dc12551ebc90d89b3ac835ded97b52d35482d1f473c67246a79bb2cdb5ccd920a55a775013f3
 EBUILD tor-0.2.6.9.ebuild 2883 SHA256 263bcb7ac0b18bab3c5833174a402e987c0108debdbdb7959f1835d7fae9c029 SHA512 8c895c2850179a4a7b88b03d4c3f0ea475c9501ec104457f15543611b633029596d3b8e4e98072ed178755440d69b41d3278031a43d2af0d58b2755c4fc8f860 WHIRLPOOL ffe4d70b881be3e59c806f815593c9c7515b21ac5a18aa940d27886c39bdb3211b8e39f5671b021ad7d12ca5db7439d8da02fb5a44be7fe6363ae789c83ece31
 EBUILD tor-0.2.7.1_alpha.ebuild 2889 SHA256 51c1adb86d25eb1049ec269789a00c306c7d22bd3eb3e4232455ba70744aa64c SHA512 69bf5c8938bba5c764d4c05a3cd4cfa0e9036a9c82390b141c9031d43f754bb948a79214a1edc8fb442949a7385cd60dbcd6679f149ef9262115078eba1c2eff WHIRLPOOL f36221d206b02805d39df6712f0da5711c2a1213788cd72bf18d09863301cf9913631c13c8b0995b804b5043cf2de335baa835154b34bcaec4667ffd2ccca6ca
-MISC ChangeLog 72111 SHA256 5fd90a5c703fd551cbe4102caef74ed3212466a3bb052d837650a2a89d6b3756 SHA512 e3f3d6df012d60755cc748daafd581ac0f7ce3d9d96fd9ffe9d8d7c7310a54db97593ef44ef2217067edcf71b39b930dbb8b7aa0778b2da781e24f62ee775daf WHIRLPOOL 2166b0855f5f32fb894026d6ec951ac5fd4c0e23d12e35b87bcce5cadbff6086ce30c172ecfdde8d5e62cf1078c27c9f1ea3dba61012a60658025a120fc1c905
+MISC ChangeLog 72235 SHA256 c3281b48332aefba5225a1a3f2d8858aee398988e352fae2dd4929caac5a69ee SHA512 e849dd0917748599142fe7d7ead1f2fec1ffca98a46cc63e6046dee618203322449e501ae8152829f2e790df2a262450a56694b8f2fcd9be56df826f557be6b2 WHIRLPOOL 1cad368ba677f42c52a2cffe746960d05e61ef847565bff07a72403db0a88edbd9d1fbab6c37728671d6f17d72ce878fa9df5ee12fc55da6604613b9a4b3315e
 MISC metadata.xml 827 SHA256 8fbae2a1980e1e0f7b0ac85ec35d88aada9ada7a1b3fa57f5b76cf44f93248d6 SHA512 9ececf69c16438cbab21184030be08d925ac7362862b0e8b47c81ea52a5a6d071646c6033cc025cf3c9f67a51d55827469b9b3f60f67460f572e3f420b528395 WHIRLPOOL 2a8a76e88096f44ced9d5d300bf6f3049fb0ba1644b5197df73d26baef5ba0f9ef1c1e3f895ea30f6ed6c1e03f0dbbf806907ceae9dbb8f998b13340a23de2d6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVo30kAAoJEJOE+m71LUu6BigQAIJFlwx3ZDxbEzB1Qa01akYG
+wyYSFtJf6wO3FXuaCcHZ7IClO8cJS2x7rL1Nu2QVssVqg1YH6NHmWmtUE+YUiftF
+Ijs1ZBTvEKaxmtngrtp3xeGidIqbgmD+Mm7ZnruOxO4ZbUMfp+2Fc7n6j4HZVitG
+tbGRc2CdPlFxKlGBoTBOEQLiGyXYaXTo4uD6xwqS8D9eIzMwo+1FCvDTcatsTgXl
+ArTrdUDTkSVs2KI433o+JM2muqE5YlcyOmjB2JpmQUv8YIg7gDH1ONFuIoL1i/3/
+HSny9H/OIeNeNTz3NYwg+rmk5+RMoDH5UIv3SpNpz/ANE+cWECrRD5KU5B7WPOsF
+JYYjitNgELdL1S5tbaoYlunVMTxQFrbSjEJAliKoDTr7cHLSm0iK2tiPpfpr3bUP
+f535shXgbXLB5Yi/7yV/r+sDtFxCI31b/6XN/L/CFW+L3qteX3uVXHOBdXKR/2kC
+64/4J2bq9ETq9V1a+ZNVXQFNrlDKC9Q9iybPKyzWD18OubEdspaO3XK2SZVO0Grb
+YdGlSWRhexm++DDShFbxLGrQll2F9bV/AzpBoHk+wxByWdpeDJNJQ7rzqam6aAYi
+Z5BOHs+MQDfDSwaPJqkyukv6LvBHn35otTyLE0f5WWdW85lqQMxkEzx5aHZ/Wn37
+l/Pb1gZH9edKsC7f4j3k
+=BsYg
+-----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.6.10.ebuild b/net-misc/tor/tor-0.2.6.10.ebuild
new file mode 100644
index 000000000000..1ae097e0580a
--- /dev/null
+++ b/net-misc/tor/tor-0.2.6.10.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.10.ebuild,v 1.1 2015/07/13 08:53:44 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
+}