upgrade to vtun 2.5

2002-02-24 04:24:50 +00:00 · 2002-02-24 04:24:50 +00:00 · 49e4b13883
commit 49e4b13883
parent c34885afc2
7 changed files with 71 additions and 70 deletions
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.21 2001/05/23 21:23:25 brad Exp $
+# $OpenBSD: Makefile,v 1.22 2002/02/24 04:24:50 brad Exp $

 COMMENT=	"virtual tunnels over TCP/IP networks with traffic shaping"

-DISTNAME=	vtun-2.4
+DISTNAME=	vtun-2.5
 CATEGORIES=	net
-NEED_VERSION=	1.402
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-	http://vtun.sourceforce.net/
+NEED_VERSION=	1.500
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= vtun

 HOMEPAGE=	http://vtun.sourceforge.net/
@ -20,12 +19,17 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

+LOG_DIR=	/var
+SUBST_VARS=	LOG_DIR
+
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	--localstatedir="/var" \
+CONFIGURE_ARGS=	--localstatedir="${LOG_DIR}" \
 		--with-ssl-headers="/usr/include/openssl" \
 		--with-lzo-headers="${LOCALBASE}/include" \
 		--with-lzo-lib="${LOCALBASE}/lib"

+WRKDIST=	${WRKDIR}/vtun
+
 DOCS=	FAQ README README.Setup README.Shaper

 post-install:
--- a/net/vtun/distinfo
+++ b/net/vtun/distinfo
@ -0,0 +1,3 @@
+MD5 (vtun-2.5.tar.gz) = b29bffeb07e66567e247641919c45b23
+RMD160 (vtun-2.5.tar.gz) = 340bc7da0c9c5fa251c520e44f0131ed85b2a730
+SHA1 (vtun-2.5.tar.gz) = 6220497fc64b8b4d42e972e3b7855ec97cab1975
--- a/net/vtun/files/md5
+++ b/net/vtun/files/md5
@ -1,3 +0,0 @@
-MD5 (vtun-2.4.tar.gz) = 4403855f23b7784a7c85b96e6da1704c
-RMD160 (vtun-2.4.tar.gz) = b622306a6071398d53f80db78d2804a9832c6ef4
-SHA1 (vtun-2.4.tar.gz) = 3ffbcc0864ca429ff37f39ffe30cb06e50144da7
--- a/net/vtun/patches/patch-Makefile.in
+++ b/net/vtun/patches/patch-Makefile.in
@ -1,6 +1,6 @@
--- Makefile.in.orig	Mon May 29 09:35:11 2000
-+++ Makefile.in	Mon Sep 18 10:41:23 2000
-@@ -30,6 +30,8 @@
+--- Makefile.in.orig	Sat Feb 23 22:22:50 2002
+++ Makefile.in	Sat Feb 23 22:26:52 2002
+@@ -30,6 +30,8 @@ LEXFLAGS = -t 
 INSTALL = @INSTALL@
 INSTALL_OWNER = -o root -g 0
 
@ -9,7 +9,7 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-@@ -57,6 +59,8 @@
+@@ -57,6 +59,8 @@ CONFIGURE_FILES = Makefile config.status
 .c.o:
 	$(CC) $(CFLAGS) $(DEFS) -c $<
 
@ -18,31 +18,27 @@
 vtund: $(OBJS)
 	$(CC) $(CFLAGS) -o vtund $(OBJS) $(LFD_OBJS) $(LDFLAGS)
 
-@@ -78,25 +82,25 @@
- 	rm -f $(CONFIGURE_FILES)
+@@ -77,24 +81,24 @@ distclean: clean
 	rm -f `cat vtun.drivers`	
 
-install_man: 
+ install_man: 
 -	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(MAN_DIR)/man8
 -	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(MAN_DIR)/man8
 -	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(MAN_DIR)/man5
 -	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.conf.5 $(MAN_DIR)/man5
 -	rm -f $(MAN_DIR)/man8/vtun.8 
 -	ln -s vtund.8 $(MAN_DIR)/man8/vtun.8 
-
-install_config: 
-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(ETC_DIR)
-	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
-	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(ETC_DIR); \
-+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 
-+	cd $(DESTDIR)$(MAN_DIR)/man8 && ln -s vtund.8 vtun.8 
-+
-+install_config:
+	cd $(DESTDIR)$(MAN_DIR)/man8; ln -s vtund.8 vtun.8 
+ 
+ install_config: 
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(ETC_DIR)
+-	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
+-	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(ETC_DIR); \
 +	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
 +	if [ ! -f $(DESTDIR)$(ETC_DIR)/vtund.conf ]; then \
 +	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
