commit: 05f750bd6f10187b4d6c966d3a77656bbb448d72 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Mon Oct 19 11:09:45 2015 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Mon Oct 19 11:09:52 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05f750bd
net-misc/vtun: drop old version Package-Manager: portage-2.2.23 net-misc/vtun/Manifest | 1 - .../vtun-3.0.2-build-racing-condition-fix.patch | 17 ----- net-misc/vtun/files/vtun-3.0.2-includes.patch | 72 ---------------------- net-misc/vtun/vtun-3.0.2-r2.ebuild | 54 ---------------- 4 files changed, 144 deletions(-) diff --git a/net-misc/vtun/Manifest b/net-misc/vtun/Manifest index 5e43678..3ef73fe 100644 --- a/net-misc/vtun/Manifest +++ b/net-misc/vtun/Manifest @@ -1,2 +1 @@ -DIST vtun-3.0.2.tar.gz 125777 SHA256 db26d4dbc35a2b3d65519f68b8ae55c80d7ec4e6569aeec7a432aa82f24c56d6 SHA512 1cf15ca7856c74318f921d9a6c4b47b10fd1aa69e12a223d41c6c41e570333beb825d37d3aea4217d305bb37f53c5beff70081079516d809068f8024dc8a039f WHIRLPOOL ee72023902f2e4688ac84c0e1d9c5a3ad6982fb847dcf162ecd2f12efac0abeaeb11344b0a34322a4ad6f0adabcd986dff9546f98174a7f201c9b87e5ccb5c72 DIST vtun-3.0.3.tar.gz 130051 SHA256 69dcbe4f8c5ce7d91b4150a6309e536d03b61841169746ca5788413ac7edb9cb SHA512 5fa789d08b556f97492b89515a89c2322c4b0a8fa95bd1035f5ed19061b3654a6a36a9911792096ac872ae9ae5451848cab87d0343dc0ffc064affea1f7d0d54 WHIRLPOOL 8939c132622d4833a8780003548850103c8f35cabd25b38198a254200a80747b57edba327b4ab91b6af954542d2605a5f2d9dda42a64218a5e0a586fe5705475 diff --git a/net-misc/vtun/files/vtun-3.0.2-build-racing-condition-fix.patch b/net-misc/vtun/files/vtun-3.0.2-build-racing-condition-fix.patch deleted file mode 100644 index 6fa7652..0000000 --- a/net-misc/vtun/files/vtun-3.0.2-build-racing-condition-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- Makefile.in.orig 2012-06-12 00:20:24.359206241 +0400 -+++ Makefile.in 2012-06-12 00:22:46.735301510 +0400 -@@ -60,10 +60,12 @@ - vtund: $(OBJS) - $(CC) $(CFLAGS) -o vtund $(OBJS) $(LFD_OBJS) $(LDFLAGS) - --cfg_file.tab.c: cfg_file.y cfg_kwords.h config.h -+cfg_file.tab.h: - $(YACC) $(YACCFLAGS) -b cfg_file cfg_file.y - --cfg_file.lex.c: cfg_file.l cfg_kwords.h config.h -+cfg_file.tab.c: cfg_file.y cfg_kwords.h config.h cfg_file.tab.h -+ -+cfg_file.lex.c: cfg_file.l cfg_kwords.h config.h cfg_file.tab.h - $(LEX) $(LEXFLAGS) cfg_file.l > cfg_file.lex.c - - depend: diff --git a/net-misc/vtun/files/vtun-3.0.2-includes.patch b/net-misc/vtun/files/vtun-3.0.2-includes.patch deleted file mode 100644 index 8634a65..0000000 --- a/net-misc/vtun/files/vtun-3.0.2-includes.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/lfd_encrypt.c 2008-01-07 23:35:32.000000000 +0100 -+++ b/lfd_encrypt.c 2010-09-18 04:53:31.000000000 +0200 -@@ -44,6 +44,7 @@ - #include <strings.h> - #include <string.h> - #include <time.h> -+#include <arpa/inet.h> /* htonl() */ - - #include "vtun.h" - #include "linkfd.h" ---- a/lib.c 2008-01-07 23:35:40.000000000 +0100 -+++ b/lib.c 2010-09-18 04:52:51.000000000 +0200 -@@ -34,6 +34,7 @@ - #include <sys/wait.h> - #include <syslog.h> - #include <errno.h> -+#include <time.h> /* nanosleep() */ - - #include "vtun.h" - #include "linkfd.h" ---- a/lib.h 2008-01-07 23:35:41.000000000 +0100 -+++ b/lib.h 2010-09-18 04:56:50.000000000 +0200 -@@ -26,6 +26,7 @@ - #include <sys/types.h> - #include <signal.h> - #include <errno.h> -+#include <unistd.h> /* read(), write() */ - - #ifdef HAVE_LIBUTIL_H - #include <libutil.h> ---- a/vtun.h 2008-01-07 23:36:07.000000000 +0100 -+++ b/vtun.h 2010-09-18 04:56:08.000000000 +0200 -@@ -219,5 +219,9 @@ - int tunnel(struct vtun_host *host); - int read_config(char *file); - struct vtun_host * find_host(char *host); -+int send_msg(int len, char *in, char **out); -+int send_ib_mesg(int *len, char **in); -+int recv_msg(int len, char *in, char **out); -+int recv_ib_mesg(int *len, char **in); - - #endif ---- a/lock.c 2008-01-07 23:35:50.000000000 +0100 -+++ b/lock.c 2010-09-18 05:01:21.000000000 +0200 -@@ -32,6 +32,7 @@ - #include <sys/types.h> - #include <signal.h> - #include <errno.h> -+#include <time.h> /* nanosleep() */ - - #include "vtun.h" - #include "linkfd.h" ---- a/server 2008-01-07 23:36:01.000000000 +0100 -+++ b/server.c 2010-09-18 05:02:45.000000000 +0200 -@@ -49,6 +49,7 @@ - #include "auth.h" - - #include "compat.h" -+#include "netlib.h" /* generic_addr() */ - - static volatile sig_atomic_t server_term; - static void sig_term(int sig) ---- a/lfd_shaper.c 2008-01-07 23:35:36.000000000 +0100 -+++ b/lfd_shaper.c 2010-09-18 05:07:12.000000000 +0200 -@@ -27,6 +27,7 @@ - #include <stdlib.h> - #include <sys/time.h> - #include <syslog.h> -+#include <time.h> /* nanosleep() */ - - #include "vtun.h" - #include "linkfd.h" diff --git a/net-misc/vtun/vtun-3.0.2-r2.ebuild b/net-misc/vtun/vtun-3.0.2-r2.ebuild deleted file mode 100644 index b9f1472..0000000 --- a/net-misc/vtun/vtun-3.0.2-r2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils linux-info - -DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -HOMEPAGE="http://vtun.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ~sparc x86" -IUSE="lzo socks5 ssl zlib" - -RDEPEND="ssl? ( dev-libs/openssl ) - lzo? ( dev-libs/lzo:2 ) - zlib? ( sys-libs/zlib ) - socks5? ( net-proxy/dante )" -DEPEND="${RDEPEND} - sys-devel/bison" - -DOCS="ChangeLog Credits FAQ README README.Setup README.Shaper TODO" - -CONFIG_CHECK="~TUN" - -src_prepare() { - sed -i Makefile.in \ - -e '/^LDFLAGS/s|=|+=|g' \ - || die "sed Makefile" - epatch "${FILESDIR}"/${P}-includes.patch - # remove unneeded checking for /etc/vtund.conf - epatch "${FILESDIR}"/${P}-remove-config-presence-check.patch - # fix build racing condition with bison and lex files, wrt bug #364923 - epatch "${FILESDIR}"/${P}-build-racing-condition-fix.patch -} - -src_configure() { - econf \ - $(use_enable ssl) \ - $(use_enable zlib) \ - $(use_enable lzo) \ - $(use_enable socks5 socks) \ - --enable-shaper -} - -src_install() { - default - newinitd "${FILESDIR}"/vtun.rc vtun - insinto etc - doins "${FILESDIR}"/vtund-start.conf -}