From nobody Sat Jun 10 11:42:46 2023 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 4Qdbfb0tn9z4c9qn; Sat, 10 Jun 2023 11:42:47 +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 4Qdbfb0SkPz4R6j; Sat, 10 Jun 2023 11:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686397367; 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=yFY0oe8NBUf24vNXP9RFTrjC8HYiXM+mX8kCeFshBqY=; b=I8qd7CbXekR/E2fNLBkUiLih6sPXjK1L7Z5iiAuUus0GZHnuNjgjxn6IvUzaK2BbLESh12 qZ5ED9eoqNEGx1JW+fnMTa0P5QYlu4TgNrAmD4Qzx869jE+YV3hRwOpiL+CeCI8nU9yvwG KQbBovAFK0dSVs1MYrdSJSC+e/GUKkaohnC4z4ztfYnpmXglN08+fpFbeM6DArZzcH3ZFl pjATTiohuzH49yeqj/N6gSOfSg6TQ1vPn4EWpYcl5Q7dgKWZ/TVqewCwnbJ14n4s2PpeYv SliWUQ145lXzKitpK2Ejcww2uf1yE8oyHO80hxzHxiCdOOdssDg9ctcAebR1iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686397367; 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=yFY0oe8NBUf24vNXP9RFTrjC8HYiXM+mX8kCeFshBqY=; b=Si489HSoaxD48DkZQg4pgfCfcstaTB613+Unm10HSKbAg9c417zmy0oY24tO06A01der+f nG7L9O5kRWXmTf8koPqlXq+CD6NfTFTTWS7cupL55wj8EmxKaS8OELM5+bAEukWnik4lzI KPa2VFdWFzl/39hb1F80F1Mf0hJ6hzgKl2FBAqvGTe0vhqk+q6Uebn1qujPcLWStS1sPJ0 Y49LYzx92MOv0lZRMeMRB4JQySAzsSRJcf+jI44ydd74taY2nktx9BOnSx25uPriWkWXo+ Sn9AaRtnEXrjEBpH4m2embuQ4jfHc3s3kWlcEQp88Eg1M0eSGTEnQPNCnMAhTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686397367; a=rsa-sha256; cv=none; b=SXw+ZdByIVxx0XuvUaSlt+KQGDZzFXgxy7GqafRoGEeTP44/ijaSuj41Brh3MCm45vNSDK Fq9lduIDLxZEVNEM3udAVdtqgJ6jQ/uQ65vid/l1L2qPFHYXN1+gUKtApy27C+u15KFCxt 4Mz/P/wnTWRHtG3BIwQkOqdTDfv0dhWQCEhIsVSgRstaMsCuztDGr0A4cDCNVkdIfY5evc 4a3yOKjiA4s+O2jWJ8Hn8JTUlKHIvv9Dr/VSQrhKhkez7MWL+TuZRzvCzmE/N7zFYXfuIy BoE1SY60vDHVwO0qPNO/HWvyBdPHQwZtYdB/3UdwliRCNNVlAF6dq1MooGcwug== 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 4QdbfZ6d6qzGVx; Sat, 10 Jun 2023 11:42:46 +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 35ABgkud037417; Sat, 10 Jun 2023 11:42:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35ABgkT0037416; Sat, 10 Jun 2023 11:42:46 GMT (envelope-from git) Date: Sat, 10 Jun 2023 11:42:46 GMT Message-Id: <202306101142.35ABgkT0037416@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: 51e672e854a7 - main - security/gost-engine: be ready for OpenSSL 3.0 in base system 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51e672e854a7a2288007c387c499ee46186c1160 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=51e672e854a7a2288007c387c499ee46186c1160 commit 51e672e854a7a2288007c387c499ee46186c1160 Author: Eugene Grosbein AuthorDate: 2023-06-10 11:37:53 +0000 Commit: Eugene Grosbein CommitDate: 2023-06-10 11:42:37 +0000 security/gost-engine: be ready for OpenSSL 3.0 in base system This is temporary hack until __FreeBSD_version updated. PORTREVISION not bumped intentionally. --- security/gost-engine/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/security/gost-engine/Makefile b/security/gost-engine/Makefile index 22881074bb70..4bbc16383612 100644 --- a/security/gost-engine/Makefile +++ b/security/gost-engine/Makefile @@ -25,15 +25,20 @@ USE_GITHUB= yes GH_ACCOUNT= gost-engine GH_PROJECT= engine -.if ${FLAVOR:U} == openssl30 +BASE_OPENSSL_VSTR!= /usr/bin/openssl version +BASE_OPENSSL_VER=${BASE_OPENSSL_VSTR:C/^OpenSSL //W:C/\..*//gW} + +.if ${FLAVOR:U} == openssl30 || ${BASE_OPENSSL_VER:U} == 3 GH_TAGNAME= 2b22503 GH_TUPLE+= provider-corner:libprov:e9f3e6a:libprov GH_SUBDIR= libprov:libprov DISTVERSION= g20230106 -BROKEN_SSL+= base # openssl31 EDIR?= lib/engines-12 EDIRV?= @comment unused -DISTINFO_FILE= ${.CURDIR}/distinfo.${FLAVOR} +DISTINFO_FILE= ${.CURDIR}/distinfo.openssl30 +.if ${BASE_OPENSSL_VER:U} != 3 +BROKEN_SSL+= base # openssl31 +.endif .else GH_TAGNAME= 739f957 DISTVERSION= g20220520