--- a/net/vtun/pkg/DEINSTALL
+++ b/net/vtun/pkg/DEINSTALL
@ -1,26 +1,24 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.5 2001/02/28 13:57:56 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.6 2002/02/24 04:24:50 brad Exp $
 #
 # vtun de-installation

-set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/vtund.conf
+LOG_DIR=${LOG_DIR}/log/vtund

-if [ -f $CONFIG_FILE ]; then
-    echo
-    echo "+---------------"
-    echo "| To completely deinstall the $1 package you need to perform"
-    echo "| this step as root:"
-    echo "|"
-    echo "|           rm -f $CONFIG_FILE"
-    echo "|           rm -rf /var/log/vtund"
-    echo "|"
-    echo "| Do not do this if you plan on re-installing $1"
-    echo "| at some future time."
-    echo "+---------------"
-    echo
-fi
+echo
+echo "+---------------"
+echo "| To completely deinstall the $1 package you need to perform"
+echo "| this step as root:"
+echo "|"
+echo "|           rm -f $CONFIG_FILE"
+echo "|           rm -rf $LOG_DIR"
+echo "|"
+echo "| Do not do this if you plan on re-installing $1"
+echo "| at some future time."
+echo "+---------------"
+echo

 exit 0
--- a/net/vtun/pkg/INSTALL
+++ b/net/vtun/pkg/INSTALL
@ -1,41 +1,41 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.6 2001/02/28 13:57:57 brad Exp $
+# $OpenBSD: INSTALL,v 1.7 2002/02/24 04:24:50 brad Exp $
 #
 # Pre/post-installation setup of vtun

-# exit on errors, use a sane path and install prefix
-#
-set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/vtund.conf
 SAMPLE_CONFIG_FILE=$PREFIX/share/examples/vtun/vtund.conf-sample
-
-install -d -m 755 -o root -g wheel /var/log/vtund
+LOG_DIR=${LOG_DIR}/log/vtund

 do_notice()
 {
-    echo
-    echo "+---------------"
-    echo "| The existing $1 configuration file, $CONFIG_FILE,"
-    echo "| has NOT been changed.  You may want to compare it to the"
-    echo "| current sample file, $SAMPLE_CONFIG_FILE,"
-    echo "| and update your configuration as needed."
-    echo "+---------------"
-    echo
+  echo
+  echo "+---------------"
+  echo "| The existing $1 configuration file, $CONFIG_FILE,"
+  echo "| has NOT been changed.  You may want to compare it to the"
+  echo "| current sample file, $SAMPLE_CONFIG_FILE,"
+  echo "| and update your configuration as needed."
+  echo "+---------------"
+  echo
 }

 do_install()
 {
-    install -o root -g wheel -m 644 $SAMPLE_CONFIG_FILE $CONFIG_FILE
-    echo
-    echo "+---------------"
-    echo "| The $1 configuration file, $CONFIG_FILE,"
-    echo "| has been installed.  Please view this file and change"
-    echo "| the configuration to meet your needs"
-    echo "+---------------"
-    echo
+  install -o root -g wheel -m 644 $SAMPLE_CONFIG_FILE $CONFIG_FILE
+  echo
+  echo "+---------------"
+  echo "| The $1 configuration file, $CONFIG_FILE,"
+  echo "| has been installed.  Please view this file and change"
+  echo "| the configuration to meet your needs"
+  echo "+---------------"
+  echo
+}

+do_log_dir()
+{
+  install -d -m 755 -o root -g wheel $LOG_DIR
 }

 # verify proper execution
@ -52,10 +52,13 @@ case $2 in
 	: nothing to pre-install for this port
 	;;
    POST-INSTALL)
+	if [ ! -d $LOG_DIR ]; then
+	  do_log_dir
+	fi
 	if [ -f $CONFIG_FILE ]; then
-	    do_notice $1
+	  do_notice $1
 	else
-	    do_install $1
+	  do_install $1
 	fi
 	;;
    *)
--- a/net/vtun/pkg/PLIST
+++ b/net/vtun/pkg/PLIST
@ -1,12 +1,12 @@
-@comment $OpenBSD: PLIST,v 1.7 2000/08/04 16:52:00 brad Exp $
+@comment $OpenBSD: PLIST,v 1.8 2002/02/24 04:24:50 brad Exp $
+man/man5/vtund.conf.5
+man/man8/vtun.8
+man/man8/vtund.8
 sbin/vtund
 share/doc/vtun/FAQ
 share/doc/vtun/README
 share/doc/vtun/README.Setup
 share/doc/vtun/README.Shaper
 share/examples/vtun/vtund.conf-sample
-man/man5/vtund.conf.5
-man/man8/vtund.8
-man/man8/vtun.8
-@dirrm share/doc/vtun
@dirrm share/examples/vtun
+@dirrm share/doc/vtun