Version bump 2.5 branch, new RC candidate

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

3 files changed, 121 insertions, 15 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 6ddfd8e3555c..954682b2106a 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.430 2014/09/06 13:54:19 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.431 2014/09/13 00:04:44 blueness Exp $
+
+*tor-0.2.5.7_rc (13 Sep 2014)
+
+  13 Sep 2014; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.5.7_rc.ebuild:
+  Version bump 2.5 branch, new RC candidate
 
   06 Sep 2014; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.4.22.ebuild,
   files/tor-0.2.3.14_alpha-torrc.sample.patch:
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 82ba26f8e302..8de15908a9dd 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -10,24 +10,26 @@ AUX tor.service 316 SHA256 22293c36ae4043cb351ff7e5b18ab392de5ac431683dd03de658b
 AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82 WHIRLPOOL 14a0e40219457b3ea26113fca561db338fb7324c20fee3b30287315974975001fab3cd3272932a1325e8dc9a227e0242bedf9fb424e2c5db755112f3fdeb815d
 DIST tor-0.2.4.23.tar.gz 2977006 SHA256 05a3793cfb66b694cb5b1c8d81226d0f7655031b0d5e6a8f5d9c4c2850331429 SHA512 8941a296c613ae30e98933ec05810cb655f3fe345ed9942f7c76799e00b893aa17a5e023b020aeca0b730834e6df4fb86927fc4e3d66ebd0cb26a36e6d94103b WHIRLPOOL 2b461eee1d31a338167f6a8267e63f2b6b1999668a82d2d9db3fc99f83cd6e959c922d2102e356815b776c0fc15780f46ed2bf0b7afcb9d0d95aee88979c0bd8
 DIST tor-0.2.5.6-alpha.tar.gz 3134258 SHA256 ec8edfd824a65bec19c7b79bacfc73c5df76909477ab6dac0d6e8ede7fa337c1 SHA512 c0bfb2d60c51308b00ff590bdcf2285bcfb97a535edb3b8d9d746babdfb0dfadc5607fa3f67ab79c1c74840e7bd035db06c7efcd8ab0aefd5c567ab9efda9eb0 WHIRLPOOL 8e920dfd1882aeafee4e1dd11e40368a26936aa85ecc2093c3b63db767210345b77f041a6442067633d42de7fa71f2dec41e2fcf31a287aaf33c4c49d1d663ba
+DIST tor-0.2.5.7-rc.tar.gz 3169243 SHA256 1ad0124b20f75602505b8af9f176adbed416f0a2ceb258189fbc2e3463171626 SHA512 8d5af4d3b6b34887dd77dc2e3aa29dc79b6cdf182414488e198592da1699004c50575bba96c9508373f18a2df773883d588dc1b291a4c24680e8d2c161f89b78 WHIRLPOOL fea5b04182178c69ee06b5a23c09baedcb6d8c6daa92ceffbc0192e20999931b5c935fe4f2519c894301e858212aa587e4d2a4d46500d4c3e60871d747a066bf
 EBUILD tor-0.2.4.23.ebuild 2600 SHA256 b227f85b55e97db2cb1621ac839cc3809ef4fb0fd290723cc922cad0dadae396 SHA512 28ba666c2cf367f791805451e338f4835b666d350a0b2cee58e2e8aed76ab42c3eaae112eb43e484ce4fc9a6f18a66793b25957be212f09b3c6c3a70d50130c8 WHIRLPOOL 0db5717beb2634a1ee1aac2bf58e52ed8456bab8fac19067db9fd3806988783934d6d907ed4fb441077b889315e84e75b259339c9e548603e5b9046251d14027
 EBUILD tor-0.2.5.6_alpha.ebuild 2809 SHA256 f305240ab6d6d98725fe9d29885abeb176837922c896ed41b1d87bb5c293b307 SHA512 6caf2ac9e74af6d33eb0623e7c81e870be94eb0da14236e5dfd1592c18e25d8c0838d968bd9dbef3372b8c12eab51899b93ef580a24a906dfca8f8ed1ee40890 WHIRLPOOL cba295d235d3b9ed19e45c79af04f8037f0cf908816933d61c11aaa947a0d2d1b6a6faab85b6e421b87df32db1816dc13d47bacaf9710601a6b90ed381137b38
