revision bump. vtun did not compile against lzo2 so dependencies altered. vtun-2.6-r1 added that does work with lzo2. bug #112367

(Portage version: 2.0.53_rc7)

9 files changed, 184 insertions, 34 deletions

diff --git a/net-misc/vtun/ChangeLog b/net-misc/vtun/ChangeLog
index 08c77549105a..5c60032a3ecd 100644
--- a/net-misc/vtun/ChangeLog
+++ b/net-misc/vtun/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vtun
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.24 2004/11/14 21:21:21 kloeri Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.25 2005/11/13 06:21:54 dragonheart Exp $
+
+*vtun-2.6-r1 (13 Nov 2005)
+
+  13 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/vtun-2.6-lzo2.patch, vtun-2.5.ebuild, vtun-2.5-r1.ebuild,
+  vtun-2.5-r2.ebuild, vtun-2.6.ebuild, +vtun-2.6-r1.ebuild:
+  revision bump. vtun did not compile against lzo2 so dependencies
+  altered. vtun-2.6-r1 added that does work with lzo2. bug #112367
 
   14 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> vtun-2.6.ebuild:
   Stable on alpha.
diff --git a/net-misc/vtun/Manifest b/net-misc/vtun/Manifest
index 540ed16b4ccd..6a51e9bb516b 100644
--- a/net-misc/vtun/Manifest
+++ b/net-misc/vtun/Manifest
@@ -1,26 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 04874c0115bf9413fcca21a0aec5c00c ChangeLog 2923
-MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
-MD5 fc4e7ab6fa8b4129bd91fb123ba326e2 vtun-2.5-r1.ebuild 1928
-MD5 e0f4ea4eb361994b283c6a5aa64573ee vtun-2.5-r2.ebuild 2031
-MD5 25f9520437df67890446af9d5edb9356 vtun-2.5.ebuild 1705
-MD5 161b3ea229b4ee7694d48bbf531eab63 vtun-2.6.ebuild 1749
-MD5 1e46f74e06c298440ef80e55ea493cbb files/vtun-2.5-r2-gentoo-gcc3.1.patch 767
-MD5 e19e6e833add738ce8f46e18c7d7d060 files/vtun.rc 772
-MD5 e5c8a47e7b30540f4094b1aa6d3f6e5f files/digest-vtun-2.5-r2 59
-MD5 f6c794a4c6d2965b321514400900e5ef files/digest-vtun-2.6 59
 MD5 e5c8a47e7b30540f4094b1aa6d3f6e5f files/digest-vtun-2.5 59
 MD5 e5c8a47e7b30540f4094b1aa6d3f6e5f files/digest-vtun-2.5-r1 59
+MD5 e5c8a47e7b30540f4094b1aa6d3f6e5f files/digest-vtun-2.5-r2 59
+MD5 f6c794a4c6d2965b321514400900e5ef files/digest-vtun-2.6 59
+MD5 f6c794a4c6d2965b321514400900e5ef files/digest-vtun-2.6-r1 59
 MD5 f48bedfa560d860030f8da2155092016 files/vtun-2.5-expect.patch 334
-MD5 49170c19de7a8830d2d2135f244b750a files/vtun-2.6-makefile.patch 1919
 MD5 eae860aeae73e470782dd4ece745d0b1 files/vtun-2.5-makefile.patch 1794
