Index: head/security/openvpn/files/patch-libressl =================================================================== --- head/security/openvpn/files/patch-libressl (revision 511347) +++ head/security/openvpn/files/patch-libressl (nonexistent) @@ -1,20 +0,0 @@ ---- ./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 @@ - } - #endif /* SSL_CTX_get_max_proto_version */ - --#ifndef SSL_CTX_set_min_proto_version -+#if !defined(SSL_CTX_set_min_proto_version) && !defined(LIBRESSL_VERSION_NUMBER) - /** 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 @@ - } - #endif /* SSL_CTX_set_min_proto_version */ - --#ifndef SSL_CTX_set_max_proto_version -+#if !defined(SSL_CTX_set_max_proto_version) && !defined(LIBRESSL_VERSION_NUMBER) - /** Mimics SSL_CTX_set_max_proto_version for OpenSSL < 1.1 */ - static inline int - SSL_CTX_set_max_proto_version(SSL_CTX *ctx, long tls_ver_max) Property changes on: head/security/openvpn/files/patch-libressl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/openvpn/files/patch-configure =================================================================== --- head/security/openvpn/files/patch-configure (revision 511347) +++ head/security/openvpn/files/patch-configure (revision 511348) @@ -1,11 +1,11 @@ ---- 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: !! WARNING !! CMake is NOT available. Unit testing cannot be performed." >&5 -$as_echo "!! WARNING !! CMake is NOT available. Unit testing cannot be performed." >&6; } if false; then CMOCKA_INITIALIZED_TRUE= CMOCKA_INITIALIZED_FALSE='#' Index: head/security/openvpn/files/patch-src_openvpn_openssl__compat.h =================================================================== --- head/security/openvpn/files/patch-src_openvpn_openssl__compat.h (nonexistent) +++ head/security/openvpn/files/patch-src_openvpn_openssl__compat.h (revision 511348) @@ -0,0 +1,20 @@ +--- 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 */ + +-#ifndef SSL_CTX_set_min_proto_version ++#if !defined(SSL_CTX_set_min_proto_version) && !defined(LIBRESSL_VERSION_NUMBER) + /** 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) +@@ -764,7 +764,7 @@ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_v + } + #endif /* SSL_CTX_set_min_proto_version */ + +-#ifndef SSL_CTX_set_max_proto_version ++#if !defined(SSL_CTX_set_max_proto_version) && !defined(LIBRESSL_VERSION_NUMBER) + /** Mimics SSL_CTX_set_max_proto_version for OpenSSL < 1.1 */ + static inline int + SSL_CTX_set_max_proto_version(SSL_CTX *ctx, long tls_ver_max) Property changes on: head/security/openvpn/files/patch-src_openvpn_openssl__compat.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/openvpn/files/patch-tests_t__lpback.sh =================================================================== --- head/security/openvpn/files/patch-tests_t__lpback.sh (nonexistent) +++ head/security/openvpn/files/patch-tests_t__lpback.sh (revision 511348) @@ -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 Property changes on: head/security/openvpn/files/patch-tests_t__lpback.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property