Remove older versions

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

7 files changed, 11 insertions, 315 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 3278bd2bbdea..a0d01c9ec687 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tinc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.36 2012/06/26 13:52:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.37 2012/06/26 13:59:16 blueness Exp $
+
+  26 Jun 2012; Anthony G. Basile <blueness@gentoo.org> -tinc-1.0.16-r4.ebuild,
+  -tinc-1.0.17.ebuild, -files/fix-compile-vde-uml.patch,
+  -files/fix-missing-vde.patch, metadata.xml:
+  Remove older versions
 
 *tinc-1.0.19 (26 Jun 2012)
 
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index 049e12a05601..0b18ecfc7d84 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -2,26 +2,20 @@
 Hash: SHA256
 
 AUX fix-ac-arg-enable.patch 2817 RMD160 db4c7d2956bb78f38640fc6a90818c080cf5bbfc SHA1 df00a50baa730977459c43a1925639f194ffff5e SHA256 ee10420d0d11cdde2baad52ea038724ce598e53eef15f5ad7e582c4d8c826486
-AUX fix-compile-vde-uml.patch 1321 RMD160 e75a27f2420f416bba858a6ff64f1f1d455b29f1 SHA1 6a2bd7ccb7780e61c7f791dc4c76951e50811c95 SHA256 bd31ba111affbabb7c947ce08cf13c15e78620788e50515594cf2ab48a13f09f
-AUX fix-missing-vde.patch 3667 RMD160 a433b5ddb8c3b9a6b22b2471852054efeedddf50 SHA1 071c5b0c40c9f9a7b1676683a9147fe4a4ffd4cf SHA256 47eb44c5c4ed3eefae69c1b5a59f94b9afc31eff62f281ca9211cea422664e61
 AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad
 AUX tincd.1 1783 RMD160 827d2367b78ac717b9d68d877bd045e3bc372ccf SHA1 d3ebf5a4032bf6fdb8b317042932534011baf0d1 SHA256 47261d991a86ce73d3eff6870470139247f6ad31e231fc2c436cb5926bf16d35
 AUX tincd.conf.1 157 RMD160 72e67087f4f88a4958a54eb8cf8270cdfebe4339 SHA1 82dda948f1982c9289d6732f20b7e0da33ca2f6a SHA256 eef883d3cf4ba8376f6b37518f39df103b0d999c5faa2a82653926ce50255060
 AUX tincd.lo.1 1387 RMD160 663374de1d40861601570b187995063bfce3b19d SHA1 4cafa66cc55c36b718b569da15ab79e9fb4aa7a6 SHA256 6f820391dff70f1bb765ab885efb35dc21968789a2208fd679fe984406a02342
-DIST tinc-1.0.16.tar.gz 519460 RMD160 a4d44bd90d4c19f4cc8bc27c1f92a8fb437698d3 SHA1 6700e63c548228b1675f243f0075f98511f1e3a8 SHA256 f20863cb1155ba4e4dd4cf16c35a5d706cd326eb8fe62b8b0a31fd57241a5400
-DIST tinc-1.0.17.tar.gz 541057 RMD160 bc00951499d832a907fc252fef4f7381046b2deb SHA1 3e07c53978868766bf805397efe5842e686464d8 SHA256 016e3162b6a79730526b8eb464d89d2c5e1139b4f2923e7c87e96662ebcc4745
 DIST tinc-1.0.18.tar.gz 545104 RMD160 3ef30cd81bd72600ad1803c07c571e33f4cfed31 SHA1 e5ab3e880ced785b6774b9851b48e73604cf3627 SHA256 d4ed38a65ae46ee8ca7daaa282acc634ba8d50e5795cb51645097bbae9b843a9
 DIST tinc-1.0.19.tar.gz 550031 RMD160 80ad46a2b295eab3f3af916fc7d15ddb365c445a SHA1 3ae326a060a88f5a9d2a1b8fdab26671b691f8ab SHA256 509ebb063399d436e9df0a6ccb03ca1c1190a948662ddeef60bb803684ec76a0
