From nobody Sat Dec 11 23:16:52 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B03D218DBA1F; Sat, 11 Dec 2021 23:16:52 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JBNvS2BmJz3PdM; Sat, 11 Dec 2021 23:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 28BAF16AAD; Sat, 11 Dec 2021 23:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BBNGquN046394; Sat, 11 Dec 2021 23:16:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BBNGq0e046393; Sat, 11 Dec 2021 23:16:52 GMT (envelope-from git) Date: Sat, 11 Dec 2021 23:16:52 GMT Message-Id: <202112112316.1BBNGq0e046393@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: d02b0675d063 - main - security/openvpn: re-enable mbedTLS build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d02b0675d0630a9ac66617becd9f9cfbbca9c524 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639264612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AUYpUrWfX9+GTppW0PO4DuDz04eUQDx2OkLkgylKv7k=; b=q74DKNB6WrFgCQtCMf5C8ejycFS+AK/hKX1JisszkS8K8bPBIJcUQnfp5g/X8n9CzN6VqH j2CHDJM3UKAD1mmb/joxGw7vw6bJWhF6LpsyToX4nda5wgCaXfI6mWno9XubS3UGeSYu6J NdmFd7gS4APk9udwjsp6RhROApAZQGmWQJ/dQsPG1T4sdd/X4fhxpJTyPKaSHnrD1TEuDt hAQrbErEUM5RsDU4Kf9HB4KQRTTquD9AiSuXuCV8fIAmROK+eG0+FeoLHrR7e2fpcLIZKh 8ZI1vj7cylf/S79XCALCYsK3bIKZmBCyFgq3R+8QgvYvv+XLm2+JhGc3/jNe3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639264612; a=rsa-sha256; cv=none; b=PoUL1Rn4opy4bBlvgtqKDpki42XsTm3WwYA/Ghh21+tzPRZylufQ+o9DEScGz9W0EKkCke PDtBhUBz6NZLoX3pkwR1rWSHIH30zZUjCH76dDvM31RiXqErTGmUQpL974GBD/1kkefFVe 3qvqOhdznFhxCDwDpxd3nMpiuOWSRrMcQVCIFWjr8f8RQoyRV/axeVU2OgYbMsO82UiCFy O7RpgyaZCpGZ+XqFOBkBGMfBjB6tARJXaETwt/6I1ObKofr4/rUNletd7zEcdLwlU2wHRo 4hVhIJjf7hSt/N8k1Ce+H++IY6SFAm9WLapksKHNFwXhbhTO9Z01ksvGQN2WEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=d02b0675d0630a9ac66617becd9f9cfbbca9c524 commit d02b0675d0630a9ac66617becd9f9cfbbca9c524 Author: Matthias Andree AuthorDate: 2021-12-11 23:12:29 +0000 Commit: Matthias Andree CommitDate: 2021-12-11 23:16:20 +0000 security/openvpn: re-enable mbedTLS build ...now that mbedTLS metadata was fixed to show the actual situation for mbedTLS 2.x.y, that it's either Apache License 2.0, or GNU General Public License 2.0 or any later version. While here, also mark the main port with mbedTLS option enabled to record it's going to lose the mbedTLS option end of March 2022. --- security/openvpn/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index 4dbee597511b..9d8b49c26492 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -44,7 +44,7 @@ OPTIONS_SINGLE_SSL= OPENSSL MBEDTLS ASYNC_PUSH_DESC= Enable async-push support EASYRSA_DESC= Install security/easy-rsa RSA helper package LZO_DESC= LZO compression support (incompatible with LibreSSL) -MBEDTLS_DESC= LICENSE BROKEN - SSL/TLS via mbedTLS (lacks TLS v1.3) +MBEDTLS_DESC= SSL/TLS via mbedTLS (lacks TLS v1.3) PKCS11_DESC= Use security/pkcs11-helper (OpenSSL only) SMALL_DESC= Build a smaller executable with fewer features TUNNELBLICK_DESC= Tunnelblick XOR scramble patch (READ HELP!) @@ -95,7 +95,6 @@ CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} .if ${PORT_OPTIONS:MMBEDTLS} BROKEN_FreeBSD_14= OpenVPN-mbedTLS fails on FreeBSD 14 -BROKEN= License under clarification, OpenVPN is GPLv2-only and mbedTLS under Apache License 2.0, which are incompatible _tlslibs=libmbedtls libmbedx509 libmbedcrypto .else # OpenSSL @@ -122,8 +121,9 @@ pre-everything:: .if !empty(PORT_OPTIONS:MMBEDTLS) pre-everything:: - @${ECHO_CMD} >&2 "License under clarification, OpenVPN is GPLv2-only and mbedTLS under Apache License 2.0, which are incompatible." - @${SHELL} -c 'exit 1' + @${ECHO_CMD} >&2 "=====================================================" + @${ECHO_CMD} >&2 "Note that the mbedTLS option will go away 2022-03-31." + @${ECHO_CMD} >&2 "=====================================================" .endif post-patch: