From owner-svn-ports-head@freebsd.org Thu Jan 24 17:00:01 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ABE7314B5848; Thu, 24 Jan 2019 17:00:01 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5330F72BC8; Thu, 24 Jan 2019 17:00:01 +0000 (UTC) (envelope-from mat@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 49A832B48C; Thu, 24 Jan 2019 17:00:01 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0OH01ac036443; Thu, 24 Jan 2019 17:00:01 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0OH00Cl036441; Thu, 24 Jan 2019 17:00:00 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201901241700.x0OH00Cl036441@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 24 Jan 2019 17:00:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491100 - in head/net/vtun: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/net/vtun: . files X-SVN-Commit-Revision: 491100 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5330F72BC8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2019 17:00:01 -0000 Author: mat Date: Thu Jan 24 17:00:00 2019 New Revision: 491100 URL: https://svnweb.freebsd.org/changeset/ports/491100 Log: Restore the ability for the client to have a PID file. PR: 216844 Submitted by: matthias freebsd bugzilla harz de Modified: head/net/vtun/Makefile (contents, props changed) head/net/vtun/files/patch-main.c (contents, props changed) Modified: head/net/vtun/Makefile ============================================================================== --- head/net/vtun/Makefile Thu Jan 24 16:53:37 2019 (r491099) +++ head/net/vtun/Makefile Thu Jan 24 17:00:00 2019 (r491100) @@ -3,7 +3,7 @@ PORTNAME= vtun PORTVERSION= 3.0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= SF Modified: head/net/vtun/files/patch-main.c ============================================================================== --- head/net/vtun/files/patch-main.c Thu Jan 24 16:53:37 2019 (r491099) +++ head/net/vtun/files/patch-main.c Thu Jan 24 17:00:00 2019 (r491100) @@ -1,5 +1,5 @@ ---- main.c.orig 2013-07-07 13:31:22.000000000 -0700 -+++ main.c 2016-09-19 20:32:29.072400000 -0700 +--- main.c.orig 2013-07-07 20:31:22 UTC ++++ main.c @@ -39,9 +39,9 @@ #include "lib.h" #include "compat.h" @@ -12,7 +12,7 @@ #else # define SERVOPT_STRING "" #endif -@@ -57,6 +57,9 @@ +@@ -57,6 +57,9 @@ static void usage(void); extern int optind,opterr,optopt; extern char *optarg; @@ -22,7 +22,7 @@ /* for the NATHack bit. Is our UDP session connected? */ int is_rmt_fd_connected=1; -@@ -141,6 +144,14 @@ +@@ -141,6 +144,14 @@ int main(int argc, char *argv[], char *env[]) case 'q': vtun.quiet = 1; break; @@ -37,7 +37,17 @@ default: usage(); exit(1); -@@ -250,7 +261,7 @@ +@@ -233,6 +244,9 @@ int main(int argc, char *argv[], char *env[]) + + server(sock); + } else { ++#ifdef HAVE_WORKING_FORK ++ write_pid(); ++#endif + init_title(argc,argv,env,"vtund[c]: "); + client(host); + } +@@ -250,7 +264,7 @@ static void write_pid(void) { FILE *f; @@ -46,7 +56,7 @@ vtun_syslog(LOG_ERR,"Can't write PID file"); return; } -@@ -273,12 +284,12 @@ +@@ -273,12 +287,17 @@ static void usage(void) printf("Usage: \n"); printf(" Server:\n"); #ifdef HAVE_WORKING_FORK @@ -58,7 +68,12 @@ #endif printf(" Client:\n"); /* I don't think these work. I'm disabling the suggestion - bish 20050601*/ ++#ifdef HAVE_WORKING_FORK printf("\tvtund [-f file] " /* [-P port] [-L local address] */ - "[-q] [-p] [-m] [-t timeout] \n"); + "[-q] [-p] [-m] [-t timeout] [-e] \n"); ++#else ++ printf("\tvtund [-f file] " /* [-P port] [-L local address] */ ++ "[-q] [-p] [-m] [-t timeout] [-e] \n"); ++#endif }