From nobody Sat Dec 11 23:17:23 2021 X-Original-To: dev-commits-ports-branches@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 6EE6018DBB4B; Sat, 11 Dec 2021 23:17:24 +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 4JBNw40n13z3Pfd; Sat, 11 Dec 2021 23:17:24 +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 EF51B16DB7; Sat, 11 Dec 2021 23:17:23 +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 1BBNHNr4046598; Sat, 11 Dec 2021 23:17:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BBNHNFh046597; Sat, 11 Dec 2021 23:17:23 GMT (envelope-from git) Date: Sat, 11 Dec 2021 23:17:23 GMT Message-Id: <202112112317.1BBNHNFh046597@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 687f7c6199e1 - 2021Q4 - security/openvpn: re-enable mbedTLS build List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 687f7c6199e1e7cc2d1b4a23c5168747d756e2d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639264644; 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=KqcRR8JbbDPk+KedLQO74q+KEaawRpAjM4l1yzaO67Y=; b=UISBw9kYOweu9BUcuFBR3jz5Jy/1k4UAyIn56ZhVul+87zuTgxQW6PpieEZzvCdhKvgt4q tIAvMbVUketAQanfzipin+32wMo1JccJuLUDysfWDVRuR/jr3ouFCqNb3a7O2z8frpPsJm iELOZue6uebfIbYhu49WuE+RT6Fglh0H0urnIM9x8S1JLA+T2qHx0dYxMuleB6diyM1I7d WJfqIXAxUQnzkNAAHB3LDPy4qlP5EL60ZzMQWjT3gbRaQlEF+vOLh8B/1FAnN9WOjs/4mI laBi+JFcOhxSvyO77S3q6+ynP49fVR8JzCO22bpLHQ0B6PDAfXGvU5uhchhOZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639264644; a=rsa-sha256; cv=none; b=QXvEdKB2iTvvvxoLVhGye7lVd0rAlhmAsBmo46du0p7oz+98/41qpv+3rm+484Y86h++nU dSVDqTxd+KJMvQnLZkb5GaWUemD8NJPvWcRFhTJo/nfn/YEMFOsANBUK1/ygPjb6FX04YW UvHq2i/YuyJR8lmESQnl0/3zsUh02pI1bZsv9AsMKL74gZXjvRnBcm5f52+GST1eebwRu2 DnrVVI3DHeBQ0qSTF99qXGtbax5+FfgE9V9qMaKZj2XZfrOR/MSy3u2p0LSnBbaEy26Qqd SqIbJdBAzikl9k4iTevgYSisi3uBasDOZAZvGOQPB0EMt1BwcJCondFNTr9V5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=687f7c6199e1e7cc2d1b4a23c5168747d756e2d9 commit 687f7c6199e1e7cc2d1b4a23c5168747d756e2d9 Author: Matthias Andree AuthorDate: 2021-12-11 23:12:29 +0000 Commit: Matthias Andree CommitDate: 2021-12-11 23:17:18 +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. (cherry picked from commit d02b0675d0630a9ac66617becd9f9cfbbca9c524) --- security/openvpn/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index ff080990626c..62b50ea7cc1c 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: