Changes 3.0.2:

* vtun3 client should parse vtun2 server encr directives
* cfg_file.y bugs
* build on c5 still fails

Changes 3.0.1:
* fix build for lzo2
* new debian rc scripts

Changes 3.0.0:
* Configure looks for liblzo2 when available

6 files changed, 49 insertions, 73 deletions

diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 29756edab12..5887d5b5444 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,29 +1,23 @@
-# $NetBSD: Makefile,v 1.44 2011/02/28 14:53:00 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2011/03/18 10:39:07 adam Exp $
 
-DISTNAME=	vtun-2.6
-PKGREVISION=	9
+DISTNAME=	vtun-3.0.2
 CATEGORIES=	net
-MASTER_SITES=	http://vtun.sourceforge.net/
-
-PATCHFILES=	vtun-26to30.patch
-PATCH_SITES+=	${MASTER_SITE_LOCAL}
-PATCH_DIST_STRIP=    -p1
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vtun/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://vtun.sourceforge.net/
 COMMENT=	Virtual Tunnels over TCP/IP networks with traffic shaping
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=			${WRKDIR}/vtun
-
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-ssl-headers=${SSLBASE}/include/openssl
 CONFIGURE_ARGS+=	--with-ssl-lib=${SSLBASE}/lib
-CONFIGURE_ARGS+=	--with-lzo-headers=${BUILDLINK_PREFIX.liblzo}/include
-CONFIGURE_ARGS+=	--with-lzo-lib=${BUILDLINK_PREFIX.liblzo}/lib
+CONFIGURE_ARGS+=	--with-lzo-headers=${BUILDLINK_PREFIX.lzo}/include/lzo
+CONFIGURE_ARGS+=	--with-lzo-lib=${BUILDLINK_PREFIX.lzo}/lib
 BUILD_TARGET=		vtund
 
 DOCDIR=			${PREFIX}/share/doc/vtun
@@ -35,30 +29,25 @@ CONF_FILES_PERMS=	${EGDIR}/vtund.conf ${PKG_SYSCONFDIR}/vtund.conf \
 			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
 OWN_DIRS=		${LOCKDIR} ${LOGDIR}
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin ${EGDIR} ${DOCDIR}
+INSTALLATION_DIRS=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
+INSTALLATION_DIRS+=	${EGDIR} ${DOCDIR}
 
-post-build:
-	@cd ${WRKSRC}; for file in vtund.8; do				\
-		${SED}	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"	\
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
-	${SED}	-e "/^[^#]/s|^|#|" -e "s|^$$|#|" ${WRKSRC}/vtund.conf	\
-		> ${WRKDIR}/vtund.conf
+SUBST_CLASSES+=		fix-man
+SUBST_STAGE.fix-man=	pre-configure
+SUBST_MESSAGE.fix-man=	Fixing man pages.
+SUBST_FILES.fix-man=	vtund.8
+SUBST_VARS.fix-man=	PKG_SYSCONFDIR
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vtund ${DESTDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.Crypto ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.Setup ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.Shaper ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKDIR}/vtund.conf ${DESTDIR}${EGDIR}/vtund.conf
+	${INSTALL_DATA} ${WRKSRC}/vtund.conf ${DESTDIR}${EGDIR}/vtund.conf
 	${INSTALL_MAN} ${WRKSRC}/vtund.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
 	${INSTALL_MAN} ${WRKSRC}/vtund.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-	${LN} -s vtund.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/vtun.8
 
-.include "../../archivers/liblzo/buildlink3.mk"
+.include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/vtun/PLIST b/net/vtun/PLIST
index a5ea5bd746e..34d4cef0c20 100644
--- a/net/vtun/PLIST
+++ b/net/vtun/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:09:48 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/03/18 10:39:07 adam Exp $
 man/man5/vtund.conf.5
-man/man8/vtun.8
 man/man8/vtund.8
 sbin/vtund
 share/doc/vtun/README
-share/doc/vtun/README.Crypto
 share/doc/vtun/README.Setup
 share/doc/vtun/README.Shaper
 share/examples/vtun/vtund.conf
diff --git a/net/vtun/distinfo b/net/vtun/distinfo
index 0cbee803830..e01db62c109 100644
--- a/net/vtun/distinfo
+++ b/net/vtun/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.10 2006/05/12 09:48:09 joerg Exp $
+$NetBSD: distinfo,v 1.11 2011/03/18 10:39:07 adam Exp $
 
-SHA1 (vtun-2.6.tar.gz) = ba6474a551856a7bb55b4cc21d858b8275a2e610
-RMD160 (vtun-2.6.tar.gz) = 9f666189740b78a88f6b0e2807add3267551198b
-Size (vtun-2.6.tar.gz) = 95637 bytes
-SHA1 (vtun-26to30.patch) = 0f37b0d19e0df2cbe9153d74fa93d2a139e19583
-RMD160 (vtun-26to30.patch) = cee32898284ee26ecc341a3337b1f9c2b67670ed
-Size (vtun-26to30.patch) = 338255 bytes
-SHA1 (patch-aa) = 88e8f9bec1cfd3fe9baf95fd870d3b94ff120aba
-SHA1 (patch-ab) = e1891ef0c50ef79ee05967e06e110ce64891ab0a
-SHA1 (patch-ac) = 7245dd4a18635e5c6e99ea727a37aa4155299e2f
+SHA1 (vtun-3.0.2.tar.gz) = 6e2da196c70475e5d3750903b2dad032a7b1e8ac
+RMD160 (vtun-3.0.2.tar.gz) = 6592251871f7e6b9a7e12b7e07ab0a700d816f57
+Size (vtun-3.0.2.tar.gz) = 125777 bytes
+SHA1 (patch-aa) = eb5326966d76ae0ad36e3f3b85380e59875a121e
+SHA1 (patch-ab) = 0af65f6b6d061d8beb8b2ac6a676ca095c057ccf
+SHA1 (patch-ac) = 0f39700ab729d9481fe29e2d7e53566eff6add96
diff --git a/net/vtun/patches/patch-aa b/net/vtun/patches/patch-aa
index 3900c2756e2..d4d51dbcb95 100644
--- a/net/vtun/patches/patch-aa
+++ b/net/vtun/patches/patch-aa
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2003/07/12 17:26:16 taca Exp $
+$NetBSD: patch-aa,v 1.5 2011/03/18 10:39:08 adam Exp $
 
---- Makefile.in.orig	2002-12-21 01:55:47.000000000 +0900
+--- Makefile.in.orig	2008-01-07 22:35:55.000000000 +0000
 +++ Makefile.in
-@@ -18,8 +18,8 @@
- #   Makefile.in,v 1.6.2.1 2001/08/06 23:16:35 maxk Exp
+@@ -19,6 +19,6 @@
  #  
  CC = @CC@
 -CFLAGS = @CFLAGS@ @CPPFLAGS@
@@ -12,18 +11,14 @@ $NetBSD: patch-aa,v 1.4 2003/07/12 17:26:16 taca Exp $
 +LDFLAGS = @LDFLAGS@ @LIBS@
  
  YACC = @YACC@
- YACCFLAGS = -d
-@@ -41,7 +41,7 @@ VAR_DIR  = @localstatedir@
- PID_FILE = ${VAR_DIR}/run/vtund.pid
+@@ -42,5 +42,5 @@ PID_FILE = ${VAR_DIR}/run/vtund.pid
  CFG_FILE = ${ETC_DIR}/vtund.conf
  STAT_DIR = ${VAR_DIR}/log/vtund
 -LOCK_DIR = ${VAR_DIR}/lock/vtund
 +LOCK_DIR = ${VAR_DIR}/run/vtund
  
  DEFS = -DVTUN_CONFIG_FILE=\"$(CFG_FILE)\" -DVTUN_PID_FILE=\"$(PID_FILE)\" \
-        -DVTUN_STAT_DIR=\"$(STAT_DIR)\" -DVTUN_LOCK_DIR=\"$(LOCK_DIR)\"
-@@ -54,9 +54,6 @@ OBJS = main.o cfg_file.tab.o cfg_file.le
- 
+@@ -55,7 +55,4 @@ OBJS = main.o cfg_file.tab.o cfg_file.le
  CONFIGURE_FILES = Makefile config.status config.cache config.h config.log 
  
 -%.o: %.c vtun.h lib.h
