openvpn: updated to 2.5.1

Version 2.5.1
* Fix auth-token not being updated if auth-nocache is set
* Remove auth_user_pass.wait_for_push variable
* Fix port-share option with TLS-Crypt v2
* Zero initialise msghdr prior to calling sendmesg
* Fix tls-auth mismatch OCC message when tls-cryptv2 is used.
* build: Fix missing install of man page in certain environments
* Fix too early argv freeing when registering DNS
* Remove 1 second delay before running netsh
* Skip DHCP renew with Wintun adapter
* Change travis build scripts to use https when fetching prerequisites.
* Fix line number reporting on config file errors after <inline> segments
* Clarify --block-ipv6 intent and direction.
* Document common uses of 'echo' directive, re-enable logging for 'echo'.
* Make OPENVPN_PLUGIN_ENABLE_PF failures FATAL
* clean up / rewrite sample-plugins/defer/simple.c
* Fix naming error in sample-plugins/defer/simple.c
* Documentation fixes around openvpn_plugin_func_v3 in openvpn-plugin.h.in
* Update openvpn_plugin_func_v2 to _v3 in sample-plugins/defer/simple.c
* More explicit versioning compatibility in sample-plugins/defer/simple.c
* Explain structver usage in sample defer plugin.
* Man page sections corrections
* Quote the domain name argument passed to the wmic command
* tls-crypt-v2: fix server memory leak
* tls-crypt-v2: also preload tls-crypt-v2 keys (if --persist-key)

5 files changed, 10 insertions, 27 deletions

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index bebaf9cb314..d72bca60182 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2021/02/05 09:21:00 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2021/02/24 19:13:50 adam Exp $
 
 DISTNAME=	${OPENVPN_DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${OPENVPN_MASTER_SITES}
 EXTRACT_SUFX=	.tar.xz
diff --git a/net/openvpn/Makefile.common b/net/openvpn/Makefile.common
index da9d6e87e48..d10a2117b83 100644
--- a/net/openvpn/Makefile.common
+++ b/net/openvpn/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.19 2020/11/17 12:13:01 adam Exp $
+# $NetBSD: Makefile.common,v 1.20 2021/02/24 19:13:50 adam Exp $
 # used by net/openvpn/Makefile
 # used by net/openvpn-acct-wtmpx/Makefile
 # used by net/openvpn-nagios/Makefile
 
-OPENVPN_DISTNAME=		openvpn-2.5.0
+OPENVPN_DISTNAME=		openvpn-2.5.1
 OPENVPN_DISTFILE=		${OPENVPN_DISTNAME}.tar.xz
 OPENVPN_MASTER_SITES=		https://swupdate.openvpn.org/community/releases/
 SITES.${OPENVPN_DISTFILE}=	${OPENVPN_MASTER_SITES}
diff --git a/net/openvpn/PLIST b/net/openvpn/PLIST
index 324ea3cf02d..d639785abab 100644
--- a/net/openvpn/PLIST
+++ b/net/openvpn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2021/02/05 09:21:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2021/02/24 19:13:50 adam Exp $
 include/openvpn-msg.h
 include/openvpn-plugin.h
 ${PLIST.pam}lib/openvpn/plugins/openvpn-plugin-auth-pam.la
@@ -13,6 +13,7 @@ share/doc/openvpn/README.IPv6
 ${PLIST.pam}share/doc/openvpn/README.auth-pam
 share/doc/openvpn/README.down-root
 share/doc/openvpn/README.mbedtls
+share/doc/openvpn/gui-notes.txt
 share/doc/openvpn/management-notes.txt
 share/examples/openvpn/config/README
 share/examples/openvpn/config/client.conf
diff --git a/net/openvpn/distinfo b/net/openvpn/distinfo
index c6eee65029e..8ccbba7ff9b 100644
--- a/net/openvpn/distinfo
+++ b/net/openvpn/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.48 2021/02/05 09:29:35 wiz Exp $
+$NetBSD: distinfo,v 1.49 2021/02/24 19:13:50 adam Exp $
 
-SHA1 (openvpn-2.5.0.tar.xz) = 63889f0a6c5080294d394314d22d9231d9913ad1
-RMD160 (openvpn-2.5.0.tar.xz) = 8afd3518cee352331aa3a861e6eefd440d3031eb
-SHA512 (openvpn-2.5.0.tar.xz) = 4d7175dc9b9cba84560fdb38ae9ff7f54c880c0927eee2874726e1558b8e553a6f4cf6cc26381c4bbc6541ec05419ac05a7554312140193903545b1da44f7771
-Size (openvpn-2.5.0.tar.xz) = 1126928 bytes
+SHA1 (openvpn-2.5.1.tar.xz) = 3cd781388bc11fe6242f1688bf8c1f9a7b3c22a4
+RMD160 (openvpn-2.5.1.tar.xz) = 6749b424a0fa670acbba7767ed965bdebce69e1e
+SHA512 (openvpn-2.5.1.tar.xz) = 7c0adad384f908bd7dbd839a2b90cbe3a4222cac92ef484df89709ca5dd6cb22b3caf19b696c2bb74d7eda148904a8b25f1fe4640c91f0e68d6e65bcf922e0f4
+Size (openvpn-2.5.1.tar.xz) = 1132708 bytes
 SHA1 (patch-configure) = 3f53e958ad96b81287d959363ec15acf37f50b31
-SHA1 (patch-doc_Makefile.in) = cda92d4c8b2f5e17a71990e39c8df8f95eea8e77
 SHA1 (patch-src_compat_compat-basename.c) = 45a58ef2e05f6e0265f229da8540760e60e65143
diff --git a/net/openvpn/patches/patch-doc_Makefile.in b/net/openvpn/patches/patch-doc_Makefile.in
deleted file mode 100644
index 0469fbd00c0..00000000000
--- a/net/openvpn/patches/patch-doc_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-doc_Makefile.in,v 1.2 2021/02/05 09:29:36 wiz Exp $
-
-Install openvpn(8).
-https://community.openvpn.net/openvpn/ticket/1382
-
---- doc/Makefile.in.orig	2020-10-28 07:25:32.000000000 +0000
-+++ doc/Makefile.in
-@@ -468,7 +468,7 @@ dist_noinst_DATA = README.plugins intera
- @HAVE_PYDOCUTILS_TRUE@CLEANFILES = \
- @HAVE_PYDOCUTILS_TRUE@	 openvpn.8 openvpn.8.html
- 
--@HAVE_PYDOCUTILS_TRUE@@WIN32_FALSE@dist_man_MANS = openvpn.8
-+@WIN32_FALSE@dist_man_MANS = openvpn.8
- all: all-recursive
- 
- .SUFFIXES: