openvpn: updated to 2.5.4

Overview of changes in 2.5.4
============================
Bugfixes
--------
- fix prompting for password on windows console if stderr redirection
  is in use - this breaks 2.5.x on Win11/ARM, and might also break
  on Win11/adm64 when released.

- fix setting MAC address on TAP adapters (--lladdr) to use sitnl
  (was overlooked, and still used "ifconfig" calls)

- various improvements for man page building (rst2man/rst2html etc)

- minor bugfix with IN6_IS_ADDR_UNSPECIFIED() use (breaks build on
  at least one platform strictly checking this)

- fix minor memory leak under certain conditions in add_route() and
  add_route_ipv6()

User-visible Changes
--------------------
- documentation improvements

- copyright updates where needed

- better error reporting when win32 console access fails

New features
------------
- also build man page on Windows builds

6 files changed, 20 insertions, 20 deletions

diff --git a/net/openvpn-acct-wtmpx/distinfo b/net/openvpn-acct-wtmpx/distinfo
index 30206808f7b..dad8b1d7664 100644
--- a/net/openvpn-acct-wtmpx/distinfo
+++ b/net/openvpn-acct-wtmpx/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2021/07/27 07:35:05 adam Exp $
+$NetBSD: distinfo,v 1.27 2021/10/05 19:25:42 adam Exp $
 
-SHA1 (openvpn-2.5.3.tar.xz) = 9bcb8aaa0a56ba7d7af4c2c1f2c955f2026b28a7
-RMD160 (openvpn-2.5.3.tar.xz) = 0fd6f0f32105a3997f6359fd5818e3695d7b51c3
-SHA512 (openvpn-2.5.3.tar.xz) = bde61a12cef76c54a8d120e2bf3dfd04b9b76f28180bb8b9a496f27ad9cb545cf1137aa2751df5944e81356899b3824f06b8cfd777496212768e2b9aecf7bf6d
-Size (openvpn-2.5.3.tar.xz) = 1149004 bytes
+SHA1 (openvpn-2.5.4.tar.xz) = e08ea9786ad2a9db23c35c190a496d9d6603aa97
+RMD160 (openvpn-2.5.4.tar.xz) = c6f260de3b2fe91c5a643dc6e8c7d3c6559dc6de
+SHA512 (openvpn-2.5.4.tar.xz) = 747876f56f0983520d8bce04cf76b05df8fbb9ff7f2091cbbaf22f230397721b929fb6b7d7060f1f898ebc0142fdb82c4ccc19405aa0622db8cc9351997d858f
+Size (openvpn-2.5.4.tar.xz) = 1150604 bytes
 SHA1 (openvpn-acct-wtmpx-20130210.tgz) = cf7bc26b12a65493cdf5db93b03bbb938a2f0f33
 RMD160 (openvpn-acct-wtmpx-20130210.tgz) = d9000789f04606bfa17db1597a45a4235b1119ea
 SHA512 (openvpn-acct-wtmpx-20130210.tgz) = 7b8fd4929e65d8d84158f62e5a17ff3adb3b4a6cff63b29038acfb368750719f2f593786ed9b02402824c19d872b188d2a46740a5c5f853e8873a71481b13aaf
diff --git a/net/openvpn-nagios/distinfo b/net/openvpn-nagios/distinfo
index 4e5dd8800e1..40de427b89e 100644
--- a/net/openvpn-nagios/distinfo
+++ b/net/openvpn-nagios/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2021/07/27 07:35:05 adam Exp $
+$NetBSD: distinfo,v 1.24 2021/10/05 19:25:42 adam Exp $
 
