openvpn: updated to 2.5.6

OpenVPN 2.5.6.
This is mostly a bugfix release including one security fix ("Disallow multiple deferred authentication plug-ins.", CVE: 2022-0547).

6 files changed, 21 insertions, 22 deletions

diff --git a/net/openvpn-acct-wtmpx/distinfo b/net/openvpn-acct-wtmpx/distinfo
index 711e82fb0ee..f57018e2dc6 100644
--- a/net/openvpn-acct-wtmpx/distinfo
+++ b/net/openvpn-acct-wtmpx/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2021/12/15 20:11:51 adam Exp $
+$NetBSD: distinfo,v 1.31 2022/03/17 07:50:17 adam Exp $
 
-BLAKE2s (openvpn-2.5.5.tar.xz) = 3b1f4fe09fe389fbf19480d0a450ceff5dfb59707cb8e8d975ebe6edbeab1165
-SHA512 (openvpn-2.5.5.tar.xz) = 22040f61cfd885290e178fbbfa0035fafe252d64f573bf291722e685033739240392ed694d5f295cd2c52697818a39c2a9c2592f3356ebf30fecf07feb445795
-Size (openvpn-2.5.5.tar.xz) = 1147184 bytes
+BLAKE2s (openvpn-2.5.6.tar.gz) = 0a7b7ffc436c1c94bcd35e0b4349941a1ea4f6509f78bc20658d143309b8bd92
+SHA512 (openvpn-2.5.6.tar.gz) = 0bb0dda44ff757cf5249b6c047932c51073344a1d69048f210da421263a07bb5f4370f5b0c3ed4fdd6c6da2888d28fe8ee8947b59594f4c17a9ea20588852bc0
+Size (openvpn-2.5.6.tar.gz) = 1853186 bytes
 BLAKE2s (openvpn-acct-wtmpx-20130210.tgz) = 2bb02a4e6adb7ce1d189271a6fbb6cbffd6a37d7b5e75cccebfc8dfac6dbaddd
 SHA512 (openvpn-acct-wtmpx-20130210.tgz) = 7b8fd4929e65d8d84158f62e5a17ff3adb3b4a6cff63b29038acfb368750719f2f593786ed9b02402824c19d872b188d2a46740a5c5f853e8873a71481b13aaf
 Size (openvpn-acct-wtmpx-20130210.tgz) = 2778 bytes
diff --git a/net/openvpn-nagios/distinfo b/net/openvpn-nagios/distinfo
index 687a533bc74..abd961d2643 100644
--- a/net/openvpn-nagios/distinfo
+++ b/net/openvpn-nagios/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2021/12/15 20:11:51 adam Exp $
+$NetBSD: distinfo,v 1.28 2022/03/17 07:50:18 adam Exp $
 
-BLAKE2s (openvpn-2.5.5.tar.xz) = 3b1f4fe09fe389fbf19480d0a450ceff5dfb59707cb8e8d975ebe6edbeab1165
-SHA512 (openvpn-2.5.5.tar.xz) = 22040f61cfd885290e178fbbfa0035fafe252d64f573bf291722e685033739240392ed694d5f295cd2c52697818a39c2a9c2592f3356ebf30fecf07feb445795
-Size (openvpn-2.5.5.tar.xz) = 1147184 bytes
+BLAKE2s (openvpn-2.5.6.tar.gz) = 0a7b7ffc436c1c94bcd35e0b4349941a1ea4f6509f78bc20658d143309b8bd92
+SHA512 (openvpn-2.5.6.tar.gz) = 0bb0dda44ff757cf5249b6c047932c51073344a1d69048f210da421263a07bb5f4370f5b0c3ed4fdd6c6da2888d28fe8ee8947b59594f4c17a9ea20588852bc0
+Size (openvpn-2.5.6.tar.gz) = 1853186 bytes
 BLAKE2s (openvpn-nagios-20130210.tgz) = 713b55e865350c44a314aa3b48694695f4d82b50883d1fae919f01e9545c7c34
 SHA512 (openvpn-nagios-20130210.tgz) = 80e565f32379c39eb6c7f3b4744af221ae882ff07dce9dae5bd7feb73b0edcfc7c7ac7f70d23fdcd4f492b66f095f09833deb122449840b36ea606ce91900358
 Size (openvpn-nagios-20130210.tgz) = 3034 bytes
diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index a38f3ffede3..d2deaf74087 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.91 2021/12/15 20:11:51 adam Exp $
+# $NetBSD: Makefile,v 1.92 2022/03/17 07:50:17 adam Exp $
 
 DISTNAME=	${OPENVPN_DISTNAME}
 CATEGORIES=	net
 MASTER_SITES=	${OPENVPN_MASTER_SITES}
-EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://openvpn.net/
diff --git a/net/openvpn/Makefile.common b/net/openvpn/Makefile.common
index 9200cbf79e6..75beadee074 100644
--- a/net/openvpn/Makefile.common
+++ b/net/openvpn/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.24 2021/12/15 20:11:51 adam Exp $
+# $NetBSD: Makefile.common,v 1.25 2022/03/17 07:50:17 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.5
-OPENVPN_DISTFILE=		${OPENVPN_DISTNAME}.tar.xz
+OPENVPN_DISTNAME=		openvpn-2.5.6
+OPENVPN_DISTFILE=		${OPENVPN_DISTNAME}.tar.gz
 OPENVPN_MASTER_SITES=		https://swupdate.openvpn.org/community/releases/
 SITES.${OPENVPN_DISTFILE}=	${OPENVPN_MASTER_SITES}
 
diff --git a/net/openvpn/distinfo b/net/openvpn/distinfo
index faeb293865f..a6b15cefeeb 100644
--- a/net/openvpn/distinfo
+++ b/net/openvpn/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.55 2021/12/15 20:11:51 adam Exp $
+$NetBSD: distinfo,v 1.56 2022/03/17 07:50:17 adam Exp $
 
-BLAKE2s (openvpn-2.5.5.tar.xz) = 3b1f4fe09fe389fbf19480d0a450ceff5dfb59707cb8e8d975ebe6edbeab1165
-SHA512 (openvpn-2.5.5.tar.xz) = 22040f61cfd885290e178fbbfa0035fafe252d64f573bf291722e685033739240392ed694d5f295cd2c52697818a39c2a9c2592f3356ebf30fecf07feb445795
-Size (openvpn-2.5.5.tar.xz) = 1147184 bytes
-SHA1 (patch-configure) = 3f53e958ad96b81287d959363ec15acf37f50b31
+BLAKE2s (openvpn-2.5.6.tar.gz) = 0a7b7ffc436c1c94bcd35e0b4349941a1ea4f6509f78bc20658d143309b8bd92
+SHA512 (openvpn-2.5.6.tar.gz) = 0bb0dda44ff757cf5249b6c047932c51073344a1d69048f210da421263a07bb5f4370f5b0c3ed4fdd6c6da2888d28fe8ee8947b59594f4c17a9ea20588852bc0
+Size (openvpn-2.5.6.tar.gz) = 1853186 bytes
+SHA1 (patch-configure) = ad37ce26c1596699b6534c5f0077490abb55160b
 SHA1 (patch-src_compat_compat-basename.c) = 45a58ef2e05f6e0265f229da8540760e60e65143
diff --git a/net/openvpn/patches/patch-configure b/net/openvpn/patches/patch-configure
index d4dabf620ab..d88d11fa5b1 100644
--- a/net/openvpn/patches/patch-configure
+++ b/net/openvpn/patches/patch-configure
@@ -1,14 +1,14 @@
-$NetBSD: patch-configure,v 1.2 2020/11/17 12:13:01 adam Exp $
+$NetBSD: patch-configure,v 1.3 2022/03/17 07:50:17 adam Exp $
 
 Support net/if_tap.h
 
---- configure.orig	2020-10-28 07:25:31.000000000 +0000
+--- configure.orig	2022-03-16 12:16:26.000000000 +0000
 +++ configure
-@@ -15069,6 +15069,7 @@ for ac_header in  \
+@@ -15081,6 +15081,7 @@ for ac_header in  \
  	sys/mman.h sys/file.h sys/wait.h \
  	unistd.h signal.h libgen.h stropts.h \
  	syslog.h pwd.h grp.h \
 +	net/if_tap.h \
  	sys/sockio.h sys/uio.h linux/sockios.h \
- 	linux/types.h poll.h sys/epoll.h err.h \
+ 	linux/types.h linux/errqueue.h poll.h sys/epoll.h err.h \