Date: Tue, 13 Sep 2016 14:24:45 +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: r422012 - in head: ftp/curl security/softhsm2 security/stunnel Message-ID: <201609131424.u8DEOjBo099740@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Sep 13 14:24:45 2016 New Revision: 422012 URL: https://svnweb.freebsd.org/changeset/ports/422012 Log: LibreSSL checks: Check for libressl-devel option too Approved by: SSL blanket Modified: head/ftp/curl/Makefile head/security/softhsm2/Makefile head/security/stunnel/Makefile Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Tue Sep 13 14:22:07 2016 (r422011) +++ head/ftp/curl/Makefile Tue Sep 13 14:24:45 2016 (r422012) @@ -153,7 +153,7 @@ IGNORE= only supports LDAPS with SSL IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif -.if ${SSL_DEFAULT} == libressl +.if ${SSL_DEFAULT:Mlibressl*} .if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} IGNORE= GSSAPI_BASE is not compatible with LibreSSL. Use other GSSAPI options .endif Modified: head/security/softhsm2/Makefile ============================================================================== --- head/security/softhsm2/Makefile Tue Sep 13 14:22:07 2016 (r422011) +++ head/security/softhsm2/Makefile Tue Sep 13 14:24:45 2016 (r422012) @@ -40,7 +40,7 @@ CRYP_OPEN_CONFIGURE_ON= --with-crypto-ba .include <bsd.port.pre.mk> -.if ${SSL_DEFAULT} == libressl +.if ${SSL_DEFAULT:Mlibressl*} CONFIGURE_ARGS+= --disable-gost .endif Modified: head/security/stunnel/Makefile ============================================================================== --- head/security/stunnel/Makefile Tue Sep 13 14:22:07 2016 (r422011) +++ head/security/stunnel/Makefile Tue Sep 13 14:24:45 2016 (r422012) @@ -76,11 +76,11 @@ LDFLAGS+= -lpthread .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MFIPS} && ${SSL_DEFAULT} == libressl +.if ${PORT_OPTIONS:MFIPS} && ${SSL_DEFAULT:Mlibressl*} IGNORE= LibreSSL does not support FIPS standard .endif -.if ${SSL_DEFAULT} == libressl +.if ${SSL_DEFAULT:Mlibressl*} NO_PACKAGE= The stunnel license restricts distribution when linked to non-OpenSSL non-base SSL-libraries .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609131424.u8DEOjBo099740>