Version bump alpha and remove older one

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

7 files changed, 20 insertions, 130 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index a1cc2359932e..20ba06605009 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.323 2012/03/23 01:00:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.324 2012/03/27 15:15:05 blueness Exp $
+
+*tor-0.2.3.13_alpha (27 Mar 2012)
+
+  27 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  -files/tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch,
+  -tor-0.2.3.12_alpha-r1.ebuild, -tor-0.2.3.12_alpha-r2.ebuild,
+  -files/tor-0.2.3.12_alpha-fix-miniupnpc-1.6.patch,
+  -files/tor-0.2.3.12_alpha-fix-tor-fw-helper-natpmp.patch,
+  +tor-0.2.3.13_alpha.ebuild,
+  +files/tor-0.2.3.13_alpha-fix-miniupnpc-1.6.patch:
+  Version bump alpha and remove older one
 
 *tor-0.2.3.12_alpha-r2 (23 Mar 2012)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index b8442aa086b4..9218fd380a64 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -3,27 +3,24 @@ Hash: SHA256
 
 AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
 AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
-AUX tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch 772 RMD160 74d92ed8018367b9a1b054c47eb8ddd07effc0ac SHA1 d271d6a3f8d0fa290c304cf0af4c9760cab4b232 SHA256 d96d6c3bcf3e8457ba6f1f5f9533b4f9f4ac14576530c5e87588dbb3d416ea2b
-AUX tor-0.2.3.12_alpha-fix-miniupnpc-1.6.patch 4361 RMD160 d0f75a53155bf2efb3252c111fee3e7a59811fc6 SHA1 82071da7a643b3e0e8f454f13900cebb50b13639 SHA256 02c78146f6140c24b86c1bbe3ebbd74cb8624ce7bcc638e3d9c34345140d595f
-AUX tor-0.2.3.12_alpha-fix-tor-fw-helper-natpmp.patch 414 RMD160 03a9a68b76ae280197f2ba65d0cde665c4cbd518 SHA1 1789623619698512fef9a5fd8d3169111cce7772 SHA256 7db246ed6374a5051518ffba3d29853619358ebf5ad87005e7a6ba4417d40e37
+AUX tor-0.2.3.13_alpha-fix-miniupnpc-1.6.patch 4361 RMD160 d0f75a53155bf2efb3252c111fee3e7a59811fc6 SHA1 82071da7a643b3e0e8f454f13900cebb50b13639 SHA256 02c78146f6140c24b86c1bbe3ebbd74cb8624ce7bcc638e3d9c34345140d595f
 AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
 AUX tor.initd-r6 1627 RMD160 2af137e60ce41bdca06bb254768808f468bbafc4 SHA1 20f2f3af059a98ba0c0880b3eb7c94c77f09d922 SHA256 49da1b5f267927023bc092adcf89d406ec294584039d6bca6b7aea0a9e7c4c4f
 AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738
 AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d46a2 SHA1 01ebc6c28b4d1753266bf34ef72de92937865c4f SHA256 b60b3f454eb0d475c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14
 DIST tor-0.2.1.32.tar.gz 2592736 RMD160 1aebc22936e1ec13d18bf4ff19a51c6c1ffd4ec1 SHA1 7f1cbd590672eb16f39567ab47bd7f12d7e61422 SHA256 fafdcf330acd84fb5d09845d73d36f2180cd5ea2170c1fefd30c5d2aa98d288d
 DIST tor-0.2.2.35.tar.gz 2787536 RMD160 9986f0892d410de9f3d496a5db6de29288295e92 SHA1 98408e08c0c616c4c7669d018a66c55fc660cad3 SHA256 f141a41fffd31494a0f96ebbb6b999eab33ce62d5c31f81222a0acd034adbf3a
-DIST tor-0.2.3.12-alpha.tar.gz 2992437 RMD160 6cfbffe88da3d211a9cafa12721bfbae923498e1 SHA1 fd36a0be8b4c907f4b48ad01376f50e864ae47ab SHA256 8ea4f4c6be079fc9aac9555eb17948b4c9e4a6d9348f2e531f50f4e5460ae912
+DIST tor-0.2.3.13-alpha.tar.gz 3088897 RMD160 2f1a5a1e39502d10d6cf59187073278e02be9f4c SHA1 a40d00ae707e7eba5d20b3981ff1210e1e77e5e1 SHA256 2c4bf190ebc78861ffd89b154b2b370825fc5aa8694b59a87fd7f2f47a1345ec
 EBUILD tor-0.2.1.32.ebuild 1871 RMD160 daca848537e3250c73f0040b8285ff7e6197dce5 SHA1 347d28b6970c131112fbed36c9848db28635c552 SHA256 884c61abe867298dd784df1b7ecec1fadc9e42c56821bdfed05eb7eca41cee0b
 EBUILD tor-0.2.2.35-r1.ebuild 2125 RMD160 532bdc4fa348c24addac51c91547eb3ac90180da SHA1 b73b0bc09b3ecfaf429ee30eb26bf9a03009001c SHA256 cf5daaa2db12c5ec32f837412725919fb398e1c8bbef0788c98eed35de365ec4
 EBUILD tor-0.2.2.35.ebuild 2084 RMD160 320d0efbc050065e19f1e5f6538ae50bed45caec SHA1 45a7ee02a309f55edd46c346ec45ca8f90efdb3c SHA256 2048e4950cbf4c5e3a72bb0ba3838b48824ed8cb78073fd91e2ef210882625dc
-EBUILD tor-0.2.3.12_alpha-r1.ebuild 2336 RMD160 dfb8fef2c9173e21550dcbaa25fc944548134fed SHA1 faaf308c51c65607fc14cf785ec6e1b2f147ee6b SHA256 18e54791ec4993e28cb8b563e8e8a79bd31f7f806da86dfbe54f99bd59bc26e1
-EBUILD tor-0.2.3.12_alpha-r2.ebuild 2405 RMD160 cb0e6cc62deeafb6ad9f7b83d3c488c420f1c770 SHA1 0021da3d88374ff592ad2509c51ba4e8c76271ed SHA256 f223aca912a6f8ed69b6801b3cacd6eb1e1c89fd85edc2ed01f6ed76e1620f73
-MISC ChangeLog 48061 RMD160 a94387b8543836aabd2556a2f3c6f1f392ea9daa SHA1 4ba49700af7f362f2f92c1aae9e526ca63a5c410 SHA256 a392d73c337474bb5078212b9ab1d313b154f6bafeca67e62de404fa87127907
+EBUILD tor-0.2.3.13_alpha.ebuild 2344 RMD160 ae7bcc88fa54d4619e3422166a7b4883f34d52d6 SHA1 acb07dbac4aae1ffd3fbc7eb4a70b681ed41e238 SHA256 cb29058b0aa4f90eed65e34d9e47ab8a0c73bd701fe5d7983481ad37b4453367
+MISC ChangeLog 48514 RMD160 8c894d24e31c8e26816f7b552faebe73e5212be7 SHA1 63936fad894624983fd70454058b9f4f27697096 SHA256 b57f988e3237c0fe27aa3ab00eaa4611fbfb2ec26ba5737523f5ae1dac87ccb9
 MISC metadata.xml 596 RMD160 2527172185bb74e5ea6167d56b2e3476c48eb078 SHA1 93be4ae496f77aa63bb77d720f51bf3510798daa SHA256 c7622b255363171fd1b351e14e592beb901d332f976a2e77c409e14ef5ed20bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk9ryzoACgkQl5yvQNBFVTXADgCfbZhMzMWlY1U/ybrBYLOCzaAF
