From nobody Sat Aug 03 16:00:44 2024 X-Original-To: dev-commits-ports-all@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 4WbnVN5KtHz5SfDf; Sat, 03 Aug 2024 16:00:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WbnVN44hLz4TZM; Sat, 3 Aug 2024 16:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722700844; 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=qbsxWnLixu0mD3jCk7zR2y677FbxFb6I09ZcdXwC9lk=; b=QncOGE4BzAAo8HqsyyAiijz7gt1fNKI5PNv8OYOXyBLK6KRn2DT/JLI09iQkOIzVmlyTNx qU96ziRMorvrnNCDpjEbpI3GZFvhrcefzX1weO8pRROa0qpqjhonL4QPE4zzzFJ+0TRZhS 9AUa9iDFsCGAjGhKeOidUhGZM2Au/UHBxFcT2kida9KZi/3Dgm26J0C3LEQjWNRtjj82N8 mRl9i/v1Ffu8pwYYd/PLhlFg+2WFIG1LfL+igLXU3Ef/ad/38DIvJaNKVezXzPmrAsNta7 MgEks+XHsuGf38wJde5RXJEsph2isHgmsUOVcqJpxQPK1e3F8vddgJTI8txUgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722700844; a=rsa-sha256; cv=none; b=yED2LzehdXMBvjGhKkbkD7ifHfqg88PZ8exFs8y/H25N00p43k/iMkj2bHwjZLjQAIjAyF A35AkUeA2VjEGAsTEm5FIGRaMOWcmpawvFuH9kT8UA0zacKHuUOaBqssc4VbWYI8xUSxHs zGqVlt2xfQ2Oa8SLP6me9GgtlXwhEFHTy8cLjk7Q0jf0qn+x4q4jRWvhCSSuhT7hdN2dr/ joDKhIZOBfIhyCu6a0kD/6tuFktgjRTM9OYqYYLaXgLfh4K89Rd0R3goxO4JEHIdk/Qhb0 GSdTUj/xcStiXb86Ia5lN9Mv0+nSlN3SWb13KYJtEjnVALBwzDwau6kpqdGZLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722700844; 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=qbsxWnLixu0mD3jCk7zR2y677FbxFb6I09ZcdXwC9lk=; b=NFtt/jxviOhAwE8DobBfBCtErFXU+wmxyGBEoMWR8xfdSEtNxm/Zr363ZMfHuLUXWLihBU 3uyujbn6iPdlLAYvQ7xnJdUNcG+Sxij2BFK9voqti0gsb/9s8CJXJt1T2jrgVkQ294laYw 8XqAAa4OHVS0F0IGR3HJo74DIgA9TiUN6D42P07GZ6PRmdRrYWpt7ahe1IYxOSBSlRmNZo XtR/e79iH0muRPASgPoquBk3S297p7yhdX3pdLYC+GuDheVh+dD6BztsSdbHFq9KN4MJsB QF585FIQbpi72QXVjJFErmobNtcAMRfI1swOJ+IMGkxF+OInhIS7TSDBgjlkEw== 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 4WbnVN3h9kzJF4; Sat, 3 Aug 2024 16:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 473G0igC069838; Sat, 3 Aug 2024 16:00:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 473G0iOg069835; Sat, 3 Aug 2024 16:00:44 GMT (envelope-from git) Date: Sat, 3 Aug 2024 16:00:44 GMT Message-Id: <202408031600.473G0iOg069835@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Osipov Subject: git: 4c51f2b5e430 - main - Mk/: Possible values for "ssl" are inconsistent List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c51f2b5e43071f5a5d7ced87ae2711c3be388a4 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c51f2b5e43071f5a5d7ced87ae2711c3be388a4 commit 4c51f2b5e43071f5a5d7ced87ae2711c3be388a4 Author: Michael Osipov AuthorDate: 2024-07-22 11:24:07 +0000 Commit: Michael Osipov CommitDate: 2024-08-03 15:59:49 +0000 Mk/: Possible values for "ssl" are inconsistent Co-authored-by: Mathieu Arnold PR: 278406 Approved by: jrm (mentor), otis (mentor), mat (portmgr) Differential Revision: https://reviews.freebsd.org/D46059 --- Mk/Scripts/qa.sh | 4 ++++ Mk/Uses/ssl.mk | 6 ++++-- Mk/bsd.default-versions.mk | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh index 935edf72065e..cc214ec028ee 100644 --- a/Mk/Scripts/qa.sh +++ b/Mk/Scripts/qa.sh @@ -623,7 +623,11 @@ proxydeps_suggest_uses() { elif [ ${pkg} = "devel/readline" ]; then warn "you need USES+=readline" # ssl + # When updating this, please also update the versions list in + # bsd.default-versions.mk and ssl.mk! elif [ ${pkg} = "security/openssl" -o ${pkg} = "security/openssl111" \ + -o ${pkg} = "security/openssl31" -o ${pkg} = "security/openssl32" \ + -o ${pkg} = "security/openssl33" \ -o ${pkg} = "security/libressl" -o ${pkg} = "security/libressl-devel" \ ]; then warn "you need USES=ssl" diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk index a8c95e4d9a4d..f8a459eb87e7 100644 --- a/Mk/Uses/ssl.mk +++ b/Mk/Uses/ssl.mk @@ -8,8 +8,10 @@ # # DEFAULT_VERSIONS+= ssl= # -# Variants being base, openssl, openssl30, openssl31, openssl32, -# openssl-quictls, libressl, and libressl-devel. +# When updating this, please also update the same list in bsd.default-versions.mk +# and the checks for USES=ssl in qa.sh! +# Variants being base, openssl, openssl111, openssl31, openssl32, +# openssl33, libressl, and libressl-devel. # # The Makefile sets these variables: # OPENSSLBASE - "/usr" or ${LOCALBASE} diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 60fc2628481a..f6aeb2db9dff 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -146,7 +146,9 @@ RUBY_DEFAULT?= 3.2 RUST_DEFAULT?= rust # Possible values: 4.16, 4.19 SAMBA_DEFAULT?= 4.16 -# Possible values: base, openssl, openssl111, openssl31, openssl32, libressl, libressl-devel +# When updating this, please also update the same list in ssl.mk and the checks +# for USES=ssl in qa.sh! +# Possible values: base, openssl, openssl111, openssl31, openssl32, openssl33, libressl, libressl-devel . if !defined(SSL_DEFAULT) # If no preference was set, check for an installed base version # but give an installed port preference over it.