Respect LDFLAGS (bug #335524). Fix compiler warnings.

Package-Manager: portage-2.2_rc83/cvs/Linux i686

4 files changed, 135 insertions, 2 deletions

diff --git a/net-misc/vtun/ChangeLog b/net-misc/vtun/ChangeLog
index cea75e32cd9e..2c76fc35cf54 100644
--- a/net-misc/vtun/ChangeLog
+++ b/net-misc/vtun/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vtun
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.40 2010/05/18 13:39:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.41 2010/09/18 03:12:18 jer Exp $
+
+*vtun-3.0.2-r1 (18 Sep 2010)
+
+  18 Sep 2010; Jeroen Roovers <jer@gentoo.org> +vtun-3.0.2-r1.ebuild,
+  +files/vtun-3.0.2-includes.patch:
+  Respect LDFLAGS (bug #335524). Fix compiler warnings.
 
   18 May 2010; Markos Chandras <hwoarang@gentoo.org> vtun-3.0.2.ebuild:
   Stable on amd64 wrt bug #317961
diff --git a/net-misc/vtun/Manifest b/net-misc/vtun/Manifest
index 1e33c915d937..44dbfe268a6a 100644
--- a/net-misc/vtun/Manifest
+++ b/net-misc/vtun/Manifest
@@ -1,5 +1,6 @@
 AUX vtun-2.6-lzo2.patch 2547 RMD160 be0b6b2e2d1c3a123adf4a4f5f6bdc9926407f18 SHA1 e4b074adc5a26a40abd12521458ced2ef8365023 SHA256 3ed5678005e3b8ed7d9f0174174652b91a43041dbacf86f5cfa7de965d507568
 AUX vtun-2.6-makefile.patch 1919 RMD160 9487239d1ac950173de55f7c3950674d13b7af56 SHA1 03bab4451748b5bf713102c8b25fae9c55e3dea3 SHA256 a26d2dd9e7ecb591a822f01ce2ce2bf7f5e7d9e80b45b05f665e63c12cc17653
+AUX vtun-3.0.2-includes.patch 2020 RMD160 eae6a137693f6376c0d6cb1cfa674a6f26f546ef SHA1 462fdac1eb452eae75e179ab7cfe7881205a55d6 SHA256 8dd0204c480437b0c09488d6af70c36ded639bf61eb1aae37e82e0039f39a915
 AUX vtun.rc 772 RMD160 77ceb021d39aed235291f1c48c6a1c66354fdace SHA1 29aa4f4f625165783e5f2f531310fd5998c18a01 SHA256 15d61c1ee544a69ee67fa580b3ef43d446ef6ebc0f1e91654449e61bc53ff43e
 AUX vtund-start.conf 1174 RMD160 e27c66bb660df80d6444fd4f86aea910a30aa281 SHA1 3299eb74d03d73ecd7da7e49fdda8ca73587d51e SHA256 fce23e42500ac4b2135dfd4940388e4d05c117bba12446a7e1702c5a3342ab03
 DIST vtun-2.6.tar.gz 95637 RMD160 9f666189740b78a88f6b0e2807add3267551198b SHA1 ba6474a551856a7bb55b4cc21d858b8275a2e610 SHA256 fc80dac6d622fdb2db16d772edc6ff7d0023ee6eb5f2acb79d894ee30197c2e5
@@ -7,6 +8,7 @@ DIST vtun-3.0.1.tar.gz 124829 RMD160 49e55a084cea6048f14dbc1137f7dbcf012b6bbb SH
 DIST vtun-3.0.2.tar.gz 125777 RMD160 6592251871f7e6b9a7e12b7e07ab0a700d816f57 SHA1 6e2da196c70475e5d3750903b2dad032a7b1e8ac SHA256 db26d4dbc35a2b3d65519f68b8ae55c80d7ec4e6569aeec7a432aa82f24c56d6
 EBUILD vtun-2.6-r1.ebuild 1726 RMD160 d26bc991c5e0b9583ecf63d17e8348954022a275 SHA1 0a6e05d802a16bad057e5ca99e495c94ab8be2db SHA256 7edea92f15f90b012f8c201ca356d3260d17976e5924c7626a8d583f8c044f0d
 EBUILD vtun-3.0.1.ebuild 1318 RMD160 f6a279efc4e7f47d6c6d7bd29c9edf50e937a31f SHA1 910df625cdc79a155e72c0551b3d779d50d2f28e SHA256 c23e496e87555362b3410ec4533f913b1684d5a08877b112d8a993377b1a21d2
+EBUILD vtun-3.0.2-r1.ebuild 1373 RMD160 b70bf77728de42c401a5f59beea177f08cd68adf SHA1 166adb50bac265a148463ce9a09219d412c7f004 SHA256 d3b2a9cfc9eb0ca80cfd66754fc143c2071f7ed916fcfec0bd3fbc7f45d561fd
 EBUILD vtun-3.0.2.ebuild 1216 RMD160 4f485fb35b1a3f2757f96b456bc7099e109cebc1 SHA1 0d4b5c6e9ac5bd47179039f25e51cef0304db516 SHA256 25fafb9f4d8327aa470f3a09bc48ae530a9c91ac31266a9468ffe90d5166ece3
-MISC ChangeLog 5232 RMD160 9f1913c50c8e32e4086d416e304921d8f9ebb8b1 SHA1 5bf470c4e65eb848c97319fbcb4e17e95ab1c422 SHA256 44695ccfbff207e5b7318eddb86f945896d00c799c16635f20752f241701d3c9
+MISC ChangeLog 5420 RMD160 714c18c729a6d3100bcf625deeb01543014af8ff SHA1 cbe47db1c4676f882f67d18c010f291c4661878e SHA256 51aa038c43863d3ab8eb44cbe05467b9ca42c7870ff998aa4ff3e87b9fc444eb
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
diff --git a/net-misc/vtun/files/vtun-3.0.2-includes.patch b/net-misc/vtun/files/vtun-3.0.2-includes.patch
new file mode 100644
index 000000000000..8634a659ca2e
--- /dev/null
+++ b/net-misc/vtun/files/vtun-3.0.2-includes.patch
@@ -0,0 +1,72 @@
+--- 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-r1.ebuild b/net-misc/vtun/vtun-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..09f810b53bd1
--- /dev/null
+++ b/net-misc/vtun/vtun-3.0.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2-r1.ebuild,v 1.1 2010/09/18 03:12:18 jer Exp $
+
+EAPI=2
+
+inherit eutils
+
+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"
+
+src_prepare() {
+	sed -i Makefile.in \
+		-e '/^LDFLAGS/s|=|+=|g' \
+		|| die "sed Makefile"
+	epatch "${FILESDIR}"/${P}-includes.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable ssl) \
+		$(use_enable zlib) \
+		$(use_enable lzo) \
+		$(use_enable socks5 socks) \
+		--enable-shaper
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc ChangeLog Credits FAQ README README.Setup README.Shaper TODO
+	newinitd "${FILESDIR}"/vtun.rc vtun
+	insinto etc
+	doins "${FILESDIR}"/vtund-start.conf
+}
+
+pkg_postinst() {
+	elog "You will need the Universal TUN/TAP driver compiled into"
+	elog "your kernel or as a module to use the associated tunnel"
+	elog "modes in vtun."
+}