Index: net/ocserv/Makefile
===================================================================
--- net/ocserv/Makefile	(revision 513666)
+++ net/ocserv/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ocserv
 PORTVERSION=	0.12.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net net-vpn security
 MASTER_SITES=	ftp://ftp.infradead.org/pub/ocserv/
 
Index: net/ocserv/files/patch-src_tun.c
===================================================================
--- net/ocserv/files/patch-src_tun.c	(nonexistent)
+++ net/ocserv/files/patch-src_tun.c	(working copy)
@@ -0,0 +1,25 @@
+--- src/tun.c.orig	2018-04-14 07:52:35 UTC
++++ src/tun.c
+@@ -895,3 +895,22 @@ ssize_t tun_read(int sockfd, void *buf, size_t len)
+ 	return read(sockfd, buf, len);
+ }
+ #endif
++
++#ifndef __FreeBSD__
++int tun_claim(int sockfd)
++{
++
++	return (0);
++}
++#else
++/*
++ * FreeBSD has a mechanism by which a tunnel has a single controlling process,
++ * and only that one process may close it.  When the controlling process closes
++ * the tunnel, the state is torn down.
++ */
++int tun_claim(int sockfd)
++{
++
++	return (ioctl(sockfd, TUNSIFPID, 0));
++}
++#endif	/* !__FreeBSD__ */

Property changes on: net/ocserv/files/patch-src_tun.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: net/ocserv/files/patch-src_tun.h
===================================================================
--- net/ocserv/files/patch-src_tun.h	(nonexistent)
+++ net/ocserv/files/patch-src_tun.h	(working copy)
@@ -0,0 +1,9 @@
+--- src/tun.h.orig	2018-01-13 18:43:41 UTC
++++ src/tun.h
+@@ -35,5 +35,6 @@ struct tun_lease_st {
+ 
+ ssize_t tun_write(int sockfd, const void *buf, size_t len);
+ ssize_t tun_read(int sockfd, void *buf, size_t len);
++int tun_claim(int sockfd);
+ 
+ #endif

Property changes on: net/ocserv/files/patch-src_tun.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: net/ocserv/files/patch-src_worker-auth.c
===================================================================
--- net/ocserv/files/patch-src_worker-auth.c	(nonexistent)
+++ net/ocserv/files/patch-src_worker-auth.c	(working copy)
@@ -0,0 +1,14 @@
+--- src/worker-auth.c.orig	2019-01-19 18:47:47 UTC
++++ src/worker-auth.c
+@@ -605,7 +605,10 @@ static int recv_cookie_auth_reply(worker_st * ws)
+ 	case AUTH__REP__OK:
+ 		if (socketfd != -1) {
+ 			ws->tun_fd = socketfd;
+-
++			if (tun_claim(ws->tun_fd) != 0) {
++				ret = ERR_AUTH_FAIL;
++				goto cleanup;
++			}
+ 			if (msg->vname == NULL || msg->config == NULL || msg->user_name == NULL || msg->sid.len != sizeof(ws->sid)) {
+ 				ret = ERR_AUTH_FAIL;
+ 				goto cleanup;

Property changes on: net/ocserv/files/patch-src_worker-auth.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property