Remove insecure net-misc/tor-0.2.5.10-r2, net-misc/tor-0.2.5.10-r3, net-misc/tor-0.2.5.11, add net-misc/tor-0.2.5.12, net-misc/tor-0.2.6.7

4 files changed, 14 insertions, 116 deletions

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 688a2350..52c051c4 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -6,8 +6,7 @@ AUX tor.initd-r6 1627 SHA256 49da1b5f267927023bc092adcf89d406ec294584039d6bca6b7
 AUX tor.initd-r7 2387 SHA256 b537dfa48bda4253968fe47b3e861e12af1703f9d79346cdd5fda70bb7ac037c SHA512 b6a6c193766012cdfc9871bee66528d3478528814d4d745bee87753f4f8a6c1ea4985562a30e0153743eb28a219d5093eaa3c48b195f86139c57e4044116c586 WHIRLPOOL f258105456f6c32b5cf38d1efe26821a3fc50e45dc3940b07a7d78a9cdb5eb9b9dd004d8a960ec603782337a62b74e98afdf9b855b1206b2b8f06fc7fd5bc868
 AUX tor.service 479 SHA256 647572301c444896c6958af4481f443e39f7232f0ad919e4a154a27733aae709 SHA512 5eab6d99bc9210546b750596e6b660904a098868a07d4df41e14e39586a12965cbed94e7bda2bf315472fd40b4df4f68f1a8393c12e085524b80e02e26de9c14 WHIRLPOOL bf23275b4a847e5a806d7052b17ac9bbbc6c16e23a9add351bc6f7ee3afde844914ed0505fcadd3b15bcf2519fc7a352cb09d2e46cebec19b88ba7ece3c3835d
 AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82 WHIRLPOOL 14a0e40219457b3ea26113fca561db338fb7324c20fee3b30287315974975001fab3cd3272932a1325e8dc9a227e0242bedf9fb424e2c5db755112f3fdeb815d
-DIST tor-0.2.5.10.tar.gz 3166480 SHA256 b3dd02a5dcd2ffe14d9a37956f92779d4427edf7905c0bba9b1e3901b9c5a83b SHA512 0e6522964ac84231f7753ebe80239ce8c906c62bd35e5bd65ae5f85f246d488e32fbf121c58e501cbf0b8271468f6c10bef756080a7120479240486d6af22a8f WHIRLPOOL e92d2805d134e3fd45e5bc0a1832b793555dc185a6bd6418d622adf447a430bd9932a4bbbbade1b0aa8c19ae05f0e8ea04b1100e3cdba22b2dc2260f2e5f9ec1
-DIST tor-0.2.5.11.tar.gz 3310350 SHA256 aee0faee9c3f1bb265ee8e94b4bb93967413f3c56e65f954db16b09451546769 SHA512 2f752c089e4e85273729dedc849b17f1009c0348370faecd22ff77b125a2afadcb31f6ef2f2b83201a53b9f663deaaf052e07eb8742707b16e14d757c2a74f2c WHIRLPOOL 450153c8b60a8fb48c727186c5c250c803253155e19d066d62687a15274dbd0204bb729d2881597275b06620cbbdec9c20a73d93af00c927529dfb929bc45cea
-EBUILD tor-0.2.5.10-r2.ebuild 3015 SHA256 f626527d516fbe7813f422fd8bff687a6611e6076d0cfae1bfde5d593af34d3d SHA512 31982c3b64afea0d2dff6afd70445375fcc1eb2b581cbfa14f2c92797f01bc575d93893f0bb6517ff8fd3b52d41e3a5174526358dadc43a2ec25165a6fa722e3 WHIRLPOOL ca70041d91163ab2a4537d47a0e6ffe6404d559e37b288480d2eb35390add20b8c8e6f54df37e9175a038d4853d8851c5ecfe29268270ae9dea590a4ad16e806
-EBUILD tor-0.2.5.10-r3.ebuild 3038 SHA256 44a7e0b6dbff2958db54fd9c677981d11d51b0c6ce9e70f8824a084c237b67c4 SHA512 662980e4eb53b5b5c447df73cd5111d66675a1fb67ba5b5b229adb80e5e26d6168ec69d27856d9324c03c376a8c580da6d2bccab274dca4020722a57c4838cf9 WHIRLPOOL 95c96f08d2a6515cfe465aa69aeda01f42a6b92ff9a6d403fc1f07d835d637cb6cd58178bcd9620859cdf9c89aa6415626ef9b0a18fd062864d5a793b60e02b5
-EBUILD tor-0.2.5.11.ebuild 3040 SHA256 2a21c8add848d454747194490c8bfd071c3d9545f2bc427225dcfd5388d7ab2d SHA512 aa7286199f2b31c04f878a196ab83614fdcb9d5d06a083610214e69a3557053230e59a247dbe71342691bfe9b2c35c82cf4c1f4ca2437923bee385f6520482e1 WHIRLPOOL b7d7d65b6b4e3e179ad5e306fc0e4333cd820165fdea7120298c452101fca94212676f78f0598e12f8dfb4722c50e4566083f1ec45c83b3ae4acee3359ca27c4
+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
+EBUILD tor-0.2.5.12.ebuild 3041 SHA256 59cb45f60269dfa78bb5ad254ccda1c02808fc170a3db1778c889bf3ed3fbef1 SHA512 f507ccec5e7c1aa32a13ea75a83c876c0efe8ed16f6b2e30efe5a1345b9cfa70a690a44a3d671efbc2cc715f428dfff1f27a3666b281b1bd55ebd3f57b78465f WHIRLPOOL 7ee3d2a0d315d4d69ce8843d95815811823c86149ab0bf63c71013f916f584fc0801825821c0eea7b9b9f4a60e895a9637d95b6c60b8a47d1ac6beffe31499f3
+EBUILD tor-0.2.6.7.ebuild 3065 SHA256 836606fbdab3e98061c130bbda3cfe5b250a231c4a3ad12192454c34b2cb5116 SHA512 90bc54215ff7bd3d7d1fb1ea2245769f1865b305dd37a6b27da95fb886dffdc9d61720a4aa0ea09e356ecb0bd6afb742168dc5289b7bb19395245a62f20d707a WHIRLPOOL bc248c6b26bdf598604caa6de3c7c8ad672e3da9c35e0ed518530f3f64e936ed586c6f02b089f2f63bb0f2abb21666afa483885092d8356f4f30072fe71f5cc5
diff --git a/net-misc/tor/tor-0.2.5.10-r2.ebuild b/net-misc/tor/tor-0.2.5.10-r2.ebuild
deleted file mode 100644
index 63924d0f..00000000
--- a/net-misc/tor/tor-0.2.5.10-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.5.10-r2.ebuild,v 1.1 2014/11/20 14:41:41 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 +ecc nat-pmp seccomp selinux stats systemd tor-hardening transparent-proxy threads 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 )"
-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
-}
-
-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
-
-	if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
-		replace-flags -Os -O2
-	fi
-	econf \
-		--disable-buf-freelists \
-		--enable-asciidoc \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable stats instrument-downloads) \
-		$(use_enable bufferevents) \
-		$(use_enable ecc curve25519) \
-		$(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 threads) \
-		$(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
-	if use systemd; then
-		systemd_dounit "${FILESDIR}/${PN}.service"
-		systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-	fi
-
-	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
-}
diff --git a/net-misc/tor/tor-0.2.5.10-r3.ebuild b/net-misc/tor/tor-0.2.5.12.ebuild
index cdf7b631..219a0bad 100644
--- a/net-misc/tor/tor-0.2.5.10-r3.ebuild
+++ b/net-misc/tor/tor-0.2.5.12.ebuild
@@ -1,6 +1,6 @@
 # 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.5.10-r3.ebuild,v 1.7 2015/01/02 12:40:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.5.12.ebuild,v 1.4 2015/04/09 17:03:04 blueness Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="-bufferevents +ecc nat-pmp seccomp selinux stats systemd tor-hardening transparent-proxy threads test upnp web"
 
 DEPEND="dev-libs/openssl
diff --git a/net-misc/tor/tor-0.2.5.11.ebuild b/net-misc/tor/tor-0.2.6.7.ebuild
index 04055fe5..5657501b 100644
--- a/net-misc/tor/tor-0.2.5.11.ebuild
+++ b/net-misc/tor/tor-0.2.6.7.ebuild
@@ -1,6 +1,6 @@
 # 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.5.11.ebuild,v 1.6 2015/04/09 17:03:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.7.ebuild,v 1.2 2015/04/09 17:03:04 blueness Exp $
 
 EAPI="5"
 
@@ -16,14 +16,15 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="-bufferevents +ecc nat-pmp seccomp selinux stats systemd tor-hardening transparent-proxy threads test upnp web"
+KEYWORDS="~amd64 arm ~mips ppc ppc64 ~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}
@@ -36,6 +37,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
+	epatch_user
 }
 
 src_configure() {
@@ -48,18 +50,18 @@ src_configure() {
 		replace-flags -Os -O2
 	fi
 	econf \
-		--disable-buf-freelists \
+		--enable-system-torrc \
 		--enable-asciidoc \
 		--docdir=/usr/share/doc/${PF} \
 		$(use_enable stats instrument-downloads) \
 		$(use_enable bufferevents) \
-		$(use_enable ecc curve25519) \
 		$(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 threads) \
 		$(use_enable upnp) \
 		$(use_enable web tor2web-mode) \
 		$(use_enable test unittests) \