openvpn: 2.4.6

OpenVPN 2.4.6
management: Warn if TCP port is used without password

Correct version in ChangeLog - should be 2.4.5, was mistyped as 2.4.4
Fix potential double-free() in Interactive Service (CVE-2018-9336)
preparing release v2.4.6 (ChangeLog, version.m4, Changes.rst)

manpage: improve description of --status and --status-version

Make return code external tls key match docs

Delete the IPv6 route to the "connected" network on tun close
Management: warn about password only when the option is in use
Avoid overflow in wakeup time computation

Add missing #ifdef SSL_OP_NO_TLSv1_1/2

Check for more data in control channel

5 files changed, 18 insertions, 19 deletions

diff --git a/net/openvpn-acct-wtmpx/distinfo b/net/openvpn-acct-wtmpx/distinfo
index a54c93f319a..5549a2d6c39 100644
--- a/net/openvpn-acct-wtmpx/distinfo
+++ b/net/openvpn-acct-wtmpx/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2018/03/13 18:12:50 adam Exp $
+$NetBSD: distinfo,v 1.19 2018/04/27 06:40:28 adam Exp $
 
-SHA1 (openvpn-2.4.5.tar.xz) = 3de90fa540564f70981b316340e4100ab505d22a
-RMD160 (openvpn-2.4.5.tar.xz) = c3185467f3bbb176c0cd4e6c83a171aaa202a784
-SHA512 (openvpn-2.4.5.tar.xz) = a1a169039142bd64e7fc6e8b79d73e0b180e7195e3d57b18700fb1930bdc50c6d18f5c28e2715f4de753ce7d5f09ca3387573355e6d1fbd17ca5fbfc9a6cb47e
-Size (openvpn-2.4.5.tar.xz) = 942696 bytes
+SHA1 (openvpn-2.4.6.tar.xz) = 4742492867df31aadc0aeea5c8b4422d1a624e69
+RMD160 (openvpn-2.4.6.tar.xz) = 9fb17a39b70d96ecc3075a78011496b239e741d6
+SHA512 (openvpn-2.4.6.tar.xz) = da4301a4655a5bc224de59ba74fe15005ea856cc43b404aa32caa7065f49adc69f4747ba646f228554d5b6629323f434ee0e04ee71d2103964b9bab23d185ebe
+Size (openvpn-2.4.6.tar.xz) = 943376 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 0fa913a6e16..8be8fdc90cd 100644
--- a/net/openvpn-nagios/distinfo
+++ b/net/openvpn-nagios/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2018/03/13 18:12:50 adam Exp $
+$NetBSD: distinfo,v 1.16 2018/04/27 06:40:28 adam Exp $
 
-SHA1 (openvpn-2.4.5.tar.xz) = 3de90fa540564f70981b316340e4100ab505d22a
-RMD160 (openvpn-2.4.5.tar.xz) = c3185467f3bbb176c0cd4e6c83a171aaa202a784
-SHA512 (openvpn-2.4.5.tar.xz) = a1a169039142bd64e7fc6e8b79d73e0b180e7195e3d57b18700fb1930bdc50c6d18f5c28e2715f4de753ce7d5f09ca3387573355e6d1fbd17ca5fbfc9a6cb47e
-Size (openvpn-2.4.5.tar.xz) = 942696 bytes
+SHA1 (openvpn-2.4.6.tar.xz) = 4742492867df31aadc0aeea5c8b4422d1a624e69
+RMD160 (openvpn-2.4.6.tar.xz) = 9fb17a39b70d96ecc3075a78011496b239e741d6
+SHA512 (openvpn-2.4.6.tar.xz) = da4301a4655a5bc224de59ba74fe15005ea856cc43b404aa32caa7065f49adc69f4747ba646f228554d5b6629323f434ee0e04ee71d2103964b9bab23d185ebe
+Size (openvpn-2.4.6.tar.xz) = 943376 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 d698958ef66..6cd441cca1e 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2018/04/17 22:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2018/04/27 06:40:28 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 897478cc947..e9fabed58c6 100644
--- a/net/openvpn/Makefile.common
+++ b/net/openvpn/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.13 2018/03/13 18:12:50 adam Exp $
+# $NetBSD: Makefile.common,v 1.14 2018/04/27 06:40:28 adam Exp $
 # used by net/openvpn/Makefile
 # used by net/openvpn-acct-wtmpx/Makefile
 # used by net/openvpn-nagios/Makefile
 
-OPENVPN_DISTNAME=	openvpn-2.4.5
+OPENVPN_DISTNAME=	openvpn-2.4.6
 OPENVPN_DISTFILE=	${OPENVPN_DISTNAME}.tar.xz
 OPENVPN_MASTER_SITES=	http://swupdate.openvpn.org/community/releases/
 SITES.${OPENVPN_DISTFILE}=	${OPENVPN_MASTER_SITES}
diff --git a/net/openvpn/distinfo b/net/openvpn/distinfo
index 68e8db6536a..f0fef033380 100644
--- a/net/openvpn/distinfo
+++ b/net/openvpn/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.40 2018/03/13 18:12:50 adam Exp $
+$NetBSD: distinfo,v 1.41 2018/04/27 06:40:28 adam Exp $
 
-SHA1 (openvpn-2.4.5.tar.xz) = 3de90fa540564f70981b316340e4100ab505d22a
-RMD160 (openvpn-2.4.5.tar.xz) = c3185467f3bbb176c0cd4e6c83a171aaa202a784
-SHA512 (openvpn-2.4.5.tar.xz) = a1a169039142bd64e7fc6e8b79d73e0b180e7195e3d57b18700fb1930bdc50c6d18f5c28e2715f4de753ce7d5f09ca3387573355e6d1fbd17ca5fbfc9a6cb47e
-Size (openvpn-2.4.5.tar.xz) = 942696 bytes
+SHA1 (openvpn-2.4.6.tar.xz) = 4742492867df31aadc0aeea5c8b4422d1a624e69
+RMD160 (openvpn-2.4.6.tar.xz) = 9fb17a39b70d96ecc3075a78011496b239e741d6
+SHA512 (openvpn-2.4.6.tar.xz) = da4301a4655a5bc224de59ba74fe15005ea856cc43b404aa32caa7065f49adc69f4747ba646f228554d5b6629323f434ee0e04ee71d2103964b9bab23d185ebe
+Size (openvpn-2.4.6.tar.xz) = 943376 bytes
 SHA1 (patch-configure) = 240342a88baed7642dfd63ed0a2ab4c0a75adbd4
 SHA1 (patch-src_compat_compat-basename.c) = 45a58ef2e05f6e0265f229da8540760e60e65143