git: 24b0c58ea4e8 - main - security/openvpn: update to v2.5.3

[Matthias Andree]

The branch main has been updated by mandree:

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

commit 24b0c58ea4e8f9562f6c260cc567aba9e1f63ed3
Author:     Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-06-18 21:54:55 +0000
Commit:     Matthias Andree <mandree at FreeBSD.org>
CommitDate: 2021-06-18 21:58:29 +0000

    security/openvpn: update to v2.5.3
    
    Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst
    
    FreeBSD relevant changes:
    Bugfixes
    *   disable connect-retry backoff for p2p (--secret) instances (Trac #1010, #1384)
    *   fix build with mbedtls w/o SSL renegotiation support
    *   fix small memory leak in free_key_ctx for auth_token
    *   Fix SIGSEGV (NULL deref) receiving push "echo" (Trac #1409) -
        -> in FreeBSD ports, already fixed in 2.5.2_2 (PORTREVISION 2).
    
    User-visible Changes
    *   update copyright messages in files and --version output
    
    New features
    *   add --auth-token-user option (for --auth-token deployments without --auth-user-pass in client config)
---
 security/openvpn/Makefile                          |  4 ++--
 security/openvpn/distinfo                          |  6 +++---
 security/openvpn/files/patch-src_openvpn_options.c | 11 -----------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index 9119e2dfa9ab..f71a1a813a10 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -1,8 +1,8 @@
 # Created by: Matthias Andree <mandree at FreeBSD.org>
 
 PORTNAME=		openvpn
-DISTVERSION=		2.5.2
-PORTREVISION?=		2
+DISTVERSION=		2.5.3
+PORTREVISION?=		0
 CATEGORIES=		security net net-vpn
 MASTER_SITES=		https://swupdate.openvpn.org/community/releases/ \
 			https://build.openvpn.net/downloads/releases/ \
diff --git a/security/openvpn/distinfo b/security/openvpn/distinfo
index 46c0867f3257..942785f21e07 100644
--- a/security/openvpn/distinfo
+++ b/security/openvpn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619022841
-SHA256 (openvpn-2.5.2.tar.xz) = b12743836901f365efaf82ab2493967e1b21c21eb43ce9a8da1002a17c9c1dc8
-SIZE (openvpn-2.5.2.tar.xz) = 1134644
+TIMESTAMP = 1624052196
+SHA256 (openvpn-2.5.3.tar.xz) = fb6a9943c603a1951ca13e9267653f8dd650c02f84bccd2b9d20f06a4c9c9a7e
+SIZE (openvpn-2.5.3.tar.xz) = 1149004
diff --git a/security/openvpn/files/patch-src_openvpn_options.c b/security/openvpn/files/patch-src_openvpn_options.c
deleted file mode 100644
index e46faee8efd0..000000000000
--- a/security/openvpn/files/patch-src_openvpn_options.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/openvpn/options.c.orig	2021-04-21 04:02:50 UTC
-+++ src/openvpn/options.c
-@@ -5319,7 +5319,7 @@ add_option(struct options *options,
-         {
-             /* only message-related ECHO are logged, since other ECHOs
-              * can potentially include security-sensitive strings */
--            if (strncmp(p[1], "msg", 3) == 0)
-+            if (p[1] && strncmp(p[1], "msg", 3) == 0)
-             {
-                 msg(M_INFO, "%s:%s",
-                     pull_mode ? "ECHO-PULL" : "ECHO",