From nobody Sat Jun 24 16:58:08 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 4QpL006H8Gz4hTq2; Sat, 24 Jun 2023 16:58:08 +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 4QpL004nk7z4YNh; Sat, 24 Jun 2023 16:58:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687625888; 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=qCr2YnMBkK+8YRpd/lQPRpVh7HeQHQJ0uALqd/TURDI=; b=kDdX7S6wrnbmTQaQRfH8ClMXKAygS6k8C49eSeAJ3jy4o1oSFMzDhqLvu0d9Z63sqFfh47 EIiB1V+0nEPVG2W38Svyhp2Svf8DJp7vxtIqyZRnIeZZp8Zts+eV5I7wf/80aq/4SLV8Q7 jtLN8GtbP6/3YsVDvlkAVn1BdLCQkKc7XiZaL77DqH2EiS4Zik7rrUC/V/pi3lYeQZqQr+ MA5GcDMM7b/nyYs+0VlgpXxDzMobhHCuy8McXeOjLJCw+5OPIW83U5sPc+jtJjml2sMbx0 WdCNn4AMs4U/1BWT7ApOR4vj5kPHaBF2T4PKCwFG4OTdvr4//ejRUXvWxXzUCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687625888; 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=qCr2YnMBkK+8YRpd/lQPRpVh7HeQHQJ0uALqd/TURDI=; b=NsT45pLCTlXx/OzQfAOTTjwdA6+Qrr7bwd+anjgvsieT02Q8CEu62yhbrrYjSs8MwTBC5H mCCkcLxu7x6h4Pv7Ju5zxCOUEJAxVZnbvjwxB+kPGp7/Wucw3UP4UTQ6upvN/wSYeeTyB/ WcWDVURiXkJh/CNeoRaMtDmpJtqVfTS4Hqh1+lgfg5QkO2xqGGHffZuVx0WDffUaSbabiZ yMWVdM8sjyGRqcj30dCt5Yxq85RU79T/KN7+nMkCbSVw4wa6XYczYr7a83MzLEB2Hcym8G 5a+oFpN5p+Kv+7PjYGZMRskreqOoVQaK/DzVHXKqURh2/5HE/c19v/wlo9yFQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687625888; a=rsa-sha256; cv=none; b=nDeDQEMnNaqnAUuj7s4RETsTBfiwtp7IwArOYSogpTHZGg1BhrPNkFytZb7B7TlBJV+nbg UGZYKZJ1XXKvnndtPSu965aROM2UyEOBuGPpjYNtDKmR72gQVUx7FxXwAe0UyUPLBH3pFM Ru1yQqffg5eoXTArXPR3llktk8ZpMj2G1+tIFpKDau4aMU4FiWPtI24yAh+mgq/z5o1Iop +/6wL2/qsL3wvfOV7MI089fGCl9tbjIoighmmaDZyYpTEg8eEhExJh5ib2tavbJaisj4cl lS6QdFUTXfG+9rgTwtVCY38joFX3vHGgLs+ARGBu9XoJZ4L4OZTiJ+cuhZ5ksA== 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 4QpL003qdxztmx; Sat, 24 Jun 2023 16:58:08 +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 35OGw8QY093436; Sat, 24 Jun 2023 16:58:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35OGw8ta093435; Sat, 24 Jun 2023 16:58:08 GMT (envelope-from git) Date: Sat, 24 Jun 2023 16:58:08 GMT Message-Id: <202306241658.35OGw8ta093435@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: 2523d477274a - main - security/gost-engine: use new OSVERSION == 1400092 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: 2523d477274a86fafc1e69adc0a69978d6cd099d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=2523d477274a86fafc1e69adc0a69978d6cd099d commit 2523d477274a86fafc1e69adc0a69978d6cd099d Author: Eugene Grosbein AuthorDate: 2023-06-24 06:14:59 +0000 Commit: Eugene Grosbein CommitDate: 2023-06-24 16:58:01 +0000 security/gost-engine: use new OSVERSION == 1400092 Remove temporary hack in favor of OSVERSION check for base OpenSSL version. --- security/gost-engine/Makefile | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/security/gost-engine/Makefile b/security/gost-engine/Makefile index 4bbc16383612..fb19cdfc607f 100644 --- a/security/gost-engine/Makefile +++ b/security/gost-engine/Makefile @@ -25,10 +25,19 @@ USE_GITHUB= yes GH_ACCOUNT= gost-engine GH_PROJECT= engine -BASE_OPENSSL_VSTR!= /usr/bin/openssl version -BASE_OPENSSL_VER=${BASE_OPENSSL_VSTR:C/^OpenSSL //W:C/\..*//gW} +ENGINESDIR?= ${PREFIX}/${EDIR} +PLIST_SUB+= EDIR="${EDIR}" EDIRV="${EDIRV}" + +CMAKE_ARGS+= -DOPENSSL_ROOT_DIR=${OPENSSLBASE} \ + -DOPENSSL_ENGINES_DIR=${ENGINESDIR} + +SUB_FILES= pkg-message + +OPTIONS_DEFINE= DOCS -.if ${FLAVOR:U} == openssl30 || ${BASE_OPENSSL_VER:U} == 3 +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 || ${FLAVOR:U} == openssl30 GH_TAGNAME= 2b22503 GH_TUPLE+= provider-corner:libprov:e9f3e6a:libprov GH_SUBDIR= libprov:libprov @@ -36,7 +45,7 @@ DISTVERSION= g20230106 EDIR?= lib/engines-12 EDIRV?= @comment unused DISTINFO_FILE= ${.CURDIR}/distinfo.openssl30 -.if ${BASE_OPENSSL_VER:U} != 3 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400092 BROKEN_SSL+= base # openssl31 .endif .else @@ -47,18 +56,6 @@ EDIR?= lib/engines-1.1 EDIRV?= ${EDIR} .endif -ENGINESDIR?= ${PREFIX}/${EDIR} -PLIST_SUB+= EDIR="${EDIR}" EDIRV="${EDIRV}" - -CMAKE_ARGS+= -DOPENSSL_ROOT_DIR=${OPENSSLBASE} \ - -DOPENSSL_ENGINES_DIR=${ENGINESDIR} - -SUB_FILES= pkg-message - -OPTIONS_DEFINE= DOCS - -.include - .if ${SSL_DEFAULT} == openssl30 FLAVOR= openssl30 .endif