-CKAAn1p6Hs/KLQH96PIeyQo0pOIQlI6+
-=xLkA
+iEYEAREIAAYFAk9x2YMACgkQl5yvQNBFVTX0xgCff85Rs2ucZuMXTNxxrLb83cO2
+9+EAnj4KHVKV/LgdK2uYnQ+rsutFqTkv
+=Inij
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch b/net-misc/tor/files/tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch
deleted file mode 100644
index ab4fccb68906..000000000000
--- a/net-misc/tor/files/tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes a regression in tor-fw-helper-natpmp.c where
-a filedescriptor is incorrectly type tor_socket_t.
-
-See https://trac.torproject.org/projects/tor/ticket/4955
-
-diff -Naur tor-0.2.3.11-alpha.orig/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c tor-0.2.3.11-alpha/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
---- tor-0.2.3.11-alpha.orig/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c	2012-01-21 22:07:30.000000000 -0500
-+++ tor-0.2.3.11-alpha/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c	2012-01-24 07:57:42.000000000 -0500
-@@ -87,7 +87,7 @@
- 
- /** Use select() to wait until we can read on fd. */
- static int
--wait_until_fd_readable(tor_socket_t fd, struct timeval *timeout)
-+wait_until_fd_readable(unsigned int fd, struct timeval *timeout)
- {
-   int r;
-   fd_set fds;
diff --git a/net-misc/tor/files/tor-0.2.3.12_alpha-fix-tor-fw-helper-natpmp.patch b/net-misc/tor/files/tor-0.2.3.12_alpha-fix-tor-fw-helper-natpmp.patch
deleted file mode 100644
index 96532ecfd403..000000000000
--- a/net-misc/tor/files/tor-0.2.3.12_alpha-fix-tor-fw-helper-natpmp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes a regression in tor-fw-helper-natpmp.c where
-a filedescriptor is incorrectly type tor_socket_t.
-
-See https://trac.torproject.org/projects/tor/ticket/4955
-
---- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
-+++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
-@@ -23,6 +23,8 @@
- // debugging stuff
- #include <assert.h>
- 
-+#include "compat.h"
-+
- #include "tor-fw-helper.h"
- #include "tor-fw-helper-natpmp.h"
diff --git a/net-misc/tor/files/tor-0.2.3.12_alpha-fix-miniupnpc-1.6.patch b/net-misc/tor/files/tor-0.2.3.13_alpha-fix-miniupnpc-1.6.patch
index b3b1be263c19..b3b1be263c19 100644
--- a/net-misc/tor/files/tor-0.2.3.12_alpha-fix-miniupnpc-1.6.patch
+++ b/net-misc/tor/files/tor-0.2.3.13_alpha-fix-miniupnpc-1.6.patch
diff --git a/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild b/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild
deleted file mode 100644
index 2276b7862e83..000000000000
--- a/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild,v 1.2 2012/03/08 16:14:22 blueness Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic 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="http://www.torproject.org/dist/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2.0.14
-	nat-pmp? ( net-libs/libnatpmp )
-	upnp? ( <net-libs/miniupnpc-1.6 )
-	selinux? ( sec-policy/selinux-tor )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample.patch
-	epatch "${FILESDIR}"/${P}-fix-tor-fw-helper-natpmp.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 \
-		--enable-asciidoc \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable bufferevents) \
-		$(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)
-}
-
-src_install() {
-	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,TODO} \
-		doc/spec/README
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}
diff --git a/net-misc/tor/tor-0.2.3.12_alpha-r2.ebuild b/net-misc/tor/tor-0.2.3.13_alpha.ebuild
index 4fe4c4d84eb3..b6dc259fd9eb 100644
--- a/net-misc/tor/tor-0.2.3.12_alpha-r2.ebuild
+++ b/net-misc/tor/tor-0.2.3.13_alpha.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.12_alpha-r2.ebuild,v 1.1 2012/03/23 01:00:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.13_alpha.ebuild,v 1.1 2012/03/27 15:15:05 blueness Exp $
 
 EAPI="4"
 
@@ -32,7 +32,6 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/torrc.sample.patch
-	epatch "${FILESDIR}"/${P}-fix-tor-fw-helper-natpmp.patch
 	epatch "${FILESDIR}"/${P}-fix-miniupnpc-1.6.patch
 	eautoreconf
 }