Version bump 2.4 branch

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

3 files changed, 104 insertions, 15 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 14b31a393a61..01b9055ea78d 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.389 2013/10/28 22:16:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.390 2013/11/17 16:10:28 blueness Exp $
+
+*tor-0.2.4.18_rc (17 Nov 2013)
+
+  17 Nov 2013; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.4.18_rc.ebuild:
+  Version bump 2.4 branch
 
 *tor-0.2.5.1_alpha-r2 (28 Oct 2013)
 *tor-0.2.4.17_rc-r1 (28 Oct 2013)
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 4ed62f2ee2c1..16318a995b21 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.17-rc.tar.gz 2825527 SHA256 9d143b950a1c920e455bb41f2773e2bee8818e4a81aa9b1877db47d643b95d65 SHA512 6a48954462efdef3e2ea71cb662ca14fc0a711494a95e19807564952dbb7e83b411f51819450aa2611313a2d1277323bbb853af720e83bf6421cfb42f53bf40a WHIRLPOOL 09dbc0d5292b1ddded41fa77c3b4e13225ef5a8df658c4f3c77592ef06c334085f21b9582ab57a2c9ee3e7ce476415749934f6b6a3f3f11b3f26a81c5fa05b43
+DIST tor-0.2.4.18-rc.tar.gz 2854762 SHA256 e4e644274e24c2270f638fbcbe1c9167607ec98332a1cef4c3d03f408eb3aef5 SHA512 476947f548c44b6cb53888b3e9f3caa2dd7577cf1098e1a813f7b090c9846f42ff6a25d6a96a6cf8214e3df54ebd8643e67f214829d464ac212187668c5ff937 WHIRLPOOL a95dd41d184bc7b54f651b873e694fafd24a6696a56be16b16e3fd1fcfac4fa325bffcdc899c4c41bc040954bdde61530bc0cf9c7ed82ae78badc141e475e478
 DIST tor-0.2.5.1-alpha.tar.gz 2904012 SHA256 3100d8f0ccb296e82f1d3602266d4dcde801daace82af74f5f27ee2fca7bb4a8 SHA512 962ee00022a45d90b7a92428929d9095a74b6e379a804fba5bf9ef8a0581cb5f3453c76ef76bdfc8124d8b83627a57ae5cfd5d74b89795d1233b057ac251c0d1 WHIRLPOOL e0847a2f196f2e258be4c92b58a4e000e7f2f1c709edfad1498fa6149bf5ad80399672830d3ece43268c961c3b2105de3cd5762796d9f90909b09b7ff221540e
 EBUILD tor-0.2.3.25.ebuild 2398 SHA256 c3b4fcb3fce77e12c3ec21abc0e1ddd155eb443d4f5ca8ec7c1c9f7d3488bbcc SHA512 c6b4a79e349945a10f054c70e11c0a4d14769d4cd4ee5585cfd27253fa1ffe935f23489eb2330ccd7ca0fc459739b7700d3650a8827e5077e992cd65f9293760 WHIRLPOOL 8ac04d9f9be3e1c94f7efdf37ee9163c0d224591fc25d09c3b576c493648aa51b3dc7ea5051e3df7979372827c213eda3265d3b4a329fcc8a75a6733738d94d3
 EBUILD tor-0.2.4.17_rc-r1.ebuild 2228 SHA256 934df2549343873919f925882996820b249c1d1eacd07651c4f6685862998ddd SHA512 84c153000f1deb2d1a764e45c67ca6bcdd0e0f26233b5d7e35fec573e3e345788287ba4df73f23d7cdad6519d46ac143f49554aa61a57c13d5b5bd83a76d7968 WHIRLPOOL 7d6129ecb324328dab01581400cefd72631c4291bb6a842109321cc7840dae6ff34e69491a968d28e35162d57f9df53aa2495d4a502201c56854e2edb74c4185
+EBUILD tor-0.2.4.18_rc.ebuild 2225 SHA256 6a9caf07d520ccdae66977bcc20b5f33071700eef8b608f3aad292e34cfff79f SHA512 59302f0711116dfd0791b48d9e8164a375b0552e74b1a0b689bb348d2d56b099b3e7adc495e96bfbe429b83607f16e71550566f3f63f8679a07edbf5aa213796 WHIRLPOOL 775bab2e3239821ec3289dd6c45d94d7f996a912bc7d3876edb44373f4dffd425bfafad01fc1b159cdb50410a2954e385479a850a3b883f70fd45887cc1fe403
 EBUILD tor-0.2.5.1_alpha-r2.ebuild 2381 SHA256 28add1346a23e50a492db9198156bd4084febda77fd6d0385179f1c393fcab51 SHA512 38a0f26380557bb534408bcf51d4d62dd2a3a562d334245ce28e3a07aa0386c588ea3fd0bca35ce9d2149128c44b2954ce843a5784777495193a40196cbac48c WHIRLPOOL 0eb2498b4eae7b3b140909d82ca1f33460671f574d0999295a674bc78d542277378e453dd460a5234f985ee848bd5ff4463ee955767f2710c5314a7f05b08a2e
