From owner-svn-ports-head@freebsd.org Fri Sep 6 18:16:54 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C0196D2D2C; Fri, 6 Sep 2019 18:16:54 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Q5P24TW1z4hSG; Fri, 6 Sep 2019 18:16:54 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7E5FF20CB4; Fri, 6 Sep 2019 18:16:54 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x86IGsnv019122; Fri, 6 Sep 2019 18:16:54 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x86IGrD8019119; Fri, 6 Sep 2019 18:16:53 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201909061816.x86IGrD8019119@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Fri, 6 Sep 2019 18:16:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511348 - head/security/openvpn/files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/security/openvpn/files X-SVN-Commit-Revision: 511348 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Sep 2019 18:16:54 -0000 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