From nobody Wed Oct 04 20:04:38 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 4S15J64vw5z4w4jP; Wed, 4 Oct 2023 20:04:38 +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 4S15J64RZhz4J4J; Wed, 4 Oct 2023 20:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696449878; 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=LvRh3CrsvFlkiNqPPCAr9/xr7w5hvA3v01PkRSRJ/A0=; b=MUW2ltzmpCSCeGw6yYkijOZT/zmiVkkeGmhzW2f1N8CC2Kr+di0aphSM+Cj0PoZurG8BpZ V9puoTCn13a15N24k5MztWtlXecmG9ZjbOg95ilzDt6JlnwIGglswalKBquoCcKse7nFC1 ryNK3TISBCyJOL+QRuV9Fu/JapnghL3yQkwPyVPrxirSG2JS1ZsbPEe4sQxH7pp6H4y86T uQY2fBAZ8o2+4ldcKbumTzXA/zvjZObVALo4CJrZSL+uNZ3W7iD53lB5JYkJDxkZMWNtW1 O2nTMybioW/+Ca4T3cnJi4tqlYzouog3GGlnRaMsZxmd7XX3zGME+OLgUZsUsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696449878; a=rsa-sha256; cv=none; b=td6XsJ3G5tKX1I0KCRIoUAfSZFPpT/oYAk2uf2nybCFlA3TJ5mEaFTWvilN853U+WqRbzl RZOrGAw2LUsIkvfWfhbmXfsT31n3kBMyifSJHRPHW0GM37dLhq/6PgpVUaBd5z1aF+S+nG 3h9ibILJ6LR9K3fbGvMYIdm+G427Z4V1dQrSI7XgcrJ8QcT3/1R1YAxAKKI9Cj5nQCBFUw yj/XpqP4qc5vZd1QZouYeaihiwHlxndV4HCF17wqrFLIDtVSD8SQsHMWIIqCnDze2Njd9B B4QliR/aJ7qQjnAyr8lsan3TP0buuTxTVX0afD7RTCDKoWenA7BrD1k4C3ynkQ== 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=1696449878; 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=LvRh3CrsvFlkiNqPPCAr9/xr7w5hvA3v01PkRSRJ/A0=; b=G5n7+4zZE+HaxZ0mSoJjQOpeShGyGkuy0QfvH7ffQFW142PBGJjbCLCdWz+7DwldHYDCEQ PFQ3xq7dy+Dkz9fBCemX1SU3JwLR4AitQh94/Sa9iLHvKfpMtxlfwLAa9d81XK9fxRiiMh H4xqS0UIajQbq4VjKVg4wtJneyzSXjXn/Y/N1EwTwjBvBhtQTZzU7jqZOWU/tkbXGzJrAu 28hQ1pP0zUoW8KwVMSnZb0MKcxBw7NIUYyFACma4RQ6RzmvZ0ZgX8wT9bvfqMVpxqt2BW4 fbVNzXYVU6HwdoA35QX/i8bZf0aFhwXAD00KSunDB8G45MJRrq/SQk7lRe415Q== 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 4S15J63VkhzrsT; Wed, 4 Oct 2023 20:04:38 +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 394K4cAZ057553; Wed, 4 Oct 2023 20:04:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394K4cEX057550; Wed, 4 Oct 2023 20:04:38 GMT (envelope-from git) Date: Wed, 4 Oct 2023 20:04:38 GMT Message-Id: <202310042004.394K4cEX057550@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 61b5d46f2faf - 2023Q4 - 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 61b5d46f2faf578738ba2a4539b95adf0615dac2 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=61b5d46f2faf578738ba2a4539b95adf0615dac2 commit 61b5d46f2faf578738ba2a4539b95adf0615dac2 Author: John Hein AuthorDate: 2023-09-30 21:41:46 +0000 Commit: Robert Clausecker CommitDate: 2023-10-04 20:04:13 +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 (cherry picked from commit a4f11eab468a6e3741cb8cdced5660634917120e) --- 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. */ +