From owner-svn-ports-all@freebsd.org Tue Sep 20 03:40:46 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8998BBDF047; Tue, 20 Sep 2016 03:40:46 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 498051EDF; Tue, 20 Sep 2016 03:40:46 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8K3ejfT095692; Tue, 20 Sep 2016 03:40:45 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8K3ejdV095689; Tue, 20 Sep 2016 03:40:45 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201609200340.u8K3ejdV095689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Tue, 20 Sep 2016 03:40:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422481 - in head/net/vtun: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Sep 2016 03:40:46 -0000 Author: cy Date: Tue Sep 20 03:40:45 2016 New Revision: 422481 URL: https://svnweb.freebsd.org/changeset/ports/422481 Log: Document the previous -z and the new -e command line options. Added: head/net/vtun/files/patch-vtund.8 (contents, props changed) Modified: head/net/vtun/Makefile head/net/vtun/files/patch-main.c Modified: head/net/vtun/Makefile ============================================================================== --- head/net/vtun/Makefile Tue Sep 20 03:14:36 2016 (r422480) +++ head/net/vtun/Makefile Tue Sep 20 03:40:45 2016 (r422481) @@ -3,7 +3,7 @@ PORTNAME= vtun PORTVERSION= 3.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= SF Modified: head/net/vtun/files/patch-main.c ============================================================================== --- head/net/vtun/files/patch-main.c Tue Sep 20 03:14:36 2016 (r422480) +++ head/net/vtun/files/patch-main.c Tue Sep 20 03:40:45 2016 (r422481) @@ -1,5 +1,5 @@ --- main.c.orig 2013-07-07 13:31:22.000000000 -0700 -+++ main.c 2016-09-19 20:05:37.120740000 -0700 ++++ main.c 2016-09-19 20:32:29.072400000 -0700 @@ -39,9 +39,9 @@ #include "lib.h" #include "compat.h" @@ -46,3 +46,19 @@ vtun_syslog(LOG_ERR,"Can't write PID file"); return; } +@@ -273,12 +284,12 @@ + printf("Usage: \n"); + printf(" Server:\n"); + #ifdef HAVE_WORKING_FORK +- printf("\tvtund <-s|-i> [-f file] [-P port] [-L local address]\n"); ++ printf("\tvtund <-s|-i> [-f file] [-P port] [-L local address] [-e] [-z pid_file ]\n"); + #else +- printf("\tvtund <-i> [-f file] [-P port] [-L local address]\n"); ++ printf("\tvtund <-i> [-f file] [-P port] [-L local address] [-e]\n"); + #endif + printf(" Client:\n"); + /* I don't think these work. I'm disabling the suggestion - bish 20050601*/ + printf("\tvtund [-f file] " /* [-P port] [-L local address] */ +- "[-q] [-p] [-m] [-t timeout] \n"); ++ "[-q] [-p] [-m] [-t timeout] [-e] \n"); + } Added: head/net/vtun/files/patch-vtund.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/vtun/files/patch-vtund.8 Tue Sep 20 03:40:45 2016 (r422481) @@ -0,0 +1,30 @@ +--- vtund.8.orig 2016-09-17 13:01:21.000000000 -0700 ++++ vtund.8 2016-09-19 20:38:04.531515000 -0700 +@@ -48,6 +48,12 @@ + [ + .I -n + ] ++[ ++.I -e ++] ++[ ++.I -s pid_file ++] + < + .I session + > +@@ -116,6 +122,14 @@ + Default is 30 seconds. This options is equivalent to the 'timeout' option of + config file. + .TP ++.I -e ++Use vtun-v6 extended mode. ++.TP ++.I -z pid_file ++Connect ++.I z pid_file ++The full pathname of the file containing the PID of the daemon in server mode. ++.TP + .I session + Session name from the config file. + .TP