Version bump

Package-Manager: portage-2.2.8-r1/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 26038f0f30d8..52f9c4cca6f1 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,11 @@
 # 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.411 2014/05/08 22:34:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.412 2014/05/17 14:06:42 blueness Exp $
+
+*tor-0.2.4.22 (17 May 2014)
+
+  17 May 2014; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.4.22.ebuild:
+  Version bump
 
   08 May 2014; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
   Fix gpg signing
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 4e3a065be683..0c3249be6b6f 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -12,27 +12,29 @@ AUX tor.service 316 SHA256 22293c36ae4043cb351ff7e5b18ab392de5ac431683dd03de658b
 AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82 WHIRLPOOL 14a0e40219457b3ea26113fca561db338fb7324c20fee3b30287315974975001fab3cd3272932a1325e8dc9a227e0242bedf9fb424e2c5db755112f3fdeb815d
 DIST tor-0.2.4.20.tar.gz 2867180 SHA256 ccc51747cbcbf98f658c34d5c693ff8a868698da0349d056e98287ef2e294d9f SHA512 a1ca690a427698a99792ea7e9d0705ce5c783f6aa10f8a78673fad5cc70b5ed62bbe3a66f3b03f1c534af91783a4ba910ec90d40628d37d7912e97fb3d672da8 WHIRLPOOL 896d80d841e47f533cb24f8bff571ccda6d6c737da56f3fdc7833598afb280b6c740e0a37e29c164efa4415d4d503ad743346850392226366903ad446ef0c93b
 DIST tor-0.2.4.21.tar.gz 2909462 SHA256 a19df488c0c776c9f1e4c78bf93af115f67eefcffe6152a826fed07a1596f1ce SHA512 be055afa95c8e80b88ca46eaeb22da19a9b7e66af39697267597f6141ad4d6b6197fec55d9f1fb0caf349073740489331a3197cb97c737ae829d488e9cda73e7 WHIRLPOOL 6c26832e289cec219d474f11abf9ec03c48cc64d45fba75fbdd77d28654e185db3d177e13061bcb78887eca632ca2e82ffe754985dd9b28bb910a6198a574713
+DIST tor-0.2.4.22.tar.gz 2908812 SHA256 6bf7942e93b8919a7d01a601390c2a8e7c32d6d53713a73c02d734bad9bd694c SHA512 1d26ab4cca253fa89861ce1bc826c31d81e02e636574f039c87f6eb3e87e0e530701ae34982f6801292f0a290ba54ee096be8526717785b7b620829517743411 WHIRLPOOL e2dd09123e150597a79f9fa29dc811ba7431ed54ae2c131cfb1157137f4df71506d514e9737a7f6ba61d1a33591c7b57e0179f35f1d9b3c7f931d55743f54978
 DIST tor-0.2.5.4-alpha.tar.gz 3074918 SHA256 92ec86e009cc859a3e18fcf286d8699fa393fb08047aab37295e22ea62a5219d SHA512 fc875d519a7f59698146b5c9cabe8e3542e3172e3186483440b020d36b56aa7ef0793fdb0b3885da301735b73c3d1632f9824e2334b411eaeaf6ce509f9c9e7d WHIRLPOOL 6277a341d49ae86457c5a0dbc3e4142921a83bfefc420a1a4b8cfa5a3b9921dd3af57e7ae468376819251e5379135b5ea5ac045590a3aed2b56296375bbda200
 EBUILD tor-0.2.4.20.ebuild 2596 SHA256 feb9d082e10b347b9046810bcfb5596a240075df492a93aa60917e63815799d4 SHA512 aa57ddff39e8daceb7555eba0e4d7ab81a08bd73f3558d6a161ed782941fbdf282e564bd08ce1e5ea68d2e725b847475326ad95c1281fd3272539c674ae609bf WHIRLPOOL a5f118a2309853939cd246c3a5327da5ff6fa5f6c4071c5838fc69ca38ea329672816693885a7a6ae18d3ea7aab60bb1216cb2819df71627a0f5f1e573a747e5
 EBUILD tor-0.2.4.21.ebuild 2672 SHA256 1628cba0af4c269c85405058caab1701f551cda4060048f183041802f6881206 SHA512 71167c29860e336460525d8bc817ccc0de5801b616cf348d6b73e7ba5a797b4288351496d6a854c20569f363f93bf22d65a43b9597d9e4e339174a5d8951ae75 WHIRLPOOL f085b4d0011be7df9f91f80340ab19aa36ba97287cafd99fe4082939d4e2140d779fb5c4743ba05009d55cf5928ea73d65dc721887743158e57a956f92181bd2