+MD5 1e46f74e06c298440ef80e55ea493cbb files/vtun-2.5-r2-gentoo-gcc3.1.patch 767
+MD5 e1630bf197b31c9fc68e91f19a034609 files/vtun-2.6-lzo2.patch 2544
+MD5 49170c19de7a8830d2d2135f244b750a files/vtun-2.6-makefile.patch 1919
+MD5 e19e6e833add738ce8f46e18c7d7d060 files/vtun.rc 772
 MD5 a806782ec385a60514f85833ed455fbc files/vtund-start.conf 1174
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBl8xougEuf3OQ0akRAv+XAKCU8zdHX4QSE4mPdzpFsYiBMX9gHgCeJfRW
-e0vJ7cujUKyROk+INzWy4wM=
-=wwwW
------END PGP SIGNATURE-----
+MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
+MD5 fc4e7ab6fa8b4129bd91fb123ba326e2 vtun-2.5-r1.ebuild 1928
+MD5 e0f4ea4eb361994b283c6a5aa64573ee vtun-2.5-r2.ebuild 2031
+MD5 25f9520437df67890446af9d5edb9356 vtun-2.5.ebuild 1705
+MD5 6994ef5dd3645aa239c9e1885fe5df0a vtun-2.6-r1.ebuild 1766
+MD5 161b3ea229b4ee7694d48bbf531eab63 vtun-2.6.ebuild 1749
diff --git a/net-misc/vtun/files/digest-vtun-2.6-r1 b/net-misc/vtun/files/digest-vtun-2.6-r1
new file mode 100644
index 000000000000..f607625bdf85
--- /dev/null
+++ b/net-misc/vtun/files/digest-vtun-2.6-r1
@@ -0,0 +1 @@
+MD5 309534fd03c5d13a19c43916f61f4bbf vtun-2.6.tar.gz 95637
diff --git a/net-misc/vtun/files/vtun-2.6-lzo2.patch b/net-misc/vtun/files/vtun-2.6-lzo2.patch
new file mode 100644
index 000000000000..7cc82cf65ba1
--- /dev/null
+++ b/net-misc/vtun/files/vtun-2.6-lzo2.patch
@@ -0,0 +1,76 @@
+diff -ru vtun.orig/configure vtun/configure
+--- vtun.orig/configure	2002-12-21 04:22:15.000000000 +1100
++++ vtun/configure	2005-11-13 16:57:22.000000000 +1100
+@@ -2001,14 +2001,14 @@
+ 	  CPPFLAGS="$CPPFLAGS -I$p"
+ 	fi
+         echo "$ac_t""($dir) yes " 1>&6 
+-	echo $ac_n "checking for lzo1x_decompress in -llzo""... $ac_c" 1>&6
+-echo "configure:2006: checking for lzo1x_decompress in -llzo" >&5
+-ac_lib_var=`echo lzo'_'lzo1x_decompress | sed 'y%./+-%__p_%'`
++	echo $ac_n "checking for lzo1x_decompress in -llzo2""... $ac_c" 1>&6
++echo "configure:2006: checking for lzo1x_decompress in -llzo2" >&5
++ac_lib_var=`echo lzo2'_'lzo1x_decompress | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-llzo  $LIBS"
++LIBS="-llzo2  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2014 "configure"
+ #include "confdefs.h"
+@@ -2037,7 +2037,7 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   
+-	       LIBS="$LIBS -llzo"
++	       LIBS="$LIBS -llzo2"
+ 	       cat >> confdefs.h <<\EOF
+ #define HAVE_LZO 1
+ EOF
+@@ -2437,7 +2437,7 @@
+ echo "$ac_t""" 1>&6
+ 
+ 
+-REL=`echo 'REL-2_6' | tr -d '$: \-' | sed 's/^[A-Za-z]*//' | sed 's/\_/\./'`
++REL=`echo '$Name:  $' | tr -d '$: \-' | sed 's/^[A-Za-z]*//' | sed 's/\_/\./'`
+ 
+ 
+ cat >> confdefs.h <<EOF
+diff -ru vtun.orig/configure.in vtun/configure.in
+--- vtun.orig/configure.in	2002-12-21 04:13:03.000000000 +1100
++++ vtun/configure.in	2005-11-13 16:56:59.000000000 +1100
+@@ -119,9 +119,9 @@
+    AC_CHECKING( for LZO Library and Header files ... )
+    AC_SEARCH_HEADERS(lzo1x.h, 
+ 	$LZO_HDR_DIR /usr/include/lzo "" /usr/local/include,
+-        AC_CHECK_LIB(lzo, lzo1x_decompress,
++        AC_CHECK_LIB(lzo2, lzo1x_decompress,
+ 	    [
+-	       LIBS="$LIBS -llzo"
++	       LIBS="$LIBS -llzo2"
+ 	       AC_DEFINE(HAVE_LZO)
+ 	    ],
+ 	    AC_MSG_ERROR( LZO library not found. )
+diff -ru vtun.orig/lfd_lzo.c vtun/lfd_lzo.c
+--- vtun.orig/lfd_lzo.c	2002-04-25 19:19:50.000000000 +1000
++++ vtun/lfd_lzo.c	2005-11-13 17:01:46.000000000 +1100
+@@ -74,7 +74,7 @@
+ 	vtun_syslog(LOG_ERR,"Can't allocate buffer for the compressor");
+ 	return 1;
+      }	
+-     if( !(wmem = lzo_malloc(mem)) ){
++     if( !(wmem = malloc(mem)) ){
+ 	vtun_syslog(LOG_ERR,"Can't allocate buffer for the compressor");
+ 	return 1;
+      }	
+@@ -92,7 +92,7 @@
+ int free_lzo()
+ {
+      lfd_free(zbuf); zbuf = NULL;
+-     lzo_free(wmem); wmem = NULL;
++     free(wmem); wmem = NULL;
+      return 0;
+ }
+ 
diff --git a/net-misc/vtun/vtun-2.5-r1.ebuild b/net-misc/vtun/vtun-2.5-r1.ebuild
index 55ff654b7e7f..87b300b8ff21 100644
--- a/net-misc/vtun/vtun-2.5-r1.ebuild
+++ b/net-misc/vtun/vtun-2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.5-r1.ebuild,v 1.11 2004/06/25 00:19:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.5-r1.ebuild,v 1.12 2005/11/13 06:21:54 dragonheart Exp $
 
 IUSE="ssl"
 
@@ -10,7 +10,7 @@ KEYWORDS="x86 sparc "
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND=">=sys-libs/zlib-1.1.4
-	>=dev-libs/lzo-1.07
+	=dev-libs/lzo-1*
 	ssl? ( >=dev-libs/openssl-0.9.6c-r1 )
 	>=sys-kernel/linux-headers-2.4.18"
 #RDEPEND=""
diff --git a/net-misc/vtun/vtun-2.5-r2.ebuild b/net-misc/vtun/vtun-2.5-r2.ebuild
index fc12e55c6cab..1b5ab896cb79 100644
--- a/net-misc/vtun/vtun-2.5-r2.ebuild
+++ b/net-misc/vtun/vtun-2.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.5-r2.ebuild,v 1.11 2004/06/25 00:19:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.5-r2.ebuild,v 1.12 2005/11/13 06:21:54 dragonheart Exp $
 
 IUSE="ssl"
 
@@ -10,7 +10,7 @@ KEYWORDS="x86 sparc alpha"
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND=">=sys-libs/zlib-1.1.4
-	>=dev-libs/lzo-1.07
+	=dev-libs/lzo-1*
 	ssl? ( >=dev-libs/openssl-0.9.6c-r1 )
 	>=sys-kernel/linux-headers-2.4.18"
 #RDEPEND=""
diff --git a/net-misc/vtun/vtun-2.5.ebuild b/net-misc/vtun/vtun-2.5.ebuild
index 41af055f8f17..322e7e825661 100644
--- a/net-misc/vtun/vtun-2.5.ebuild
+++ b/net-misc/vtun/vtun-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.5.ebuild,v 1.15 2004/07/01 22:09:48 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.5.ebuild,v 1.16 2005/11/13 06:21:54 dragonheart Exp $
 
 IUSE="ssl"
 
@@ -16,7 +16,7 @@ SLOT="0"
 #		to do tun/tap tunneling
 DEPEND="virtual/libc
 	>=sys-libs/zlib-1.1.3
-	>=dev-libs/lzo-1.07
+	=dev-libs/lzo-1*
 	sys-devel/bison
 	ssl? ( >=dev-libs/openssl-0.9.6c )"
 
diff --git a/net-misc/vtun/vtun-2.6-r1.ebuild b/net-misc/vtun/vtun-2.6-r1.ebuild
new file mode 100644
index 000000000000..9ff73e465b75
--- /dev/null
+++ b/net-misc/vtun/vtun-2.6-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.6-r1.ebuild,v 1.1 2005/11/13 06:21:54 dragonheart Exp $
+
+inherit eutils
+
+IUSE="ssl"
+
+S=${WORKDIR}/vtun
+DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression"
+SRC_URI="mirror://sourceforge/vtun/${P}.tar.gz"
+HOMEPAGE="http://vtun.sourceforge.net/"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+# NOTE: you also need the tun/tap driver compiled into your kernel
+#		to do tun/tap tunneling
+DEPEND="virtual/libc
+	>=sys-libs/zlib-1.1.3
+	>=dev-libs/lzo-2
+	sys-devel/bison
+	ssl? ( >=dev-libs/openssl-0.9.6c )"
+
+RDEPEND="virtual/libc
+	>=sys-libs/zlib-1.1.3
+	ssl? ( >=dev-libs/openssl-0.9.6c )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch ${FILESDIR}/${P}-lzo2.patch
+}
+
+src_compile() {
+	local use_opts
+	use_opts=""
+	if ! use ssl
+	then
+		use_opts="--disable-ssl"
+	fi
+
+	econf ${use_opts} --with-ssl-headers=/usr/include/openssl || die
+
+	make || die
+}
+
+src_install () {
+	make DESTDIR=${D} prefix=/usr \
+		mandir=/usr/share/man \
+		infodir=/usr/share/info \
+		datadir=/usr/share \
+		sysconfdir=/etc \
+		localstatedir=/var/lib \
+		install || die
+
+	dodoc ChangeLog Credits FAQ README README.Setup README.Shaper TODO
+
+	exeinto etc/init.d;
+	newexe ${FILESDIR}/vtun.rc vtun
+
+	insinto etc
+	doins ${FILESDIR}/vtund-start.conf
+}
+
+pkg_postinst () {
+	echo ">>> You will need the Universal TUN/TAP driver compiled into"
+	echo ">>> your kernel or as a module to use the associated tunnel"
+	echo ">>> modes in vtun. 2.2 users will need to download and install"
+	echo ">>> the driver from http://vtun.sourceforge.net/tun"
+}
diff --git a/net-misc/vtun/vtun-2.6.ebuild b/net-misc/vtun/vtun-2.6.ebuild
index 4042a2e99641..2f99354a2858 100644
--- a/net-misc/vtun/vtun-2.6.ebuild
+++ b/net-misc/vtun/vtun-2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.6.ebuild,v 1.11 2004/11/14 21:21:21 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.6.ebuild,v 1.12 2005/11/13 06:21:54 dragonheart Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ SLOT="0"
 #		to do tun/tap tunneling
 DEPEND="virtual/libc
 	>=sys-libs/zlib-1.1.3
-	>=dev-libs/lzo-1.07
+	=dev-libs/lzo-1*
 	sys-devel/bison
 	ssl? ( >=dev-libs/openssl-0.9.6c )"