svn commit: r430064 - head/security/acme-client

[Adam Weinberger]

> On 30 Dec, 2016, at 13:47, Bernard Spil <brnrd at freebsd.org> wrote:
> 
> Author: brnrd
> Date: Fri Dec 30 20:47:47 2016
> New Revision: 430064
> URL: https://svnweb.freebsd.org/changeset/ports/430064
> 
> Log:
>  security/acme-client: Update to 0.1.15
> 
>    - Update to 0.1.15
>    - Remove STATIC_ACMECLIENT option
>    - stage-build LibreSSL when not SSL_DEFAULT
> 
>  PR:		213695
>  Submitted by:	jbeich

> -STATIC_ACMECLIENT_USES_OFF=	ssl

Hi Bernard,

This commit removed USES=ssl, so if LibreSSL is already the default ssl, acme-client fails to build.

# Adam


-- 
Adam Weinberger
adamw at adamw.org
https://www.adamw.org


> 
> Modified:
>  head/security/acme-client/Makefile
>  head/security/acme-client/distinfo
> 
> Modified: head/security/acme-client/Makefile
> ==============================================================================
> --- head/security/acme-client/Makefile	Fri Dec 30 20:45:17 2016	(r430063)
> +++ head/security/acme-client/Makefile	Fri Dec 30 20:47:47 2016	(r430064)
> @@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	acme-client
> -PORTVERSION=	0.1.14
> +PORTVERSION=	0.1.15
> DISTVERSIONPREFIX=	portable-
> CATEGORIES=	security
> MASTER_SITES=	https://kristaps.bsd.lv/${PORTNAME}/snapshots/ \
> @@ -15,13 +15,6 @@ LICENSE=	ISCL
> 
> USES=		gmake tar:tgz
> 
> -OPTIONS_DEFINE=	STATIC_ACMECLIENT
> -STATIC_ACMECLIENT_DESC=	Link statically with security/libressl
> -
> -STATIC_ACMECLIENT_BUILD_DEPENDS=	${LOCALBASE}/lib/libtls.a:security/libressl
> -STATIC_ACMECLIENT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-GNUmakefile
> -
> MAKEFILE=	GNUmakefile
> MAKE_ENV=	PREFIX=${STAGEDIR}/${PREFIX}
> 
> @@ -53,11 +46,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>
> 
> Modified: head/security/acme-client/distinfo
> ==============================================================================
> --- head/security/acme-client/distinfo	Fri Dec 30 20:45:17 2016	(r430063)
> +++ head/security/acme-client/distinfo	Fri Dec 30 20:47:47 2016	(r430064)
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1478171483
> -SHA256 (acme-client-portable-0.1.14.tgz) = 14aa753f65e3d2ca36a8b97d68fe36205f935eaf735b7bf6a8c5d81bc8ec04e3
> -SIZE (acme-client-portable-0.1.14.tgz) = 49238
> +TIMESTAMP = 1483123856
> +SHA256 (acme-client-portable-0.1.15.tgz) = 910f4ffab4aea2dc9563405aa6a53e85d00166a020c74c28d719f290c610e71e
> +SIZE (acme-client-portable-0.1.15.tgz) = 51986
>