@@ -31,4 +26,3 @@ $NetBSD: patch-aa,v 1.4 2003/07/12 17:26:16 taca Exp $
 -
  vtund: $(OBJS)
  	$(CC) $(CFLAGS) -o vtund $(OBJS) $(LFD_OBJS) $(LDFLAGS)
- 
diff --git a/net/vtun/patches/patch-ab b/net/vtun/patches/patch-ab
index b81d0cc53bb..1b51329ae66 100644
--- a/net/vtun/patches/patch-ab
+++ b/net/vtun/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2001/12/21 21:04:23 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2011/03/18 10:39:08 adam Exp $
 
---- vtund.8.orig	Sun Oct 29 14:30:30 2000
+--- vtund.8.orig	2007-06-29 05:26:43.000000000 +0000
 +++ vtund.8
-@@ -68,7 +68,7 @@
+@@ -71,7 +71,7 @@ to any kernel parts. 
  .I -f file 
  Read config information from the
  .I file
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1 2001/12/21 21:04:23 jlam Exp $
  .TP
  .I -n 
  Do not become daemon.
-@@ -112,12 +112,12 @@
+@@ -118,12 +118,12 @@ Address of the server to connect to. Eit
  specified.
  .SH FILES
  .TP
diff --git a/net/vtun/patches/patch-ac b/net/vtun/patches/patch-ac
index bf6f8912240..689e5c654e4 100644
--- a/net/vtun/patches/patch-ac
+++ b/net/vtun/patches/patch-ac
@@ -1,21 +1,19 @@
-$NetBSD: patch-ac,v 1.2 2006/05/12 09:48:09 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2011/03/18 10:39:08 adam Exp $
 
---- auth.c.orig	2006-05-12 09:45:20.000000000 +0000
-+++ auth.c
-@@ -68,6 +68,7 @@ static EPAS_HANDLE ePass;
+--- lfd_legacy_encrypt.c.orig	2011-03-18 10:18:40.000000000 +0000
++++ lfd_legacy_encrypt.c
+@@ -49,14 +49,9 @@
  
- #ifndef __APPLE_CC__
+ #ifdef HAVE_SSL
+ 
+-#ifndef __APPLE_CC__
+ /* OpenSSL includes */
  #include <openssl/md5.h>
-+#include <openssl/sha.h>
- #include <openssl/hmac.h>
  #include <openssl/blowfish.h>
- #include <openssl/rand.h>
-@@ -589,7 +590,7 @@ struct vtun_host * auth_server(int fd)
- 
- 		   response_to_chal (chalsrv, h, chal_res, chal_resh);
+-#else /* YAY - We're MAC OS */
+-#include <sys/md5.h>
+-#include <crypto/blowfish.h>
+-#endif  /* __APPLE_CC__ */
  
--		   print_p (fd, "OK RESPSRV: %s %s\n", cl2cs (chal_resh, VTUN_RESP_HASH_SIZE));
-+		   print_p (fd, "OK RESPSRV: %s\n", cl2cs (chal_resh, VTUN_RESP_HASH_SIZE));
- 		   stage = ST_CHAL_CLI;
- 		   continue;
- 		}
+ #define ENC_BUF_SIZE VTUN_FRAME_SIZE + 16 
+ #define ENC_KEY_SIZE 16