# 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.
-----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 dd6fa6c4b8d697fabbe17962a387636e ChangeLog 3271
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 3ed66a4e8454320147cdb763731c5b9e files/vtun-2.6-lzo2.patch 2547
+MD5 49170c19de7a8830d2d2135f244b750a files/vtun-2.6-makefile.patch 1919
+MD5 e19e6e833add738ce8f46e18c7d7d060 files/vtun.rc 772
MD5 a806782ec385a60514f85833ed455fbc files/vtund-start.conf 1174
+MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
+MD5 52c6990c3559940ee57861f87435cf56 vtun-2.5-r1.ebuild 1928
+MD5 62c38ac4aea9f0af7847f0e1b9babba5 vtun-2.5-r2.ebuild 2031
+MD5 0cdc5d7ca0eb5bc2f02b0f225e6e6a6b vtun-2.5.ebuild 1704
+MD5 6297fc936f3dec3e595fd170cc2f0efc vtun-2.6-r1.ebuild 1776
+MD5 139727784b34cbb655e5312a2402b847 vtun-2.6.ebuild 1751
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-iD8DBQFBl8xougEuf3OQ0akRAv+XAKCU8zdHX4QSE4mPdzpFsYiBMX9gHgCeJfRW
-e0vJ7cujUKyROk+INzWy4wM=
-=wwwW
+iD8DBQFDdtuRmdTrptrqvGERAqV3AKCdhbfKhNE9IZh6/VO/306m2NFVJwCdHdYd
+m4KP1ivycQNbk53gEwNuxiU=
+=9Tdg
-----END PGP SIGNATURE-----
--- /dev/null
+MD5 309534fd03c5d13a19c43916f61f4bbf vtun-2.6.tar.gz 95637
--- /dev/null
+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;
+ }
+
-# 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"
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=""
-# 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"
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=""
-# 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"
# 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 )"
--- /dev/null
+# 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"
+}
-# 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
# 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 )"
projects / gentoo.git / commitdiff