diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2019-09-06 18:16:53 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2019-09-06 18:16:53 +0000 |
| commit | 5cf5a2a3b7af2a604b099cc0c64772bc1ddce982 (patch) | |
| tree | a718a6e81c8b26bbd1c8e9e68002cbd2445e6d27 /security/openvpn/files | |
| parent | - shift hosting distfile at FreeBSD resources to SF (diff) | |
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@
Diffstat (limited to 'security/openvpn/files')
| -rw-r--r-- | security/openvpn/files/patch-configure | 4 | ||||
| -rw-r--r-- | security/openvpn/files/patch-src_openvpn_openssl__compat.h (renamed from security/openvpn/files/patch-libressl) | 8 | ||||
| -rw-r--r-- | security/openvpn/files/patch-tests_t__lpback.sh | 11 |
3 files changed, 17 insertions, 6 deletions
diff --git a/security/openvpn/files/patch-configure b/security/openvpn/files/patch-configure index 226436314279..ad89145fa80c 100644 --- a/security/openvpn/files/patch-configure +++ b/security/openvpn/files/patch-configure @@ -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 diff --git a/security/openvpn/files/patch-libressl b/security/openvpn/files/patch-src_openvpn_openssl__compat.h index 8b139124328a..4f72e79ef421 100644 --- a/security/openvpn/files/patch-libressl +++ b/security/openvpn/files/patch-src_openvpn_openssl__compat.h @@ -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 */ diff --git a/security/openvpn/files/patch-tests_t__lpback.sh b/security/openvpn/files/patch-tests_t__lpback.sh new file mode 100644 index 000000000000..c92fb42135f3 --- /dev/null +++ b/security/openvpn/files/patch-tests_t__lpback.sh @@ -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 |