Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Sep 2016 17:37:25 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r422042 - head/security/openssl_tpm_engine
Message-ID:  <201609131737.u8DHbPaF074893@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Tue Sep 13 17:37:25 2016
New Revision: 422042
URL: https://svnweb.freebsd.org/changeset/ports/422042

Log:
  security/openssl_tpm_engine: Document SSL requirement, IGNORE LIbreSSL
  
  It appears that the RAND_METHOD structure is not present in LibreSSL so
  that SSL_DEFAULT=libressl* is incompatible with this port.
  
  SSL flags have been added to support non-base OpenSSL libraries though.
  
  Approved by:	SSL blanket

Modified:
  head/security/openssl_tpm_engine/Makefile

Modified: head/security/openssl_tpm_engine/Makefile
==============================================================================
--- head/security/openssl_tpm_engine/Makefile	Tue Sep 13 17:17:27 2016	(r422041)
+++ head/security/openssl_tpm_engine/Makefile	Tue Sep 13 17:37:25 2016	(r422042)
@@ -16,11 +16,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${LOCALBASE}/sbin/tcsd:security/trousers
 LIB_DEPENDS=	libtspi.so:security/trousers
 
-USES=		autoreconf gmake libtool
+USES=		autoreconf gmake libtool ssl
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib -lcrypto
-CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -L${LOCALBASE}/lib
+CFLAGS+=	-I${OPENSSLINC} -I${LOCALBASE}/include
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/create_tpm_key \
 		lib/openssl/engines/libtpm.so \
@@ -31,6 +31,12 @@ PORTEXAMPLES=	openssl.cnf.sample
 
 OPTIONS_DEFINE=	EXAMPLES
 
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mlibressl*}
+IGNORE=	Detected LibreSSL (RAND_METHOD structure unsupported)
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \
 	    ${WRKSRC}/openssl.cnf.sample
@@ -39,4 +45,4 @@ post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/openssl.cnf.sample ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609131737.u8DHbPaF074893>