From nobody Wed Oct 04 20:02:47 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 4S15Fz4nW4z4w4NB; Wed, 4 Oct 2023 20:02: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 4S15Fz4M46z4Fxs; Wed, 4 Oct 2023 20:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696449767; 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=wDYopXr3jIFXhVaF98WhMICatXDteMRtLUi4uqk6Ub4=; b=beizLRRk/vjgVbn1Pkkt4MSUVSDZc+fjHsrX8ayoiw1roisw3SO4ffrF6kG3I4mf3oieRl YZojvFBQay5x1CS5UlhpBGPw++Lt0dSMIGkkOLg6knYVPfnZGTul4D5gbGnhAo2QbTspZb BIJyp3WHe1x6hUC4NiWLpEGpeOTUq0994yjSetkjpj1rSRymx2ZuT9yW5pz6306Yg2tnK/ xsYqGeN81qrYmhRNq89ta9yBqQWeHRL+mmEK0SmgR5yofRp7oyW879tiSeJ03ZAqth+uuy t9y5qdkM0gmlJlvMsGKgJ+wyhnlJfK8d5ObDM3qVSANL4qAwTHTjofIyDqbxGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696449767; a=rsa-sha256; cv=none; b=SiFrfBO9YlOL5zayZ0aWnPoRxUUrhP1/fGPEskBq7QZMCERiTOhSMKJ14nbuqLQ1ro0Tga ywdT6z+OLc59xC0ktdVBw3DAMOVx2SidNFjWZwnDhn3Ro3/r0RlmSHC0qSWaJPiacv/qf+ 7r+Ze9w+Oh/82c3tBxz7za6MLokDKGCyOGmF3nKxhlpT8y7mGryl4SZjsncR3idOwoWEKR h0jB9DSYp3GjxGehF7Xnoglt9QIB/4UhM5JtWdK7bzBpelUSHgbWBk+34EZcY3Oggup72O hfViB+DuYptiSowLHEpWPhD/BOsGbqP4fHwgYYlrC7f64Ps6TUkWIkFkFgtRmA== 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=1696449767; 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=wDYopXr3jIFXhVaF98WhMICatXDteMRtLUi4uqk6Ub4=; b=myTGCgZ1EFnOWm9Vx2k76sNfi1wuAg1129MRRcT6XkqTurOgB8fFrKU6E1NDYd6voI14qz wUKBjrbIVsPDDnxhu4uVmn82Q9svWHoa5CXx3SeXE3ZOGpqxP+R/s5zOUoScLTwJBxutN9 0ReQZXIjRFQUaqKPZEtcrwwKtH+JgmzfYUAZQuRQBKCXxDa03DNIY/3/idqhO2adoBHQY0 7uDQnwfnduHIiuCAVy2WOXtKZHRuHszgnT6JbNIWZ5to0puPsR1BBCL3gWbOMCNFGB40Za 0h+bRJBEQaT2WLf1chmsb8hsSedre0jtG9J2XzzXURo9moiv51UdruoLUDWHvw== 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 4S15Fz3Pl6zrbb; Wed, 4 Oct 2023 20:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 394K2lGY055824; Wed, 4 Oct 2023 20:02:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394K2lTl055821; Wed, 4 Oct 2023 20:02:47 GMT (envelope-from git) Date: Wed, 4 Oct 2023 20:02:47 GMT Message-Id: <202310042002.394K2lTl055821@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: a4f11eab468a - main - security/tpm2-tools: fix build if security/openssl is installed 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a4f11eab468a6e3741cb8cdced5660634917120e Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=a4f11eab468a6e3741cb8cdced5660634917120e commit a4f11eab468a6e3741cb8cdced5660634917120e Author: John Hein AuthorDate: 2023-09-30 21:41:46 +0000 Commit: Robert Clausecker CommitDate: 2023-10-04 19:59:55 +0000 security/tpm2-tools: fix build if security/openssl is installed If someone has DEFAULT_VERSIONS=ssl:openssl it will now check the lib in /usr/local during configure. Similarly if using DEFAULT_VERSIONS=ssl:base, it looks in /usr/lib during configure. PR: 274013 Approved by: tstruk@gmail.com (maintainer) MFH: 2023Q4 --- security/tpm2-tools/Makefile | 1 + security/tpm2-tools/files/patch-configure | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/security/tpm2-tools/Makefile b/security/tpm2-tools/Makefile index 0f226e79b755..4bf8a905e7bd 100644 --- a/security/tpm2-tools/Makefile +++ b/security/tpm2-tools/Makefile @@ -1,5 +1,6 @@ PORTNAME= tpm2-tools DISTVERSION= 5.5 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://github.com/tpm2-software/tpm2-tools/releases/download/${DISTVERSION}/ diff --git a/security/tpm2-tools/files/patch-configure b/security/tpm2-tools/files/patch-configure new file mode 100644 index 000000000000..32381edd529c --- /dev/null +++ b/security/tpm2-tools/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig 2023-02-13 15:09:39 UTC ++++ configure +@@ -14030,7 +14030,7 @@ if ${ac_cv_lib_crypto_EVP_sm3+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lcrypto $LIBS" ++LIBS="${CRYPTO_LIBS} $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -14073,7 +14073,7 @@ if ${ac_cv_lib_crypto_EVP_sm4_cfb128+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lcrypto $LIBS" ++LIBS="${CRYPTO_LIBS} $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +