Version bump production branch

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

3 files changed, 113 insertions, 15 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 76137855843c..ca0b33447654 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.395 2013/12/12 13:57:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.396 2013/12/23 14:10:19 blueness Exp $
+
+*tor-0.2.4.20 (23 Dec 2013)
+
+  23 Dec 2013; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.4.20.ebuild:
+  Version bump production branch
 
   12 Dec 2013; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
   Fix broken gpg sig due to bug #493834
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 8190b0c1a70e..d8f43341ddbb 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -9,26 +9,28 @@ AUX tor.service 316 SHA256 22293c36ae4043cb351ff7e5b18ab392de5ac431683dd03de658b
 AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82 WHIRLPOOL 14a0e40219457b3ea26113fca561db338fb7324c20fee3b30287315974975001fab3cd3272932a1325e8dc9a227e0242bedf9fb424e2c5db755112f3fdeb815d
 DIST tor-0.2.3.25.tar.gz 3190011 SHA256 bb2d6f1136f33e11d37e6e34184143bf191e59501613daf33ae3d6f78f3176a0 SHA512 c15f9356abc41bd1c663d37e674386debc29b0a5887e1120a0318ffb97ada1a04d57756175f01f13549f179f73916e2af18566575a656154ff71ec050fc99651 WHIRLPOOL 6660f5db69bf89cba17937fc72982f674d70fd64c31647228b15d5f19febcd9e64bf09d94e1681f8a0285f2129dbfe3e77687e4d44f335ca8013e318023f755b
 DIST tor-0.2.4.19.tar.gz 2856515 SHA256 53a28478c3f5161729c94ace0c132ce6e2a57418f9cb252f2c2abc3db979e121 SHA512 d64072f903865d21ad287d91b9c7f30421e1d4acd0f67d331c1afe1e32e7e9d0805c44476a74e7c65eeb47b76ab4f2fd6d51c123f090029686706a356c01c5ff WHIRLPOOL 8dda1f3877792149120d4bacacef056ba77965f8b0b783c960c3b7f21232ff39987a8254c1b8a1b941647e5bfc2dbf650c5607437305a75710494ccdff5282dc
+DIST tor-0.2.4.20.tar.gz 2867180 SHA256 ccc51747cbcbf98f658c34d5c693ff8a868698da0349d056e98287ef2e294d9f SHA512 a1ca690a427698a99792ea7e9d0705ce5c783f6aa10f8a78673fad5cc70b5ed62bbe3a66f3b03f1c534af91783a4ba910ec90d40628d37d7912e97fb3d672da8 WHIRLPOOL 896d80d841e47f533cb24f8bff571ccda6d6c737da56f3fdc7833598afb280b6c740e0a37e29c164efa4415d4d503ad743346850392226366903ad446ef0c93b
 DIST tor-0.2.5.1-alpha.tar.gz 2904012 SHA256 3100d8f0ccb296e82f1d3602266d4dcde801daace82af74f5f27ee2fca7bb4a8 SHA512 962ee00022a45d90b7a92428929d9095a74b6e379a804fba5bf9ef8a0581cb5f3453c76ef76bdfc8124d8b83627a57ae5cfd5d74b89795d1233b057ac251c0d1 WHIRLPOOL e0847a2f196f2e258be4c92b58a4e000e7f2f1c709edfad1498fa6149bf5ad80399672830d3ece43268c961c3b2105de3cd5762796d9f90909b09b7ff221540e
 EBUILD tor-0.2.3.25.ebuild 2778 SHA256 511b8620265347c02948471496cd83da5e44a2eab78a4ab158b8977021908275 SHA512 50d96475b0247a0405e57baf2af52ada6c04a4a4a67b91f4666382b5f96922e0f96684ca7a202a5bf7e8437791741bed2c6c608565dc3f9d90739d0c54e81ece WHIRLPOOL a577c8c660899b510ffe8e13289b4045cecd2f22b5c4e250780a28499041d926719b6ac6e59cdcfbc3a6d12e9bde3c0dbb5bddfbdad9a444ce5ace61a96bd989
 EBUILD tor-0.2.4.19.ebuild 2602 SHA256 da723fd891cea6558b994a844e5f43fcdce7e87f0e8a47b77ae36628a7170ec1 SHA512 d227c9c24ae3a33f2915ed2cfe4ae4d47389a118d1bdd492724b70897aac4bee0d22e7bd3e35daa40834bcb7e897ccc249914418af037d3f60b84716cd2ba8a0 WHIRLPOOL e3966c87c79ff7f216b9271600a36e2c99254ff6e6edb7e63abd3a8bb6497cf7a4a1b49e48d062b739337ec92710c078fadc5b97b00f7d2e828cb4c953ec39d9
+EBUILD tor-0.2.4.20.ebuild 2602 SHA256 908b3d5aef7eb2685db8cb51403051f88dbde9fe33d6445d9437ab29acaa10a3 SHA512 0913c1a26c6d9c7450f0401d32114b96d22678d1c23f88bfcd427f3cfde1a3efe8148f112ba4d70ce7ca325037a5962a1fdd289ed8cccee74bb205e411283f55 WHIRLPOOL 44455937e0847234be8d92c39d9164574bfc5f6f475a9895e054535dd912261990a765f7e58db9f37dcdee65c52fe6f3c6da4c7e5107012ade022e2f07100bbf
 EBUILD tor-0.2.5.1_alpha-r2.ebuild 2761 SHA256 35ea8ad447329da8640670ce85ea30980ed51dc2621b3aa32aa75b9a7061d60f SHA512 4107b4f2c8c4f75f4b3c6667f6f05f4fad201d7ddb888e3501158fd2b94e62471d0fd1797c0e878c5af8823649e3a79259e7b91dfffbb625f9a1de2079b35a39 WHIRLPOOL 3916eb3d64f96290562bdf178ca1a992632d3c9edbdccf40c356030edb5b6b25723fcee0e6b74cc4c0f9e5e1d490af7ada0dc0108af296eeca9e4f5900d1b16e
-MISC ChangeLog 59499 SHA256 b5bdf9e8671e1254439bd2a3eb972e7531e1e3c606cd7d87310690d59f8d660e SHA512 40a07814b07ba603113d1396984144e7056e0e4e6dc4a0dcbda42d8db68fa6916b217a9fc1821403d14e44782152407b53eddcb88981b7a10a3f87d99ae5f7f5 WHIRLPOOL 1a775982e0cf36ef7aa36139e0dc475a9d8e05807fa8d796d43ce50ef2b07b0b0763327398a9e310c79778864e221b0d8f7e700c52298ce3dbb4a2fc96ff54a3
+MISC ChangeLog 59639 SHA256 8d2148be645b87e08b54754a380b5bd459c31aa275056692628f34704d238e79 SHA512 1d34293b85db1357c94f1879705ad170dd513ffe3e08200e466ff98d83675be1aea74ed5fdd117cf5df488527a3bda95b21856c927209f460a8d0f935ee2b85a WHIRLPOOL f4e9a012f831e74dcf1f80ef0874b604f0336f3d0f1f5bb3aa4c67c02947082081e8b93569b17c83d70debac7479f08dcaadc7ba6d4e4e7521f8965888d5263d
 MISC metadata.xml 747 SHA256 e59e5cc5a3a79a74cfbe218bd2378c219edd7b6de840129fba578bfb8b05b163 SHA512 c2bfa165d4057b6a32043e1ad7881d8652db4fc10093f8e0d1403c08966793cf179b288da72a70251282a6f8d0787dfc817c305c520abaf11d65b183f171d6ef WHIRLPOOL 53b8d90806c613c03c3b4a2d0498b4b0a55d7aed01aa0af0cbaa82d79ceccfbc91f0e9328b0a12620472254ce97849d330f090f585498b7fdab5431c3ebc5308
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSqcDZAAoJEJOE+m71LUu6KHgP/RE8szkDJLON7Z7FLf+k/5rZ
-w+I5+bhaglICZt6nLCjvERFj4byn1jhIcNIJQmZW3lvQ+05dR206x0gSSOm3uEih
-ly+yIndYp7E3Jiutmpe1SX054WAR4TvSC+HHDA3nXefmlGjGUf+qwWzP0JDAkMMs
-GOkbhWXWhzO6tlInP9lua7rvNJugPvInFx1+BbB/cTMNf1P9mo852kEGkA3sB78Y
-Hh8RVeC+Vrqs9GGyL59ihgLicZdMwR1tnbGS0pWT1m41Dfq8ACciRcYQCKbyUGBD
-ZYTLqo5zKMvKrCzvX4681CAEVWSEGS9/sLPR9RfpY37YVUfDQ6gEAAe/xHaQhRV+
-trt4/c3ICymgMxkzvRHklXmtWPUVKpzTM4HdPC6CQIU7iOmqy62H12Ndp51E8WE2
-/DHYOTEm8jlCapIohdIxRU8zy3rA8TVgznTASDWJM5bcAgkidDKih4hy9BnV9uo3
-EzAtiH4t7kUqUmdKbWn8hMyCll4t216fRhIkNT2tFaSp08DuL+Ni2CQeHIlBX5YH
-JtyznnE8JlwYAa4C5C8hBy2OXYqcg6IAgi3s0xPzayfkvCnPW3Iq1iH61Yn+GEyk
-mvk5jXy7S750DtXGqjybpP+iimvgMVnoU1IT1jSDrv4IY3+aKYudW6BHtmniAVKL
-vLJJJXwfjG9mynfsf0vd
-=qv2n
+iQIcBAEBCAAGBQJSuER9AAoJEJOE+m71LUu67VQP/3R7pB2YsSWUBkngHOF/ucm9
+GB8SsdiDElFMhu2bopye7+eM7GJkA0pWk5sHwbhBxHVXDcmHghtldbXKEQ2bJmKZ
+91xIMPLZ9tMfQhH5/VYTWy/ewiNfGWWI9TrAL/bXMLZen4M7Fhh1ljNfXtyvujFR
+oeq3KrMfVwM0rFK6x7AIrN2LB6js6p860N6uGoPaJt3oYUvDETyRiIZyoEMdSpOE
+gz4aUvT9hyEPGG/0d4Mw/F/gOv3EllsuuPfvNw4q0lC3x+8/AJdf6U/t9+/LjZw6
+rMk0aMGbDsfUUHNVjqt3n1r4W8DE6QXc1VnZQU6yBjj6o2mEIDX3kSPCK6RJQkva
+h2529TR5gzcg9Vu2g3b4ROYVYeR8hfyqNrV71UmHEIO9vglhr4SCcSGr8xDs3S4g
+o+RmyeGDi1dwv1U/v8U7zkQvEEZ+XTPgtsYROSSnIucGaWaDZdaYuc3Q77F91xX0
+OuwJyTgtViOYH6sQCQGQGudi3QxxxMi+MEcYwKmGxvHJhL2l4aJbGWCMLduPeB65
+kAzQgcP2cfd/LqwGge93yrlIfMYHkTstuWaBkb1izPDvT1uxNe6W7ODIKV3bGKiL
+NoI4x42u7c+vEZ0z+9TQog4F450GrYexXyZp58S0x7pQVhbzQwojvAx81thMacYP
+lg0ejjrpMLZ1gio6lYGH
+=tFrv
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.4.20.ebuild b/net-misc/tor/tor-0.2.4.20.ebuild
new file mode 100644
index 000000000000..c64486376651
--- /dev/null
+++ b/net-misc/tor/tor-0.2.4.20.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.4.20.ebuild,v 1.1 2013/12/23 14:10:19 blueness Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic readme.gentoo versionator toolchain-funcs
+
+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 selinux stats tor-hardening transparent-proxy threads upnp web"
+
+DEPEND="dev-libs/openssl
+	sys-libs/zlib
+	dev-libs/libevent
+	bufferevents? ( dev-libs/libevent[ssl] )
+	nat-pmp? ( net-libs/libnatpmp )
+	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
+	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 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)
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r6 tor
+
+	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
+}