git: ae33c30fb0de - main - security/openvpn: update to 2.5.8

The branch main has been updated by mandree:

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

commit ae33c30fb0de4184a0987616465273db11eabe5e
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2022-10-28 18:16:20 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2022-10-28 18:24:56 +0000

    security/openvpn: update to 2.5.8
    
    Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst#overview-of-changes-in-258
---
 security/openvpn/Makefile | 16 ++++++++++------
 security/openvpn/distinfo |  6 +++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index 7e8497100c9e..e14df3d594dc 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		openvpn
-DISTVERSION=		2.5.7
-PORTREVISION?=		3
+DISTVERSION=		2.5.8
+PORTREVISION?=		0
 CATEGORIES=		security net net-vpn
 MASTER_SITES=		https://swupdate.openvpn.org/community/releases/ \
 			https://build.openvpn.net/downloads/releases/ \
@@ -41,7 +41,7 @@ OPTIONS_DEFAULT=	EASYRSA LZ4 LZO PKCS11 TEST
 ASYNC_PUSH_DESC=	Enable async-push support
 EASYRSA_DESC=		Install security/easy-rsa RSA helper package
 LZO_DESC=		LZO compression (incompatible with LibreSSL)
-PKCS11_DESC=		Use security/pkcs11-helper
+PKCS11_DESC=		Use security/pkcs11-helper, needs same SSL lib!
 SMALL_DESC=		Build a smaller executable with fewer features
 UNITTESTS_DESC=		Enable unit tests
 X509ALTUSERNAME_DESC=	Enable --x509-username-field
@@ -102,6 +102,9 @@ post-patch:
 		${WRKSRC}/doc/man-sections/generic-options.rst
 
 pre-configure:
+	# just too many of sign-compare; bitwise-instead-of-logical was audited and is intentional,
+	# and unused-function affects test---these are developer-side warnings, not relevant on end systems
+	${REINPLACE_CMD} 's/-Wsign-compare/-Wno-unknown-warning-option -Wno-sign-compare -Wno-bitwise-instead-of-logical -Wno-unused-function/' ${WRKSRC}/configure
 .ifdef (LOG_OPENVPN)
 	@${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}"
 .else
@@ -118,12 +121,13 @@ pre-configure:
 	@${ECHO} "### Do not report bugs without fixes/patches unless the issue ###"
 	@${ECHO} "### can be reproduced with a released OpenSSL version.        ###"
 	@${ECHO} "### --------------------------------------------------------- ###"
+	@sleep 10
 .endif
 
 post-configure:
 	${REINPLACE_CMD} '/^CFLAGS =/s/$$/ -fPIC/' \
-	    ${WRKSRC}/src/plugins/auth-pam/Makefile \
-	    ${WRKSRC}/src/plugins/down-root/Makefile
+	 	${WRKSRC}/src/plugins/auth-pam/Makefile \
+	 	${WRKSRC}/src/plugins/down-root/Makefile
 
 # sanity check that we don't inherit incompatible SSL libs through,
 # for instance, pkcs11-helper:
@@ -131,7 +135,7 @@ _tlslibs=libssl libcrypto
 post-build:
 	@a=$$(LC_ALL=C ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \
 	|	${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\
-	if test "$$*" != "1" ; then ${ECHO_CMD} >&2 "${.CURDIR} FAILED: either of ${_tlslibs} libraries linked multiple times" ; ${PRINTF} '%s\n' "$$a"; ${RM} ${BUILD_COOKIE} ; ( set -x ; ldd -a ${WRKSRC}/src/openvpn/openvpn ) ; exit 1 ; fi
+	if test "$$*" != "1" ; then ( set -x ; ldd -a ${WRKSRC}/src/openvpn/openvpn ) ; ${PRINTF} '%s\n' "$$a" ; ${ECHO_CMD} >&2 "${.CURDIR} FAILED: either of ${_tlslibs} libraries linked multiple times" ; ${RM} ${BUILD_COOKIE} ; exit 1 ; fi
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-auth-pam.so
diff --git a/security/openvpn/distinfo b/security/openvpn/distinfo
index c0b63a7bfe5e..b411c3f73145 100644
--- a/security/openvpn/distinfo
+++ b/security/openvpn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653761260
-SHA256 (openvpn-2.5.7.tar.xz) = 313bca7e996a4f59ef9940dd87c6c4b9168064db9be6cabebd37cd65f13759ed
-SIZE (openvpn-2.5.7.tar.xz) = 1150476
+TIMESTAMP = 1666977762
+SHA256 (openvpn-2.5.8.tar.xz) = 2bbd0026469902037ee6499b68283d5ab36c74e36cae3112082cfdf6c77a0c57
+SIZE (openvpn-2.5.8.tar.xz) = 1161288