Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Dec 2016 03:14:50 +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: r428463 - head/security/R-cran-openssl
Message-ID:  <201612130314.uBD3Eov2084567@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Tue Dec 13 03:14:50 2016
New Revision: 428463
URL: https://svnweb.freebsd.org/changeset/ports/428463

Log:
  security/R-cran-openssl: Fix openssl support, IGNORE LibreSSL
  
  The SSL specification wasn't correct.  The SSL requirement needs to be
  documented even when the base SSL is used.  Relocate USES=ssl to be seen
  unconditionally and block building on FreeBSD 9 with base OpenSSL using
  the standard technique.
  
  LibreSSL is not supported due to use of RSA_get0_* and other unsupported
  functions.
  
  Approved by:	SSL blanket

Modified:
  head/security/R-cran-openssl/Makefile

Modified: head/security/R-cran-openssl/Makefile
==============================================================================
--- head/security/R-cran-openssl/Makefile	Tue Dec 13 03:09:16 2016	(r428462)
+++ head/security/R-cran-openssl/Makefile	Tue Dec 13 03:14:50 2016	(r428463)
@@ -11,17 +11,21 @@ COMMENT=	Toolkit for Encryption, Signatu
 
 LICENSE=	MIT
 
-USES=	cran:auto-plist,compiles
+USES=		cran:auto-plist,compiles ssl
+
+R_POSTCMD_INSTALL_OPTIONS+=	--configure-vars="INCLUDE_DIR=${OPENSSLINC} LIB_DIR=${OPENSSLLIB}"
 
 post-patch:
 	${REINPLACE_CMD} -e '1,5d' ${WRKSRC}/src/ssl.c
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 1000015
-WITH_OPENSSL_PORT=	yes
-R_POSTCMD_INSTALL_OPTIONS+=	--configure-vars="INCLUDE_DIR=${OPENSSLINC} LIB_DIR=${OPENSSLLIB}"
-USES+=		ssl
+.if ${SSL_DEFAULT:Mlibressl*}
+IGNORE=	Detected LibreSSL (missing RSA_get0_key and others)
+.else
+. if ${OSVERSION} < 1000015 && ${SSL_DEFAULT:Mbase}
+IGNORE=	Need a more recent version of OpenSSL.
+. endif
 .endif
 
-.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?201612130314.uBD3Eov2084567>