-MISC ChangeLog 58585 SHA256 17a069d2fc68d016ed4db563c9292d261c75fa528b73a47c0da305f1ae30686a SHA512 4a827a9622eac5aa47d6c5694df61c5ae2933bd6363929533b8abee38d903f123ebd1d907172bf08f297af582608a9091e880e3b8daf486f769fb1e1ff3164a6 WHIRLPOOL f4c6736b4a1d8f4577bc72759746341c312087a48ded96e2770fd6cf2e09ada7f90b49b9e55ec5d9e63d12bda7b3039cf5a7c281df1dcf38bfd50f31db89487b
+MISC ChangeLog 58724 SHA256 c2776d55d4e51b8beaa163b784778cb2618331aec5f89b9c9d818ed75e516293 SHA512 f1f6c79a5d0a6efde7e79d3fe0b7e4b3d901ce974db5f81409a53a70bdd1a3a9ffcec593a0e51f190f703f166d0702673b67632fb44695cbdc9a0fac91c44e95 WHIRLPOOL 0fd315ec7beff0f19a20c3c878d1bda83ea2b0ae226e6cf8ee926a7c95cbb0fd6d65c84c7b264ae78b0c03613f0c53d5b75250966a4bf1814f359d756f222aa2
 MISC metadata.xml 747 SHA256 e59e5cc5a3a79a74cfbe218bd2378c219edd7b6de840129fba578bfb8b05b163 SHA512 c2bfa165d4057b6a32043e1ad7881d8652db4fc10093f8e0d1403c08966793cf179b288da72a70251282a6f8d0787dfc817c305c520abaf11d65b183f171d6ef WHIRLPOOL 53b8d90806c613c03c3b4a2d0498b4b0a55d7aed01aa0af0cbaa82d79ceccfbc91f0e9328b0a12620472254ce97849d330f090f585498b7fdab5431c3ebc5308
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSbuJiAAoJEJOE+m71LUu61XAP/jyQetJu3vP8u3z2dW+HxBGp
-2Q3Fh37WAsr9LvScg0K0wzQmVfbwcivbdSbkhctCczzeCgvjsdPZpF4jCXFX0Ti/
-jGgHTPEUGhW/b+z43uids4PvobL6mt3YgsGsaMMZH8Ax4Ym3QY+5blEWRPYIaCMG
-L8+b4sQENjjFw+bFS2W1aRIy3qgNI84WjxtUlJZ3huoSMb751iYKKI2M0K+gYVt/
-Ds933g3s4XZjqledYLms9gRcXEopkHQ6/pJbCVevECNTPVc5u213UDwtPhkmapQ6
-LE3Jttv10YqSFYwdn3aAeOe3l85C8lCUxC/iAakxVy716D4HAC7DjgbwXxf+jzDq
-04ju86lSTwaXIkWXE0ziCA1tPuGV6S+F7Oi6lxpZACLAOjwyjGyIltYgmC4Z804D
-aP9m8w5T+VkILKCcrxV6cpftazrFmhKzgFrXelhF8AZMv/X3ZzWNTeGUpIzV925U
-L5ygcRmfU86DSIp7JPIFOqXnC497stV94u+Yz/9a3oOC4n/H4c74vYoJGgq9d51S
-pHkKvp0RynCr28/Ctukh4Ttvat3L8zkIfU8TBfy/t+umCc4spmsmYhDPpacH87Px
-n9Bv1Bk6wC42P2YCek0L3ov2yNkIyev8zAADkD5xCSmn0iw3AZf24BZ928OO371z
-73jhIn4zfNs0WTI89s0U
-=b56a
+iQIcBAEBCAAGBQJSiOqbAAoJEJOE+m71LUu6MTAQAKBCBJPnXa/QIUdGcQ7lIeOa
+f1EaFsLhPObeDMw064CgD071AkwUpV79wModImJjlV2kHT2v1bvTfAQotpBDIipF
+1FnXqDKSJTvoNthLyf6xgDSUgobRcHMP1jA9DAPEU7kYZUvrgF6fdZmJw7Hs/KBe
+YDLZeG87nrPR5XyPbAIQ+opEDsYMA2jfxdQrQpsLgpqlUFwopbTzNoE27AJWfH2X
++MVkebcCdtnTTOuApjfHcK/SXBtdbIjPj/okbUdm590di9O5OwbrJr4EGhq82yw1
+nPdBo1vls0SWmuVTZ95jCPkLLIesi8uMUuj9H1NR2WL53nZnLd0aYlc8qMjIN7sm
+d1K4amfOl7Sj45bj4UGmnNbjqdQRmXbMpWM1jDU8fQh+n2hH5woN3p4RkMp5IvYm
+rkibstO3+XVFpotpWrJ2qyrRYyf8wBmhI9u+B+M+sBW0e5DNambYOOttlaMDHNo1
+svku4sBjIxoukeaMHI1UZFIrB/6AobOcbLI4nlAZH36NZsI7DFIOjGBJDa3Fh0CI
+LbzSA2osouGE49M4aV0EekJHCXobTtif06NhZgrJ+dapyAzqISbX2BSXYE9tVejI
+3NNb0rD38SM9tgHPZXOpyMxpDAm/AYRYWM6s3zrIqOgS7LAu/h9JVSoxxVN0d7xZ
+MGhion0S4UOj3Mo/ai0/
+=Cyzc
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.4.18_rc.ebuild b/net-misc/tor/tor-0.2.4.18_rc.ebuild
new file mode 100644
index 000000000000..631b95e65bd6
--- /dev/null
+++ b/net-misc/tor/tor-0.2.4.18_rc.ebuild
@@ -0,0 +1,82 @@
+# 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.18_rc.ebuild,v 1.1 2013/11/17 16:10:28 blueness Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic readme.gentoo versionator
+
+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
+}