git: a4f11eab468a - main - security/tpm2-tools: fix build if security/openssl is installed
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 04 Oct 2023 20:02:47 UTC
The branch main has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a4f11eab468a6e3741cb8cdced5660634917120e
commit a4f11eab468a6e3741cb8cdced5660634917120e
Author: John Hein <jcfyecrayz@liamekaens.com>
AuthorDate: 2023-09-30 21:41:46 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
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. */
+