Removed older unstable alpha

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

4 files changed, 10 insertions, 195 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index c5021a3b8fdc..82d2547e361c 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,11 @@
 # 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.328 2012/05/11 13:56:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.329 2012/05/11 14:01:00 blueness Exp $
+
+  11 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  -files/tor-0.2.3.13_alpha-fix-miniupnpc-1.6.patch,
+  -tor-0.2.3.14_alpha.ebuild:
+  Removed older unstable alpha
 
   11 May 2012; Anthony G. Basile <blueness@gentoo.org> tor-0.2.1.32.ebuild,
   tor-0.2.2.35-r1.ebuild, tor-0.2.3.15_alpha.ebuild:
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 12a8b953bdf1..4a2129a4e2b5 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -3,7 +3,6 @@ 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.13_alpha-fix-miniupnpc-1.6.patch 4361 RMD160 d0f75a53155bf2efb3252c111fee3e7a59811fc6 SHA1 82071da7a643b3e0e8f454f13900cebb50b13639 SHA256 02c78146f6140c24b86c1bbe3ebbd74cb8624ce7bcc638e3d9c34345140d595f
 AUX tor-0.2.3.14_alpha-torrc.sample.patch 1365 RMD160 30871feb76cdb52f058db187a62a5a673d185ac5 SHA1 6fdd6765dc8dc0dae21f8c6e774e15e183db877a SHA256 7f8d64e84590a62c4b5b1ef55ffbac32b770eaeb4252ef550e6130af918cf63b
 AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
 AUX tor.initd-r6 1627 RMD160 2af137e60ce41bdca06bb254768808f468bbafc4 SHA1 20f2f3af059a98ba0c0880b3eb7c94c77f09d922 SHA256 49da1b5f267927023bc092adcf89d406ec294584039d6bca6b7aea0a9e7c4c4f
@@ -11,19 +10,17 @@ AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb
 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.14-alpha.tar.gz 3112341 RMD160 9276ea7b2f83ae2ac053a29160a00bfbc5648dd6 SHA1 4c9fff466d6a1042a1950bc0d5ee91688d3f862e SHA256 6dfc447c95af68a48a19e46ae343d07e2d6140e37082f50751892615ec611ca0
 DIST tor-0.2.3.15-alpha.tar.gz 3114021 RMD160 f0dd7e4b1a72e09015989845618f595c29341f17 SHA1 f046afad0445b6c262bf4cf6cf0f285eaca0daab SHA256 09709e82f24edd6c0a039382b230315d3f905106879b853953ae89d59b7f857a
 EBUILD tor-0.2.1.32.ebuild 1891 RMD160 115ecdc0b720f22be014ee4681199e61bd162668 SHA1 f35d2a0712d150824920bb8cc33ded699aec608f SHA256 66cf64f6ddd0f2754f08fac353f10f755290ffec2c70a0f145c394ebcc3d9527
 EBUILD tor-0.2.2.35-r1.ebuild 2145 RMD160 6fc8873a92e03f569ac3b917c4994d7d81354dce SHA1 888ab39619a8afc163804fb3ddefd9dc4fcc25de SHA256 04347d3099af6c683de75434ee7642ec19c8202eb72c8cc57c4ad3748b6c6315
 EBUILD tor-0.2.2.35.ebuild 2084 RMD160 320d0efbc050065e19f1e5f6538ae50bed45caec SHA1 45a7ee02a309f55edd46c346ec45ca8f90efdb3c SHA256 2048e4950cbf4c5e3a72bb0ba3838b48824ed8cb78073fd91e2ef210882625dc
-EBUILD tor-0.2.3.14_alpha.ebuild 2419 RMD160 f4c13454e0da473e598a694d57c864d3f768adef SHA1 7e87af3e81fb6d21274bae877d14413dac23e740 SHA256 1de8a3d3fe17970b2a3229a26e24ad7aba75460e49e04ed2fb759ffb362afdba
 EBUILD tor-0.2.3.15_alpha.ebuild 2365 RMD160 79ba0d72c3d37de83e063287f9b10d5f3e6788c0 SHA1 30b3ea469e1b617ccb0b5c83e8707de385640291 SHA256 44eeb2da40d3adc98d7bcf154ebe19e2f5e9630ccc612709c60bc4075180a54f
