Date: Fri, 6 Sep 2019 18:16:53 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511348 - head/security/openvpn/files Message-ID: <201909061816.x86IGrD8019119@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Fri Sep 6 18:16:53 2019 New Revision: 511348 URL: https://svnweb.freebsd.org/changeset/ports/511348 Log: Fix a sed regexp from GNUism to POSIX. Thanks! Also sent upstream for inclusion today, https://sourceforge.net/p/openvpn/mailman/message/36757480/ and https://sourceforge.net/p/openvpn/mailman/message/36757481/ PR: 240306 Submitted by: kevans@ Added: head/security/openvpn/files/patch-src_openvpn_openssl__compat.h - copied, changed from r511347, head/security/openvpn/files/patch-libressl head/security/openvpn/files/patch-tests_t__lpback.sh (contents, props changed) Deleted: head/security/openvpn/files/patch-libressl Modified: head/security/openvpn/files/patch-configure Modified: head/security/openvpn/files/patch-configure ============================================================================== --- head/security/openvpn/files/patch-configure Fri Sep 6 18:02:08 2019 (r511347) +++ head/security/openvpn/files/patch-configure Fri Sep 6 18:16:53 2019 (r511348) @@ -1,6 +1,6 @@ ---- configure.orig 2016-08-23 14:19:07 UTC +--- configure.orig 2019-02-20 12:28:34 UTC +++ configure -@@ -17160,8 +17160,6 @@ fi +@@ -18120,8 +18120,6 @@ fi $as_echo "!! WARNING !! The cmoka git submodule has not been initialized or updated. Unit testing cannot be performed." >&6; } fi else Copied and modified: head/security/openvpn/files/patch-src_openvpn_openssl__compat.h (from r511347, head/security/openvpn/files/patch-libressl) ============================================================================== --- head/security/openvpn/files/patch-libressl Fri Sep 6 18:02:08 2019 (r511347, copy source) +++ head/security/openvpn/files/patch-src_openvpn_openssl__compat.h Fri Sep 6 18:16:53 2019 (r511348) @@ -1,6 +1,6 @@ ---- ./src/openvpn/openssl_compat.h 2018-03-01 07:22:19.000000000 +0000 -+++ ./src/openvpn/openssl_compat.h 2018-03-12 10:44:08.876010487 +0000 -@@ -711,7 +711,7 @@ +--- src/openvpn/openssl_compat.h.orig 2019-02-20 12:28:23 UTC ++++ src/openvpn/openssl_compat.h +@@ -735,7 +735,7 @@ SSL_CTX_get_max_proto_version(SSL_CTX *ctx) } #endif /* SSL_CTX_get_max_proto_version */ @@ -9,7 +9,7 @@ /** Mimics SSL_CTX_set_min_proto_version for OpenSSL < 1.1 */ static inline int SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min) -@@ -740,7 +740,7 @@ +@@ -764,7 +764,7 @@ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_v } #endif /* SSL_CTX_set_min_proto_version */ Added: head/security/openvpn/files/patch-tests_t__lpback.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvpn/files/patch-tests_t__lpback.sh Fri Sep 6 18:16:53 2019 (r511348) @@ -0,0 +1,11 @@ +--- tests/t_lpback.sh.orig 2019-09-03 13:22:50 UTC ++++ tests/t_lpback.sh +@@ -26,7 +26,7 @@ trap "rm -f key.$$ tc-server-key.$$ tc-client-key.$$ l + + # Get list of supported ciphers from openvpn --show-ciphers output + CIPHERS=$(${top_builddir}/src/openvpn/openvpn --show-ciphers | \ +- sed -e '/The following/,/^$/d' -e s'/ .*//' -e '/^\s*$/d') ++ sed -e '/The following/,/^$/d' -e s'/ .*//' -e '/^[[:space:]]*$/d') + + # SK, 2014-06-04: currently the DES-EDE3-CFB1 implementation of OpenSSL is + # broken (see http://rt.openssl.org/Ticket/Display.html?id=2867), so exclude
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909061816.x86IGrD8019119>