From 1029f0a72f49a77741d68700851f6408ca2b2151 Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Sat, 12 Jul 2003 17:26:15 +0000
Subject: Update vtun package to 2.6.

ver 2.6:
	No changes;  just renumber.

ver 2.5.3:
	$DESTDIR in makefile for packaging glee (PLD)
	Tighter code in generic/pty_dev.c where available (PLD)
	Various spec file improvements from (PLD)

ver 2.5.2:
	Configure fixes, to ensure vtun will build under Mac OS/X (Kurt Werle)
	exclude <rand.h> #inclusion under OS/X

ver 2.5.1:
	Cleanups, reformat code, Automake improvements (Greg)

	Improvement of Special SuSE init files (Willems Luc)
	Spec file improvements and testing under SuSE (Willems Luc)
	PLD build patch from Arkadiusz Miskiewicz

	re-execute up-commands on re-up under persist-keep (David Kimdon, Leo Bergolth)
	prevent reentering syslog in signal handlers (Leo Bergolth)
	fd leak in tunnel.c (David Kimdon, Leo Bergolth)
	fix configure wrt openSSL and SASL to pick correct MD5.h (Leo Bergolth)
	prevent closing non-existant stat file (Edan Ayal)
	minor packaging improvements (Bishop Clark)
---
 net/vtun/Makefile         |  4 ++--
 net/vtun/distinfo         |  8 ++++----
 net/vtun/patches/patch-aa | 22 +++++++++++++++++-----
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 2f7ac9159af..bf4b04f17eb 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2003/03/29 12:42:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2003/07/12 17:26:15 taca Exp $
 
-DISTNAME=	vtun-2.5
+DISTNAME=	vtun-2.6
 WRKSRC=		${WRKDIR}/vtun
 CATEGORIES=	net
 MASTER_SITES=	http://vtun.sourceforge.net/
diff --git a/net/vtun/distinfo b/net/vtun/distinfo
index ce4b5e20c23..081b40e15c8 100644
--- a/net/vtun/distinfo
+++ b/net/vtun/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/08/25 21:50:19 jlam Exp $
+$NetBSD: distinfo,v 1.6 2003/07/12 17:26:15 taca Exp $
 
-SHA1 (vtun-2.5.tar.gz) = 6220497fc64b8b4d42e972e3b7855ec97cab1975
-Size (vtun-2.5.tar.gz) = 92510 bytes
-SHA1 (patch-aa) = b921a0b095848a49e79c81696324a6e67e8f07ba
+SHA1 (vtun-2.6.tar.gz) = ba6474a551856a7bb55b4cc21d858b8275a2e610
+Size (vtun-2.6.tar.gz) = 95637 bytes
+SHA1 (patch-aa) = 88e8f9bec1cfd3fe9baf95fd870d3b94ff120aba
 SHA1 (patch-ab) = e1891ef0c50ef79ee05967e06e110ce64891ab0a
diff --git a/net/vtun/patches/patch-aa b/net/vtun/patches/patch-aa
index cec987760ba..3900c2756e2 100644
--- a/net/vtun/patches/patch-aa
+++ b/net/vtun/patches/patch-aa
@@ -1,17 +1,19 @@
-$NetBSD: patch-aa,v 1.3 2001/12/21 21:04:23 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2003/07/12 17:26:16 taca Exp $
 
---- Makefile.in.orig	Mon May 29 09:35:11 2000
+--- Makefile.in.orig	2002-12-21 01:55:47.000000000 +0900
 +++ Makefile.in
-@@ -19,7 +19,7 @@
+@@ -18,8 +18,8 @@
+ #   Makefile.in,v 1.6.2.1 2001/08/06 23:16:35 maxk Exp
  #  
  CC = @CC@
- CFLAGS = @CFLAGS@ @CPPFLAGS@
+-CFLAGS = @CFLAGS@ @CPPFLAGS@
 -LDFLAGS = @LIBS@
++CFLAGS = @CFLAGS@ @CPPFLAGS@ ${DEFS}
 +LDFLAGS = @LDFLAGS@ @LIBS@
  
  YACC = @YACC@
  YACCFLAGS = -d
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ VAR_DIR  = @localstatedir@
  PID_FILE = ${VAR_DIR}/run/vtund.pid
  CFG_FILE = ${ETC_DIR}/vtund.conf
  STAT_DIR = ${VAR_DIR}/log/vtund
@@ -20,3 +22,13 @@ $NetBSD: patch-aa,v 1.3 2001/12/21 21:04:23 jlam Exp $
  
  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
+ 
+ CONFIGURE_FILES = Makefile config.status config.cache config.h config.log 
+ 
+-%.o: %.c vtun.h lib.h
+-	$(CC) $(CFLAGS) $(DEFS) -c $<
+-
+ vtund: $(OBJS)
+ 	$(CC) $(CFLAGS) -o vtund $(OBJS) $(LFD_OBJS) $(LDFLAGS)
+ 
-- 
cgit v1.2.3