-SHA1 (openvpn-2.5.3.tar.xz) = 9bcb8aaa0a56ba7d7af4c2c1f2c955f2026b28a7
-RMD160 (openvpn-2.5.3.tar.xz) = 0fd6f0f32105a3997f6359fd5818e3695d7b51c3
-SHA512 (openvpn-2.5.3.tar.xz) = bde61a12cef76c54a8d120e2bf3dfd04b9b76f28180bb8b9a496f27ad9cb545cf1137aa2751df5944e81356899b3824f06b8cfd777496212768e2b9aecf7bf6d
-Size (openvpn-2.5.3.tar.xz) = 1149004 bytes
+SHA1 (openvpn-2.5.4.tar.xz) = e08ea9786ad2a9db23c35c190a496d9d6603aa97
+RMD160 (openvpn-2.5.4.tar.xz) = c6f260de3b2fe91c5a643dc6e8c7d3c6559dc6de
+SHA512 (openvpn-2.5.4.tar.xz) = 747876f56f0983520d8bce04cf76b05df8fbb9ff7f2091cbbaf22f230397721b929fb6b7d7060f1f898ebc0142fdb82c4ccc19405aa0622db8cc9351997d858f
+Size (openvpn-2.5.4.tar.xz) = 1150604 bytes
 SHA1 (openvpn-nagios-20130210.tgz) = 8a0fd4e3eba27584aa53c5589c13d4b38af43ba2
 RMD160 (openvpn-nagios-20130210.tgz) = 2a47893ec2db2c280adc7b9fbbea97794ec1a6f4
 SHA512 (openvpn-nagios-20130210.tgz) = 80e565f32379c39eb6c7f3b4744af221ae882ff07dce9dae5bd7feb73b0edcfc7c7ac7f70d23fdcd4f492b66f095f09833deb122449840b36ea606ce91900358
diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 4ccf6b21e10..451b64bd4f6 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2021/09/29 19:01:10 adam Exp $
+# $NetBSD: Makefile,v 1.88 2021/10/05 19:25:41 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 73ef0997e0e..93bf30078c6 100644
--- a/net/openvpn/Makefile.common
+++ b/net/openvpn/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.22 2021/07/27 07:35:05 adam Exp $
+# $NetBSD: Makefile.common,v 1.23 2021/10/05 19:25:41 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.3
+OPENVPN_DISTNAME=		openvpn-2.5.4
 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 d639785abab..27b7caf35fa 100644
--- a/net/openvpn/PLIST
+++ b/net/openvpn/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.23 2021/02/24 19:13:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2021/10/05 19:25:41 adam Exp $
 include/openvpn-msg.h
 include/openvpn-plugin.h
 ${PLIST.pam}lib/openvpn/plugins/openvpn-plugin-auth-pam.la
 lib/openvpn/plugins/openvpn-plugin-down-root.la
+man/man5/openvpn-examples.5
 man/man8/openvpn.8
 sbin/openvpn
 share/doc/openvpn/COPYING
diff --git a/net/openvpn/distinfo b/net/openvpn/distinfo
index 31570cba23f..4b13540b40b 100644
--- a/net/openvpn/distinfo
+++ b/net/openvpn/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.51 2021/07/27 07:35:05 adam Exp $
+$NetBSD: distinfo,v 1.52 2021/10/05 19:25:41 adam Exp $
 
-SHA1 (openvpn-2.5.3.tar.xz) = 9bcb8aaa0a56ba7d7af4c2c1f2c955f2026b28a7
-RMD160 (openvpn-2.5.3.tar.xz) = 0fd6f0f32105a3997f6359fd5818e3695d7b51c3
-SHA512 (openvpn-2.5.3.tar.xz) = bde61a12cef76c54a8d120e2bf3dfd04b9b76f28180bb8b9a496f27ad9cb545cf1137aa2751df5944e81356899b3824f06b8cfd777496212768e2b9aecf7bf6d
-Size (openvpn-2.5.3.tar.xz) = 1149004 bytes
+SHA1 (openvpn-2.5.4.tar.xz) = e08ea9786ad2a9db23c35c190a496d9d6603aa97
+RMD160 (openvpn-2.5.4.tar.xz) = c6f260de3b2fe91c5a643dc6e8c7d3c6559dc6de
+SHA512 (openvpn-2.5.4.tar.xz) = 747876f56f0983520d8bce04cf76b05df8fbb9ff7f2091cbbaf22f230397721b929fb6b7d7060f1f898ebc0142fdb82c4ccc19405aa0622db8cc9351997d858f
+Size (openvpn-2.5.4.tar.xz) = 1150604 bytes
 SHA1 (patch-configure) = 3f53e958ad96b81287d959363ec15acf37f50b31
 SHA1 (patch-src_compat_compat-basename.c) = 45a58ef2e05f6e0265f229da8540760e60e65143