svn commit: r424941 - in head/security/acme-client: . files

[Bernard Spil]

Author: brnrd
Date: Sun Oct 30 11:14:41 2016
New Revision: 424941
URL: https://svnweb.freebsd.org/changeset/ports/424941

Log:
  security/acme-client: Unblock package build via bundled LibreSSL
  
    - Use staged build of LibreSSL when SSL_DEFAULT is not libressl*
    - Remove STATIC_ACME_CLIENT option
    - Remove extra-patch for static build
    - Add stack smashing protection flags for 9.3 i386
  
  PR:		213695
  Submitted by:	jbeich

Deleted:
  head/security/acme-client/files/extra-patch-GNUmakefile
Modified:
  head/security/acme-client/Makefile

Modified: head/security/acme-client/Makefile
==============================================================================
--- head/security/acme-client/Makefile	Sun Oct 30 10:24:09 2016	(r424940)
+++ head/security/acme-client/Makefile	Sun Oct 30 11:14:41 2016	(r424941)
@@ -3,7 +3,7 @@
 
 PORTNAME=	acme-client
 PORTVERSION=	0.1.11
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	portable-
 CATEGORIES=	security
 MASTER_SITES=	https://kristaps.bsd.lv/${PORTNAME}/snapshots/ \
@@ -14,14 +14,7 @@ COMMENT=	Native C client for Let's Encry
 
 LICENSE=	ISCL
 
-USES=		gmake tar:tgz
-
-OPTIONS_DEFINE=	STATIC_ACMECLIENT
-STATIC_ACMECLIENT_DESC=	Link statically with security/libressl
-
-STATIC_ACMECLIENT_USES_OFF=	ssl
-STATIC_ACMECLIENT_BUILD_DEPENDS=	${LOCALBASE}/lib/libtls.a:security/libressl
-STATIC_ACMECLIENT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-GNUmakefile
+USES=		gmake ssl tar:tgz
 
 MAKEFILE=	GNUmakefile
 MAKE_ENV=	PREFIX=${STAGEDIR}/${PREFIX}
@@ -54,11 +47,24 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MSTATIC_ACMECLIENT} == "" && empty(SSL_DEFAULT:M*libressl*)
-IGNORE=	needs LibreSSL to build. set DEFAULT_VERSIONS+=ssl=libressl \
-	and rebuild all ports that depend on openssl
-.else
-WARNING=	"Remember to deinstall libressl after building acme-client"
-.endif
+.if ! ${SSL_DEFAULT:Mlibressl*}
+BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
+CPPFLAGS+=		-I${WRKDIR}/libressl/include
+LDFLAGS+=		-L${WRKDIR}/libressl/lib
+. ifnmake describe
+STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
+. endif
+# security/libressl ignores implicit SSP_UNSAFE, see Mk/bsd.ssp.mk
+. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000036 && ${ARCH} == i386
+SSP_CFLAGS?=	-fstack-protector
+CFLAGS+=	${SSP_CFLAGS}
+LDFLAGS+=	-fstack-protector
+LIBS+=		-lssp_nonshared
+. endif
+
+pre-configure:
+	@(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \
+		. ${WRKDIR}/libressl "! -name *.so*")
+.endif # SSL_DEFAULT
 
 .include <bsd.port.post.mk>