+EBUILD tor-0.2.4.22.ebuild 2607 SHA256 a6ae922ecf8e18bcf468d6820275e31fef797d57a3b3568bbb5ea1548fbb1f88 SHA512 6df6a3f3e829b2ce1d58f6cd6eb2ca2c83147665e6b63f7ecfe33c81756d879c45b529547cc20ade4468ee4f12362501fe14614548485a3c3e430f28b24e2d9d WHIRLPOOL 4738ed0f5caaeb5bb43890202437758d077dadb6f57c6c7d1d9fbd3828614c42a7a0e4b630c83465f207fe74ea4a175fa8e828699a4544eea8b1f171aa81dfe7
 EBUILD tor-0.2.5.4_alpha-r1.ebuild 2885 SHA256 e00861df7858529e23e21f27d3d1ef84c32a127ddcd883d9e8f7c40624f13ee9 SHA512 8bb335a732794b21fac87cf3ff67ab776b9927b13f174d6964de05f86ea2a34ec957bb6860f9b23cc5fef4cefe075ceb8a9b46fe9f001ddeb0c2a95a731cddf2 WHIRLPOOL 44cbf81c09e95f8af8c404d016989f9a81997c6a8afb94d54694fd6c4c2245b7a2dad173624028e305fed7885905caef9fc7de3252e526c4cb1dbfb85d239980
 EBUILD tor-0.2.5.4_alpha.ebuild 2836 SHA256 ffdab085482c9a06ef44443937c870f9eafc56f102ee6aff93ad895a9f72143d SHA512 cd163c063ef98dfd40be222f2651e95e932b98dbd696e254f02783eecc6249c9dd2ae1a300d27a8f707e32e219571d1d75166a303735cf01bf5ebec6f1417a9f WHIRLPOOL 7c3d886b692acfce2135acc67721992b9c864f78525f6362e5dd6dd5c67d4532e3dcd692d1714511b279805350d386656daf2c87e010a69197578d595c5a47de
-MISC ChangeLog 61698 SHA256 6e12833dac76231c81c701eb54a0c8b7f3cd093335266d9a643323ae425d3049 SHA512 c91d1b117d1a013573e541f998c973a354089eb92f7cff44cf875d7b33cf74dca38a34df529c16509687bb80f7c0203df02a403b198eae8cb6c5a64c296b15f2 WHIRLPOOL f096487ef0c534a73a2fa42dcf1af087d04c3ce154b003904f585f79756cb376383b4bdefb32175f655a3208538b2b08bdc05065678473ec7be4b5b593b8c9c7
+MISC ChangeLog 61820 SHA256 f0f95c7d93fbb461575adda24261063725ea6ca6fd2e40a4de8d6369a385a230 SHA512 44ee410afc1d7312be76bc441663d2a40f407e9ac95c878fc3602e735ec7ad3ac15b05ac4d01c2779b20cc8398ece36ab343af79e642832c9585ed3d8980c3eb WHIRLPOOL 5deda30f52f6fa415c0e303f3824da1866e7b7dc71a0f43229ff1494f3f6924657498ee9afa11453be735ac97ee2e9f67e3d3d44ec07e0ca46b49d1092a20545
 MISC metadata.xml 805 SHA256 b65e1d9314d9a0406c93a7bdf168cee5555a8b5af3c889768c555ecf9c518564 SHA512 b68a4b5c9ef9ec0cbb61f795a574c3111d0f7be6232868e698828db3a68273f109c2ddd559b4c9dec7a9200f5ea7b99cc5faff1ed23fe9247c6c120e856f7875 WHIRLPOOL b42a9dfb6a840451ec1fec757636055ba71a99dc1f1f1a348e7735058125688a62b2433307706fa8f75310a1ba887a75e3a3535b69c413b0a9621c633f52a8c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTbAZ7AAoJEJOE+m71LUu6MikP/1iZgD/2uWmw3SbeTmaI3WyR