-MISC ChangeLog 49184 RMD160 9ea3310d530d6d45a550beab41fdb6195f60c8e1 SHA1 e25c6cd900f3183c9947a99864997569b423a7fa SHA256 bb6a0a882cae35e7806928489d6aa750fb4efcb6901f91765ad265c4b6db3fcc
+MISC ChangeLog 49354 RMD160 f10a5708626a1a1364e1b735752af3d2928992af SHA1 b724b2297cb5ccf7bc9ce4dbcd84615c9c18886d SHA256 c77256c58cac77b4b0b891519dc16dbf37eaa56e0653cd4a9470e5fd106fa579
 MISC metadata.xml 645 RMD160 cb8042919114d631ef70a6f2f5d5e7af8a80aa67 SHA1 d0e41580a1150baec38261022b5ff1b07e4066a3 SHA256 743582b5e621facf5b53d278b936d553d29a1d29bcedf32e818fbe0f967bd102
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk+tGp8ACgkQl5yvQNBFVTU2fgCffURUCoiqA7252HuMaffFpLAj
-mxgAn1sRGZrdnFLhJJiNYOA/wTnS72pn
-=qCZ2
+iEYEAREIAAYFAk+tG6YACgkQl5yvQNBFVTV/9wCeIs3NzwGiEE6xZPW4RuRtGvMb
+tSYAmwZeNQPHxySWMD+jem7ha3uBKtwe
+=6pSX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor-0.2.3.13_alpha-fix-miniupnpc-1.6.patch b/net-misc/tor/files/tor-0.2.3.13_alpha-fix-miniupnpc-1.6.patch
deleted file mode 100644
index b3b1be263c19..000000000000
--- a/net-misc/tor/files/tor-0.2.3.13_alpha-fix-miniupnpc-1.6.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From cc6282b77e6f1284d1381e02511720ae2adc7c96 Mon Sep 17 00:00:00 2001
-From: Anthony G. Basile <blueness@gentoo.org>
-Date: Thu, 22 Mar 2012 12:09:40 -0400
-Subject: [PATCH] Fix compile error against miniupnpc-1.6 when --enable-upnp
-
-The bump from miniupnpc-1.5 to 1.6 changes the definition of
-two functions used by tor-fw-helper-upnp.c, upnpDiscover() and
-UPNP_AddPortMapping().  This patch addresses this and adds a
-check in configure.in for backwards compatibility.
-
-Thanks to Nickolay Kolchin-Semyonov for some hints.
-
-X-Tor-Bug-URL: https://trac.torproject.org/projects/tor/ticket/5434
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=376621
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
- configure.in                                 |   37 +++++++++++++++++++------
- src/tools/tor-fw-helper/tor-fw-helper-upnp.c |    8 +++++
- 2 files changed, 36 insertions(+), 9 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 7415ce8..946f780 100644
---- a/configure.in
-+++ b/configure.in
-@@ -592,15 +592,34 @@ dnl There are no packages for Debian or Redhat as of this patch
- 
- if test "$upnp" = "true"; then
-     AC_DEFINE(MINIUPNPC, 1, [Define to 1 if we are building with UPnP.])
--    TOR_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc $TOR_LIB_WS32 $TOR_LIB_IPHLPAPI],
--        [#include <miniupnpc/miniwget.h>
--         #include <miniupnpc/miniupnpc.h>
--         #include <miniupnpc/upnpcommands.h>],
--        [void upnpDiscover(int delay, const char * multicastif,
--         const char * minissdpdsock, int sameport);],
--        [upnpDiscover(1, 0, 0, 0); exit(0);],
--        [--with-libminiupnpc-dir],
--        [/usr/lib/])
-+
-+    dnl Before we call TOR_SEARCH_LIBRARY we'll do a quick compile test
-+    dnl to see if we have miniupnpc-1.5 or -1.6
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <miniupnpc/miniupnpc.h>],
-+        [upnpDiscover(1, 0, 0, 0);exit(0);])],[miniupnpc15="true"],[miniupnpc15="false"])
-+
-+    if test "$miniupnpc15" = "true" ; then
-+        AC_DEFINE([MINIUPNPC15],[1],[libminiupnpc version 1.5 found])
-+        TOR_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc $TOR_LIB_WS32 $TOR_LIB_IPHLPAPI],
-+            [#include <miniupnpc/miniwget.h>
-+             #include <miniupnpc/miniupnpc.h>
-+             #include <miniupnpc/upnpcommands.h>],
-+            [void upnpDiscover(int delay, const char * multicastif,
-+             const char * minissdpdsock, int sameport);],
-+            [upnpDiscover(1, 0, 0, 0); exit(0);],
-+            [--with-libminiupnpc-dir],
-+            [/usr/lib/])
-+    else
-+        TOR_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc $TOR_LIB_WS32 $TOR_LIB_IPHLPAPI],
-+            [#include <miniupnpc/miniwget.h>
-+             #include <miniupnpc/miniupnpc.h>
-+             #include <miniupnpc/upnpcommands.h>],
-+            [void upnpDiscover(int delay, const char * multicastif,
-+             const char * minissdpdsock, int sameport, int ipv6, int * error);],
-+            [upnpDiscover(1, 0, 0, 0, 0, 0); exit(0);],
-+            [--with-libminiupnpc-dir],
-+            [/usr/lib/])
-+    fi
- fi
- 
- AC_SYS_LARGEFILE
-diff --git a/src/tools/tor-fw-helper/tor-fw-helper-upnp.c b/src/tools/tor-fw-helper/tor-fw-helper-upnp.c
-index 442eae5..ee56f71 100644
---- a/src/tools/tor-fw-helper/tor-fw-helper-upnp.c
-+++ b/src/tools/tor-fw-helper/tor-fw-helper-upnp.c
-@@ -78,7 +78,11 @@ tor_upnp_init(tor_fw_options_t *options, void *backend_state)
-   memset(&(state->data), 0, sizeof(struct IGDdatas));
-   state->init = 0;
- 
-+#ifdef MINIUPNPC15
-   devlist = upnpDiscover(UPNP_DISCOVER_TIMEOUT, NULL, NULL, 0);
-+#else
-+  devlist = upnpDiscover(UPNP_DISCOVER_TIMEOUT, NULL, NULL, 0, 0, NULL);
-+#endif
-   if (NULL == devlist) {
-     fprintf(stderr, "E: upnpDiscover returned: NULL\n");
-     return UPNP_ERR_NODEVICESFOUND;
-@@ -178,7 +182,11 @@ tor_upnp_add_tcp_mapping(tor_fw_options_t *options, void *backend_state)
-   r = UPNP_AddPortMapping(state->urls.controlURL,
-                           state->data.first.servicetype,
-                           external_port_str, internal_port_str,
-+#ifdef MINIUPNPC15
-                           state->lanaddr, UPNP_DESC, "TCP", 0);
-+#else
-+                          state->lanaddr, UPNP_DESC, "TCP", 0, 0);
-+#endif
-   if (r != UPNPCOMMAND_SUCCESS)
-     return UPNP_ERR_ADDPORTMAPPING;
- 
--- 
-1.7.3.4
-
diff --git a/net-misc/tor/tor-0.2.3.14_alpha.ebuild b/net-misc/tor/tor-0.2.3.14_alpha.ebuild
deleted file mode 100644
index 2c70e50c4d76..000000000000
--- a/net-misc/tor/tor-0.2.3.14_alpha.ebuild
+++ /dev/null
@@ -1,88 +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.14_alpha.ebuild,v 1.1 2012/04/24 12:16:46 blueness Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic versionator autotools
-
-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 web"
-
-DEPEND="dev-libs/openssl
-	sys-libs/zlib
-	>=dev-libs/libevent-2.0.14
-	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}"/${P}-torrc.sample.patch
-	epatch "${FILESDIR}"/${PN}-0.2.3.13_alpha-fix-miniupnpc-1.6.patch
-	eautoreconf
-}
-
-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) \
-		$(use_enable web tor2web-mode)
-}
-
-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
-}