svn commit: r304985 - in head/net/vtun: . files

[Cy Schubert]

Author: cy
Date: Fri Sep 28 05:32:47 2012
New Revision: 304985
URL: http://svn.freebsd.org/changeset/ports/304985

Log:
  Update 3.0.2 --> 3.0.3
  
  Assume maintainership.
  
  Approved by:	kuriyama (maintainer)

Deleted:
  head/net/vtun/files/patch-lfd_lzo.c
Modified:
  head/net/vtun/Makefile
  head/net/vtun/distinfo
  head/net/vtun/files/patch-main.c

Modified: head/net/vtun/Makefile
==============================================================================
--- head/net/vtun/Makefile	Fri Sep 28 04:34:57 2012	(r304984)
+++ head/net/vtun/Makefile	Fri Sep 28 05:32:47 2012	(r304985)
@@ -1,17 +1,12 @@
-# New ports collection makefile for:	vtun
-# Date created:				05 Feb 2000
-# Whom:					Kevin Lo <kevlo at FreeBSD.org>
-#
+# Created by:	Kevin Lo <kevlo at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	vtun
-PORTVERSION=	3.0.2
-PORTREVISION=	4
+PORTVERSION=	3.0.3
 CATEGORIES=	net
 MASTER_SITES=	SF
 
-MAINTAINER=	kuriyama at FreeBSD.org
+MAINTAINER=	cy at FreeBSD.org
 COMMENT=	Virtual Tunnels over TCP/IP networks with traffic shaping
 
 LIB_DEPENDS=	lzo2.2:${PORTSDIR}/archivers/lzo2

Modified: head/net/vtun/distinfo
==============================================================================
--- head/net/vtun/distinfo	Fri Sep 28 04:34:57 2012	(r304984)
+++ head/net/vtun/distinfo	Fri Sep 28 05:32:47 2012	(r304985)
@@ -1,2 +1,2 @@
-SHA256 (vtun-3.0.2.tar.gz) = db26d4dbc35a2b3d65519f68b8ae55c80d7ec4e6569aeec7a432aa82f24c56d6
-SIZE (vtun-3.0.2.tar.gz) = 125777
+SHA256 (vtun-3.0.3.tar.gz) = 69dcbe4f8c5ce7d91b4150a6309e536d03b61841169746ca5788413ac7edb9cb
+SIZE (vtun-3.0.3.tar.gz) = 130051

Modified: head/net/vtun/files/patch-main.c
==============================================================================
--- head/net/vtun/files/patch-main.c	Fri Sep 28 04:34:57 2012	(r304984)
+++ head/net/vtun/files/patch-main.c	Fri Sep 28 05:32:47 2012	(r304985)
@@ -1,39 +1,51 @@
---- main.c.orig	2008-01-08 07:35:53.000000000 +0900
-+++ main.c	2011-04-21 23:54:45.376770964 +0900
-@@ -50,9 +50,11 @@
+--- main.c.orig	2012-07-07 22:32:57.000000000 -0700
++++ main.c	2012-09-26 13:37:53.331700962 -0700
+@@ -50,12 +50,14 @@
  extern int optind,opterr,optopt;
  extern char *optarg;
  
 +static char* pidfile = VTUN_PID_FILE;
 +
+ /* for the NATHack bit.  Is our UDP session connected? */
+ int is_rmt_fd_connected=1; 
+ 
  int main(int argc, char *argv[], char *env[])
  {
--     int svr, daemon, sock, dofork, fd, opt;
+-  int svr, daemon, sock, dofork, fd, opt;
 +     int svr, daemon, sock, dofork, fd, opt, has_pid = 0;
       struct vtun_host *host = NULL;
       struct sigaction sa;
       char *hst;
-@@ -89,7 +91,7 @@
+@@ -92,7 +94,7 @@
       /* Start logging to syslog and stderr */
       openlog("vtund", LOG_PID | LOG_NDELAY | LOG_PERROR, LOG_DAEMON);
  
--     while( (opt=getopt(argc,argv,"misf:P:L:t:np")) != EOF ){
+-     while( (opt=getopt(argc,argv,"misf:P:L:t:npq")) != EOF ){
 +     while( (opt=getopt(argc,argv,"misf:P:L:t:npz:")) != EOF ){
  	switch(opt){
  	    case 'm':
  	        if (mlockall(MCL_CURRENT | MCL_FUTURE) < 0) {
-@@ -120,6 +122,10 @@
- 	    case 't':
- 	        vtun.timeout = atoi(optarg);	
- 	        break;
+@@ -126,6 +128,10 @@
+ 	    case 'q':
+ 		vtun.quiet = 1;
+ 		break;
 +	    case 'z':
-+	        pidfile = strdup(optarg);
++		pidfile = strdup(optarg);
 +		has_pid = 1;
-+	        break;
++		break;
  	    default:
  		usage();
  	        exit(1);
-@@ -198,6 +204,10 @@
+@@ -200,12 +206,19 @@
+ 
+         init_title(argc,argv,env,"vtund[s]: ");
+ 
++	if ( has_pid )
++	   write_pid();
++
+ 	if( vtun.svr_type == VTUN_STAND_ALONE )	
+ 	   write_pid();
+ 	
  	server(sock);
       } else {	
          init_title(argc,argv,env,"vtund[c]: ");
@@ -44,7 +56,7 @@
          client(host);
       }
  
-@@ -214,7 +224,7 @@
+@@ -222,7 +235,7 @@
  {
       FILE *f;
  
@@ -53,7 +65,7 @@
          vtun_syslog(LOG_ERR,"Can't write PID file");
          return;
       }
-@@ -236,9 +246,9 @@
+@@ -244,9 +257,9 @@
       printf("VTun ver %s\n", VTUN_VER);
       printf("Usage: \n");
       printf("  Server:\n");