-EBUILD tinc-1.0.16-r4.ebuild 1911 RMD160 c95042935b31f2efdb9eaa3cdf12a0687ca678e0 SHA1 4343cb7406c309581fb7e5ca4270703820c11403 SHA256 0777921b42dfb2202fbb1725311b88f910234be25c45440b8e04d18b18aa27f6
-EBUILD tinc-1.0.17.ebuild 1272 RMD160 59dba5ca338b0cfe7bc415a09578227dc5950827 SHA1 4ca73aace2b4c6ade3282e34290756249ee2a7c4 SHA256 d6b8ca9bab09ce250f47d8eb61be9d5f5b30c0d90bd4ce10737d5d7d0a1068e8
 EBUILD tinc-1.0.18.ebuild 1326 RMD160 7ca21ed7b5190c8241df2b09fe774e116c2679b0 SHA1 90249f629eb16680ac1a4af6b958a0cc0be514ba SHA256 99a10eaed31f18273288f398ef7fd6f53e8f2ef6def4094275f6477f6bc734da
 EBUILD tinc-1.0.19.ebuild 1223 RMD160 97cc809568b33002e79b66647750a3b304775ea7 SHA1 3f95ec589a903098cea7c9533f9c14ecebef3b8b SHA256 6a227cf62876be690f2dfab5b22d4faec9e70dbbb797fd53bd80283efd3dcebb
