git: 47340329e7b6 - main - security/openvpn: security update to v2.5.2

[Matthias Andree]

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=47340329e7b677aabf7caae900878c61c04f3b73

commit 47340329e7b677aabf7caae900878c61c04f3b73
Author:     Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-04-21 17:46:21 +0000
Commit:     Matthias Andree <mandree at FreeBSD.org>
CommitDate: 2021-04-21 17:48:54 +0000

    security/openvpn: security update to v2.5.2
    
    Changelog:      https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst#overview-of-changes-in-252
    
    Security:       CVE-2020-15078
    Security:       efb965be-a2c0-11eb-8956-1951a8617e30
    MFH:            2021Q2
---
 security/openvpn/Makefile | 11 ++++++-----
 security/openvpn/distinfo |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index 1e2a19dfc81a..93904f5908c9 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -1,7 +1,7 @@
 # Created by: Matthias Andree <mandree at FreeBSD.org>
 
 PORTNAME=		openvpn
-DISTVERSION=		2.5.1
+DISTVERSION=		2.5.2
 PORTREVISION?=		0
 CATEGORIES=		security net net-vpn
 MASTER_SITES=		https://swupdate.openvpn.org/community/releases/ \
@@ -34,11 +34,8 @@ SUB_FILES=		pkg-message openvpn-client
 PORTDOCS=		*
 PORTEXAMPLES=		*
 
-# avoid picking up CMAKE, we don't have cmocka in the tarballs.
-CONFIGURE_ENV+=		ac_cv_prog_CMAKE= CMAKE=
-
 OPTIONS_DEFINE=		PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME \
-			TEST LZ4 LZO SMALL TUNNELBLICK ASYNC_PUSH
+			TEST LZ4 LZO SMALL TUNNELBLICK ASYNC_PUSH UNITTESTS
 OPTIONS_DEFAULT=	EASYRSA OPENSSL TEST LZ4 LZO
 OPTIONS_SINGLE=		SSL
 OPTIONS_SINGLE_SSL=	OPENSSL MBEDTLS
@@ -48,6 +45,7 @@ MBEDTLS_DESC=		SSL/TLS via mbedTLS (lacks TLS v1.3)
 PKCS11_DESC=		Use security/pkcs11-helper (OpenSSL only)
 SMALL_DESC=		Build a smaller executable with fewer features
 TUNNELBLICK_DESC=	Tunnelblick XOR scramble patch (READ HELP!)
+UNITTESTS_DESC=		Enable unit tests
 X509ALTUSERNAME_DESC=	Enable --x509-username-field (OpenSSL only)
 
 ASYNC_PUSH_LIB_DEPENDS=	libinotify.so:devel/libinotify
@@ -79,6 +77,9 @@ TEST_TEST_TARGET_OFF=	check
 
 TUNNELBLICK_EXTRA_PATCHES=	${FILESDIR}/extra-tunnelblick-openvpn_xorpatch:-p1
 
+UNITTESTS_BUILD_DEPENDS=	cmocka>=0:sysutils/cmocka
+UNITTESTS_CONFIGURE_ENABLE=	unit-tests
+
 X509ALTUSERNAME_PREVENTS=	MBEDTLS
 X509ALTUSERNAME_PREVENTS_MSG=	OpenVPN ${DISTVERSION} cannot use --x509-username-field with mbedTLS. Disable X509ALTUSERNAME, or use OpenSSL instead
 X509ALTUSERNAME_CONFIGURE_ENABLE=	x509-alt-username
diff --git a/security/openvpn/distinfo b/security/openvpn/distinfo
index 2e53f51759f8..46c0867f3257 100644
--- a/security/openvpn/distinfo
+++ b/security/openvpn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614191992
-SHA256 (openvpn-2.5.1.tar.xz) = 40930489c837c05f6153f38e1ebaec244431ef1a034e4846ff732d71d59ff194
-SIZE (openvpn-2.5.1.tar.xz) = 1132708
+TIMESTAMP = 1619022841
+SHA256 (openvpn-2.5.2.tar.xz) = b12743836901f365efaf82ab2493967e1b21c21eb43ce9a8da1002a17c9c1dc8
+SIZE (openvpn-2.5.2.tar.xz) = 1134644