-R3VEOoacTfp87GbmCbVM1bsRQx5VTcvGPbNV6+MEMPKMYzlfmG7TCtem43YM1x5g
-VmzfjOvhfbzUcI0mtdMPQMR8mmDqgc3tMnPKVtOs8D08TKaENVKALeqKwSrdP8kn
-78BJHztOk5Z6pTjimI3QibdrhBIKpY7dvzccPBvpKEVyiEsDTWx7iXpBqC3SRAAT
-SvGtijxF3Z1Y4P26+arIVSOCcg5MbXVTo3J0NSgNNshDeKcNcLoJuxs+uiY5mj/B
-Ejfr89L9VFx6pxxejUZtYp67df24g7RMLPk3r7I0SesqqghEAr/8w4iTLBbfOTqJ
-W/iJGmXozwmiO+HPowVMf4cKOqMeSYcHlrT7kOKr4wrl6JuVfmhC5bm6zbC+bJ0f
-W9iXKXnvjcfiyUPM+C/kIFwZ96M5l14d9rinxpXJJ3mJXJub5d8VuXz3sKopoiJ2
-2tqJQ2fAAHmYUASAI+L70KTOowMTrVN6LY+olgHfX4Z7J+2+cemjTuSI87mYT2eg
-w/5tuCHFgTvB4tlNO0AaysRHbx7pKqwKp2GIMfCaC90bQ7eoKAmQX7E8kcbbiKXz
-/3XTENP3pjHqxx8OAXHqcIYtE3eJsy17HLP5GlEGuImmyzZcGK1DLHQVYIfjHSKC
-iZApet+FOZFkKalH2t0S
-=QWzk
+iQIcBAEBCAAGBQJTd22ZAAoJEJOE+m71LUu6G6kP/iJSBCQFxdPfylwxTsHm/zSj
+Ij0CXR3FFDKO90jinTH7FV3cVWrHCNU35YHG6NkTLKAhHvixfTbYJmhgXwXZ3dYz
+siZf4vewG02jaefyBP5SECxWDvwHmmaudZ/L7b7mv9rd9KQrInpWhsLscrEWt5MZ
+HKCHFgoNq5/Q0i/0ceHKVKkq6b5wa0Bu/y3VMCa6Pc4bB00xSGGfB2GW/ml9FXVJ
+FNcsvk0fNhqsP/obRe5n9YMAAGscAaDRK2vSRZhpsaFy6RLzvhfBXmgee21geHt5
+RCvUy/yM3sR92ElYqxt/0QkEF9p3zgAdvmKyzPTMfvQB9Se1SSrgnqeJFRj5WYxD
+HWs75AFbKBSa58szSK0R0ZB2TjKYjfW6pskUeBtDjcNoN8gSaGS3e6ZtrELbPkWC
+3CxodYcD32c4aX4Tf2ae1QXXSsT3OW2IyKowMvFL+XUy6pwpTgMho2uw7EezVc5K
+d4kvFfPVASVwbQ/BX7hLbEn/cuPcsfWYM9ptYxn4XB3BPVDSAqvw/HRRDq3RYhKA
+wPA1qBOKc6QuDiznLWTQUCBoS7RCwmWEKN5pQA+Cihf7e2MG/y5Pvr89of8ekYYQ
+zBc38X1qwVfJKWRvCF74/ceLLZnuYODeDEPHdTixhZmji313+AuGTNyrhc2AtZrC
+FGvFzGEDelB/DA10WW8X
+=P4KR
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.4.22.ebuild b/net-misc/tor/tor-0.2.4.22.ebuild
new file mode 100644
index 000000000000..8c9b003bbc0a
--- /dev/null
+++ b/net-misc/tor/tor-0.2.4.22.ebuild
@@ -0,0 +1,91 @@
+# 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.4.22.ebuild,v 1.1 2014/05/17 14:06:42 blueness Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic readme.gentoo versionator toolchain-funcs 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 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
+}