-MISC ChangeLog 64271 SHA256 7be412b3880566eb3a0f3dcc86cebd3a80d7f0bd7e1e4af0e496c1fae49a2308 SHA512 5b81aedc4739c539fb28a852e4b92fc32d435f46d03a7b7108f354f5f4f7a0655df6a196415f17cfa5fc4cd18fb8181b95be93419a523e9b55060eed62404b4c WHIRLPOOL 8af7fae63b7c7d86c4fdf7c1ac7feeec86c945eaa3d0aa34d21a12761a3093078e5d28ba7b933ea90fa613dc42bc0e744b76f4b92ada7f5b6adeaa6375079d52
+EBUILD tor-0.2.5.7_rc.ebuild 2806 SHA256 7e742e13e6a383de05b79ee8ddf07a60f83589fa506e7b9c5927c8c9a05f3955 SHA512 f5b990c95c73050f174204a56f4915aca27865621a2c28939fc97c591257e5b5387d3f59cbd8eb04098b71767133745b310712bf4fd45cf343c93a7a9d7f0a88 WHIRLPOOL 327868f15b86f3fd57e3178071b3dc33a1ede9dba398f0a9de9b62d52f11ad334bdbbfc3fd3741ed9275b6f84a4eaeca4741c74c5e320ce87d1c9c7caa37de71
+MISC ChangeLog 64426 SHA256 e7196087ae1794db73e55a8aee78a8fa18e3d9099a9f0237c2463fe8b5c87d7e SHA512 77b643a9c63cf2fa7ab7cb99c581a26f7e661e628e2617aeb53e3d57cea7faac5ecbe09e7866ca8e4e9e7a639086ab1cb4fc6fcd064b2a9ed003a0b7d1b1d412 WHIRLPOOL e9e8bf46a6dab89b2e604b2480da59021c1a05a295b590df8728d5623bc78139e9f1b306c8f4ac869f460f0f352b562cc4c6b0015d10e10d23a3852cb0a9ff93
 MISC metadata.xml 805 SHA256 b65e1d9314d9a0406c93a7bdf168cee5555a8b5af3c889768c555ecf9c518564 SHA512 b68a4b5c9ef9ec0cbb61f795a574c3111d0f7be6232868e698828db3a68273f109c2ddd559b4c9dec7a9200f5ea7b99cc5faff1ed23fe9247c6c120e856f7875 WHIRLPOOL b42a9dfb6a840451ec1fec757636055ba71a99dc1f1f1a348e7735058125688a62b2433307706fa8f75310a1ba887a75e3a3535b69c413b0a9621c633f52a8c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUCxKgAAoJEJOE+m71LUu6aEkP+weGXZZPYE3ea4R8Q0rd9tBT
-w3LTlu1eYokAFC7woRBd0Od6edJFg3NA36mziY3iCrVmO3NxTPLtr0JUKdRytv/3
-cdr79uYGh+TcnK+1g8O/tDM+dSDpoj1+EpPWMzrB2xqSs9TOg6wvCpJBZ/LqjTz/
-62JCmmQI80vTUEr3MrS5Gz2fSgg8U5rhl7cVnv7++nt4XSebpnkfNDcnLVjSmhrq
-hrShtpjMLgymScU8aH1Jxp32MQfmMHtx7rluyLGtuCeyc8BA0UjbcNgwKG04ApT8
-sIR43DEyumfjOM6BHvttUWmSahn7o9K1LecbEUMLsnauPY/fwV//A3nuyU7IZeL+
-pqOyupD+loWrPkiKwLgmmpjL3DmrbC5vUNxEBiCGHB5tHRRvbimXnBZneoQmBC8V
-JPmAU/nq+UbFt0yllyWKALgAtKZxMLqhQ2IcN5YsDIZpKd51zpXxdSJtU/AENuzB
-m/8DPMTy1GiDCBENhG7gve/wGaxAl9nw+e+aUVp8bxDTXghO1NHHgeVp8td3LpeP
-7F9cuCQWIYml5auegE1PAtFvZGp7sssGiT1SEXWjtWsE7bl3mclsJQgZn5CdNIJD
-9lC9xb1r4nzaEjRq8MOoFYy52ZzpAjERUfBtku0IxxHmZ3TDgFEJbYXXZXnBLRmL
-uDjO8obYoN0K96IUPklo
-=Epmv
+iQIcBAEBCAAGBQJUE4q+AAoJEJOE+m71LUu6VocP/R1Be0laFAHSPTS5DV8K6oT8
++sZ39aJ3IXTfL3H947swV2jPI8gmWBw3xvH5Gik/cThBYDtHx4ttTsG2wD+Oh57e
+XT9F3usFDr1YEcXSQpWXpq0pzJea4CVxypj8kvVx+gt2EHA+6l56trQSRCNnpq1l
+g1jp7Yq5Vde9eWk8BXyC2EDOfrC7X1reevMapwU8hFKEIOuuNhK84HbfBJzj2Deq
+d19IQON5HD/oErzrUQ13t4bZ85EGv/HEpWhI6wpSibbAcEJy/KHMiOGaIjM5VVbJ
+iKDWLJC9s1nWyF4pC94rH/+FGxYscupDWBt/EUS89FjH06pXx6BJcGWbG+ALxkBc
+1sylaUK4g/+4MGorTb7bSmUWT8lOTDA/BUeuWqIDv92FXWZwa+IL2iQMvidLV7bP
+WPNL/PoDUhdx9iDJNBk9g40jF1zZVh0sbzgQZwz1JKCJuq3uBsDdPwpqqejwE/He
+frkMtLwQcz0QaysBMFGrdaSRDAEUxjpFu53j660nvpHTcSUQWS0zBfJbTUzwi+Y2
+buFy8H6G9AdfX5pHVJa2kIJ4MXlP0psHxlOSlZvDerTYp5nVgXg31Bsapm9vgIL8
+mGXpO717Y9Q2RMDTbMVj5vJv9tnmMVnQOoPnCJGObkvO9dYdVwYScnSrFj65fUk7
+Hi5oN1oUUuFVo8Hw9jT7
+=HCgw
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.5.7_rc.ebuild b/net-misc/tor/tor-0.2.5.7_rc.ebuild
new file mode 100644
index 000000000000..f6dbcc2ebcfc
--- /dev/null
+++ b/net-misc/tor/tor-0.2.5.7_rc.ebuild
@@ -0,0 +1,99 @@
+# 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.7_rc.ebuild,v 1.1 2014/09/13 00:04: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 ~x86-fbsd"
+IUSE="-bufferevents +ecc nat-pmp selinux stats 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 )
+	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) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage)
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r6 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
+}