Version bump.

4 files changed, 116 insertions, 2 deletions

diff --git a/net-misc/vtun/Manifest b/net-misc/vtun/Manifest
index 496722467bc1..6080dd1b1da0 100644
--- a/net-misc/vtun/Manifest
+++ b/net-misc/vtun/Manifest
@@ -1,9 +1,9 @@
 MD5 aaca53280167208d5eb97bff83a69895 vtun-2.5-r2.ebuild 2048
 MD5 ca28bbd9a58ea15db59628325049c3d1 vtun-2.5.ebuild 1723
 MD5 9858296d6cacc8b64ce59085597684ff vtun-2.5-r1.ebuild 1945
-MD5 c24118ab7b5b74f208f07c9c77c3e1b3 ChangeLog 1555
+MD5 8cb2ac4c07c29cf18e37431872376431 ChangeLog 1690
 MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
-MD5 1cbd47aecd0790ac1f7344622cff6c67 vtun-2.6.ebuild 1654
+MD5 001470426bdd24abb1ea48ba110cb53f vtun-2.6.ebuild 1648
 MD5 a806782ec385a60514f85833ed455fbc files/vtund-start.conf 1174
 MD5 e5c8a47e7b30540f4094b1aa6d3f6e5f files/digest-vtun-2.5 59
 MD5 f6c794a4c6d2965b321514400900e5ef files/digest-vtun-2.6 59
diff --git a/net-misc/vtun/files/digest-vtun-2.6 b/net-misc/vtun/files/digest-vtun-2.6
new file mode 100644
index 000000000000..f607625bdf85
--- /dev/null
+++ b/net-misc/vtun/files/digest-vtun-2.6
@@ -0,0 +1 @@
+MD5 309534fd03c5d13a19c43916f61f4bbf vtun-2.6.tar.gz 95637
diff --git a/net-misc/vtun/files/vtun-2.6-makefile.patch b/net-misc/vtun/files/vtun-2.6-makefile.patch
new file mode 100644
index 000000000000..673ee527ce2d
--- /dev/null
+++ b/net-misc/vtun/files/vtun-2.6-makefile.patch
@@ -0,0 +1,49 @@
+diff -Naur vtun.orig/Makefile.in vtun/Makefile.in
+--- vtun.orig/Makefile.in	2002-12-20 16:55:47.000000000 +0000
++++ vtun/Makefile.in	2003-10-17 18:03:42.000000000 +0000
+@@ -28,7 +28,7 @@
+ LEXFLAGS = -t 
+ 
+ INSTALL = @INSTALL@
+-INSTALL_OWNER = -o root -g 0
++DESTDIR =
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+@@ -77,24 +77,21 @@
+ 	rm -f `cat vtun.drivers`	
+ 
+ install_man: 
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man8
+-	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(DESTDIR)$(MAN_DIR)/man8
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man5
+-	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
+-	rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8 
+-	ln -s vtund.8 $(DESTDIR)$(MAN_DIR)/man8/vtun.8 
++	$(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man8
++	$(INSTALL) -m 644 vtund.8 $(DESTDIR)$(MAN_DIR)/man8
++	$(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man5
++	$(INSTALL) -m 644 vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
+ 
+ install_config: 
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
+-	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
+-	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
+-	fi
++	$(INSTALL) -d -m 755 $(DESTDIR)$(ETC_DIR)
++	$(INSTALL) -m 600 vtund.conf $(DESTDIR)$(ETC_DIR);
++	
+ 
+ install: vtund install_config install_man
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR)
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR)
+-	$(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR)
++	$(INSTALL) -d -m 755 $(DESTDIR)$(VAR_DIR)/run
++	$(INSTALL) -d -m 755 $(DESTDIR)$(STAT_DIR)
++	$(INSTALL) -d -m 755 $(DESTDIR)$(LOCK_DIR)
++	$(INSTALL) -d -m 755 $(DESTDIR)$(SBIN_DIR)
++	$(INSTALL) -m 755 vtund $(DESTDIR)$(SBIN_DIR)
+ 
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/net-misc/vtun/vtun-2.6.ebuild b/net-misc/vtun/vtun-2.6.ebuild
new file mode 100644
index 000000000000..fe38f12016da
--- /dev/null
+++ b/net-misc/vtun/vtun-2.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/10/18 02:04:50 zul Exp $
+
+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="x86 sparc "
+LICENSE="GPL-2"
+SLOT="0"
+
+# NOTE: you also need the tun/tap driver compiled into your kernel
+#		to do tun/tap tunneling
+DEPEND="virtual/glibc
+	>=sys-libs/zlib-1.1.3
+	>=dev-libs/lzo-1.07
+	sys-devel/bison
+	ssl? ( >=dev-libs/openssl-0.9.6c )"
+
+src_unpack() {
+	unpack ${A} && cd ${S} || die
+	epatch ${FILESDIR}/${PN}-${PV}-makefile.patch
+}
+
+src_compile() {
+	local use_opts
+	use_opts=""
+	if [ -z "`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"
+}