-MISC ChangeLog 6072 RMD160 821ccd39a469353601ce56a0167c68e29d4dc521 SHA1 7739d7113c61471825fad6ab7e6f9143b3cae92e SHA256 e2661a151d1f65de199c77033021235b0bf29cc4f5e9e448b13f6ea45c6083e3
-MISC metadata.xml 552 RMD160 5c5409d1828ecc369ae2de83f0c37561650ac554 SHA1 5269ecc96eb0fd5ecc66b26570f34ceb90d490df SHA256 7ce6544bd535e945c4c3da2c159fc5c1f4a3cc9f36fd14375fa301b592506fc8
+MISC ChangeLog 6279 RMD160 893f40c52481d3d9c3be68169befe30cfadf0bd3 SHA1 1484b1406420c36d448c89a69cb2246ba1793365 SHA256 f484796af44235c7462303ff36d2a962875210909e383155261ead6f132752da
+MISC metadata.xml 494 RMD160 79e85bc046cfa560823bfa15f189a04826c793c4 SHA1 c801e1dbc8b4699ee1c55870dccfbc753cd18830 SHA256 d99f82d792eff2fd721fe34ce221d1a6c9296806d413312037ef99a6e3e18c50
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAk/pvrEACgkQl5yvQNBFVTW8yACcDp8FsiMdKllLzx68Ny3tqxY7
-TzMAn2xYcxuInfLQhV8HMFP7DJK7FMJp
-=7fRv
+iEYEAREIAAYFAk/pwEcACgkQl5yvQNBFVTU3fQCfSyD1nn7cDSa/qovsNtv3s5Oz
+czwAn0U5+Kb0HtCWSiYla/OOkFaV3r1J
+=Wtbd
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tinc/files/fix-compile-vde-uml.patch b/net-misc/tinc/files/fix-compile-vde-uml.patch
deleted file mode 100644
index acc30c9f7522..000000000000
--- a/net-misc/tinc/files/fix-compile-vde-uml.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/src/uml_socket/device.c b/src/uml_socket/device.c
-index a2da757..a371e7b 100644
---- a/src/uml_socket/device.c
-+++ b/src/uml_socket/device.c
-@@ -28,6 +28,7 @@
- #include "logger.h"
- #include "utils.h"
- #include "route.h"
-+#include "xalloc.h"
- 
- int device_fd = -1;
- static int listen_fd = -1;
-@@ -40,7 +41,7 @@ char *iface = NULL;
- static char *device_info;
- 
- extern char *identname;
--extern bool running;
-+extern volatile bool running;
- 
- static uint64_t device_total_in = 0;
- static uint64_t device_total_out = 0;
-@@ -175,7 +176,7 @@ bool read_packet(vpn_packet_t *packet) {
- 	switch(state) {
- 		case 0: {
- 			struct sockaddr sa;
--			int salen = sizeof sa;
-+			socklen_t salen = sizeof sa;
- 
- 			request_fd = accept(listen_fd, &sa, &salen);
- 			if(request_fd < 0) {
-@@ -244,6 +245,10 @@ bool read_packet(vpn_packet_t *packet) {
- 
- 			return true;
- 		}
-+
-+		default:
-+			logger(LOG_ERR, "Invalid value for state variable in " __FILE__);
-+			abort();
- 	}
- }
- 
-diff --git a/src/vde/device.c b/src/vde/device.c
-index 63171f9..74cf3b6 100644
---- a/src/vde/device.c
-+++ b/src/vde/device.c
-@@ -39,7 +39,7 @@ char *iface = NULL;
- static char *device_info;
- 
- extern char *identname;
--extern bool running;
-+extern volatile bool running;
- 
- static uint64_t device_total_in = 0;
- static uint64_t device_total_out = 0;
diff --git a/net-misc/tinc/files/fix-missing-vde.patch b/net-misc/tinc/files/fix-missing-vde.patch
deleted file mode 100644
index 6cf4d09a9533..000000000000
--- a/net-misc/tinc/files/fix-missing-vde.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur src/vde/device.c src/vde/device.c
---- src/vde/device.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/vde/device.c	2011-12-21 11:20:34.000000000 -0500
-@@ -0,0 +1,134 @@
-+/*
-+    device.c -- VDE plug
-+    Copyright (C) 2011 Guus Sliepen <guus@tinc-vpn.org>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License along
-+    with this program; if not, write to the Free Software Foundation, Inc.,
-+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+*/
-+
-+#include "system.h"
-+
-+#include <libvdeplug_dyn.h>
-+
-+#include "conf.h"
-+#include "device.h"
-+#include "net.h"
-+#include "logger.h"
-+#include "utils.h"
-+#include "route.h"
-+#include "xalloc.h"
-+
-+int device_fd = -1;
-+static struct vdepluglib plug;
-+static struct vdeconn *conn = NULL;
-+static int port = 0;
-+static char *group = NULL;
-+char *device = NULL;
-+char *iface = NULL;
-+static char *device_info;
-+
-+extern char *identname;
-+extern bool running;
-+
-+static uint64_t device_total_in = 0;
-+static uint64_t device_total_out = 0;
-+
-+bool setup_device(void) {
-+	libvdeplug_dynopen(plug);
-+
-+	if(!plug.dl_handle) {
-+		logger(LOG_ERR, "Could not open libvdeplug library!");
-+		return false;
-+	}
-+
-+	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-+		xasprintf(&device, LOCALSTATEDIR "/run/vde.ctl");
-+
-+	get_config_string(lookup_config(config_tree, "Interface"), &iface);
-+
-+	get_config_int(lookup_config(config_tree, "VDEPort"), &port);
-+
-+	get_config_string(lookup_config(config_tree, "VDEGroup"), &group);
-+
-+	device_info = "VDE socket";
-+
-+	struct vde_open_args args = {
-+		.port = port,
-+		.group = group,
-+		.mode = 0700,
-+	};
-+
-+	conn = plug.vde_open(device, identname, &args);
-+	if(!conn) {
-+		logger(LOG_ERR, "Could not open VDE socket %s", device);
-+		return false;
-+	}
-+
-+	device_fd = plug.vde_datafd(conn);
-+
-+	logger(LOG_INFO, "%s is a %s", device, device_info);
-+
-+	if(routing_mode == RMODE_ROUTER)
-+		overwrite_mac = true;
-+
-+	return true;
-+}
-+
-+void close_device(void) {
-+	if(conn)
-+		plug.vde_close(conn);
-+
-+	if(plug.dl_handle)
-+		libvdeplug_dynclose(plug);
-+
-+	free(device);
-+
-+	free(iface);
-+}
-+
-+bool read_packet(vpn_packet_t *packet) {
-+	int lenin = plug.vde_recv(conn, packet->data, MTU, 0);
-+	if(lenin <= 0) {
-+		logger(LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
-+		running = false;
-+		return false;
-+	}
-+
-+	packet->len = lenin;
-+	device_total_in += packet->len;
-+	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s", packet->len, device_info);
-+
-+	return true;
-+}
-+
-+bool write_packet(vpn_packet_t *packet) {
-+	if(plug.vde_send(conn, packet->data, packet->len, 0) < 0) {
-+		if(errno != EINTR && errno != EAGAIN) {
-+			logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
-+			running = false;
-+		}
-+
-+		return false;
-+	}
-+
-+	device_total_out += packet->len;
-+
-+	return true;
-+}
-+
-+void dump_device_stats(void) {
-+	logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
-+	logger(LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
-+	logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
-+}
diff --git a/net-misc/tinc/metadata.xml b/net-misc/tinc/metadata.xml
index ef57095d3dc2..35d93a0096e3 100644
--- a/net-misc/tinc/metadata.xml
+++ b/net-misc/tinc/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<longdescription>tinc is an easy to configure VPN implementation.</longdescription>
 	<use>
-		<flag name='raw'> Enable support for Raw Sockets</flag>
 		<flag name='uml'> Enable support for User Mode Linux Sockets</flag>
 		<flag name='vde'> Enable Virtual Distributed Ethernet (VDE) based networking</flag>
 	</use>
diff --git a/net-misc/tinc/tinc-1.0.16-r4.ebuild b/net-misc/tinc/tinc-1.0.16-r4.ebuild
deleted file mode 100644
index 0fa89826361e..000000000000
--- a/net-misc/tinc/tinc-1.0.16-r4.ebuild
+++ /dev/null
@@ -1,66 +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/tinc/tinc-1.0.16-r4.ebuild,v 1.2 2012/03/11 14:08:26 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo +zlib raw uml vde"
-
-DEPEND=">=dev-libs/openssl-0.9.7c
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( >=sys-libs/zlib-1.1.4-r2 )
-	vde? ( net-misc/vde )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local COUNT=0
-	use raw && COUNT=$(($COUNT+1))
-	use uml && COUNT=$(($COUNT+1))
-	use vde && COUNT=$(($COUNT+1))
-
-	if [[ ${COUNT} -gt 1 ]]; then
-		eerror
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror
-		eerror "\033[1;31m If you selected either raw, uml or vde,\033[1;31m"
-		eerror "\033[1;31m you can select only one.\033[1;31m"
-		eerror
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror
-		die
-	fi
-
-	epatch "${FILESDIR}"/fix-missing-vde.patch
-	epatch "${FILESDIR}"/fix-compile-vde-uml.patch
-}
-
-src_configure() {
-	econf  --enable-jumbograms $(use_enable lzo) $(use_enable zlib)
-	use raw && cd "${S}"/src && ln -sf raw_socket/device.c
-	use uml && cd "${S}"/src && ln -sf uml_socket/device.c
-	use vde && cd "${S}"/src && ln -sf vde/device.c
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodir /etc/tinc
-	dodoc AUTHORS NEWS README THANKS
-	newinitd "${FILESDIR}"/tincd.1 tincd
-	newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf.1 tincd
-}
-
-pkg_postinst() {
-	elog "This package requires the tun/tap kernel device."
-	elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}
diff --git a/net-misc/tinc/tinc-1.0.17.ebuild b/net-misc/tinc/tinc-1.0.17.ebuild
deleted file mode 100644
index 7605489e8160..000000000000
--- a/net-misc/tinc/tinc-1.0.17.ebuild
+++ /dev/null
@@ -1,44 +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/tinc/tinc-1.0.17.ebuild,v 1.1 2012/03/11 14:08:26 blueness Exp $
-
-EAPI="4"
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo vde +zlib"
-
-DEPEND=">=dev-libs/openssl-0.9.7
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
-RDEPEND="${DEPEND}
-	vde? ( net-misc/vde )"
-
-src_configure() {
-	# The new DeviceType option can now be used to select dummy and
-	# raw socket, or UML and VDE devices without having to recompile.
-	econf \
-		--enable-jumbograms \
-		$(use_enable lzo) \
-		$(use_enable zlib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodir /etc/tinc
-	dodoc AUTHORS NEWS README THANKS
-	newinitd "${FILESDIR}"/tincd.1 tincd
-	newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf.1 tincd
-}
-
-pkg_postinst() {
-	elog "This package requires the tun/tap kernel device."
-	elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}