Date: Fri, 30 Dec 2016 14:04:03 -0700 From: Adam Weinberger <adamw@adamw.org> To: Bernard Spil <brnrd@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r430064 - head/security/acme-client Message-ID: <57AE8237-2717-492B-AB2C-36BF87F09421@adamw.org> In-Reply-To: <201612302047.uBUKllEs089857@repo.freebsd.org> References: <201612302047.uBUKllEs089857@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 30 Dec, 2016, at 13:47, Bernard Spil <brnrd@freebsd.org> wrote: >=20 > Author: brnrd > Date: Fri Dec 30 20:47:47 2016 > New Revision: 430064 > URL: https://svnweb.freebsd.org/changeset/ports/430064 >=20 > Log: > security/acme-client: Update to 0.1.15 >=20 > - Update to 0.1.15 > - Remove STATIC_ACMECLIENT option > - stage-build LibreSSL when not SSL_DEFAULT >=20 > PR: 213695 > Submitted by: jbeich > -STATIC_ACMECLIENT_USES_OFF=3D ssl Hi Bernard, This commit removed USES=3Dssl, so if LibreSSL is already the default = ssl, acme-client fails to build. # Adam --=20 Adam Weinberger adamw@adamw.org https://www.adamw.org >=20 > Modified: > head/security/acme-client/Makefile > head/security/acme-client/distinfo >=20 > Modified: head/security/acme-client/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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$ >=20 > PORTNAME=3D acme-client > -PORTVERSION=3D 0.1.14 > +PORTVERSION=3D 0.1.15 > DISTVERSIONPREFIX=3D portable- > CATEGORIES=3D security > MASTER_SITES=3D https://kristaps.bsd.lv/${PORTNAME}/snapshots/ \ > @@ -15,13 +15,6 @@ LICENSE=3D ISCL >=20 > USES=3D gmake tar:tgz >=20 > -OPTIONS_DEFINE=3D STATIC_ACMECLIENT > -STATIC_ACMECLIENT_DESC=3D Link statically with security/libressl > - > -STATIC_ACMECLIENT_BUILD_DEPENDS=3D = ${LOCALBASE}/lib/libtls.a:security/libressl > -STATIC_ACMECLIENT_EXTRA_PATCHES=3D = ${PATCHDIR}/extra-patch-GNUmakefile > - > MAKEFILE=3D GNUmakefile > MAKE_ENV=3D PREFIX=3D${STAGEDIR}/${PREFIX} >=20 > @@ -53,11 +46,24 @@ post-install: >=20 > .include <bsd.port.pre.mk> >=20 > -.if ${PORT_OPTIONS:MSTATIC_ACMECLIENT} =3D=3D "" && = empty(SSL_DEFAULT:M*libressl*) > -IGNORE=3D needs LibreSSL to build. set = DEFAULT_VERSIONS+=3Dssl=3Dlibressl \ > - and rebuild all ports that depend on openssl > -.else > -WARNING=3D "Remember to deinstall libressl after building = acme-client" > -.endif > +.if ! ${SSL_DEFAULT:Mlibressl*} > +BUILD_DEPENDS+=3D ${NONEXISTENT}:security/libressl:stage > +CPPFLAGS+=3D -I${WRKDIR}/libressl/include > +LDFLAGS+=3D -L${WRKDIR}/libressl/lib > +. ifnmake describe > +STAGEDIR_libressl!=3D ${MAKE} -V STAGEDIR -C = ${PORTSDIR}/security/libressl > +. endif > +# security/libressl ignores implicit SSP_UNSAFE, see Mk/bsd.ssp.mk > +. if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} < 1000036 && ${ARCH} =3D=3D= i386 > +SSP_CFLAGS?=3D -fstack-protector > +CFLAGS+=3D ${SSP_CFLAGS} > +LDFLAGS+=3D -fstack-protector > +LIBS+=3D -lssp_nonshared > +. endif > +=20 > +pre-configure: > + @(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \ > + . ${WRKDIR}/libressl "! -name *.so*") > +.endif # SSL_DEFAULT >=20 > .include <bsd.port.post.mk> >=20 > Modified: head/security/acme-client/distinfo > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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 =3D 1478171483 > -SHA256 (acme-client-portable-0.1.14.tgz) =3D = 14aa753f65e3d2ca36a8b97d68fe36205f935eaf735b7bf6a8c5d81bc8ec04e3 > -SIZE (acme-client-portable-0.1.14.tgz) =3D 49238 > +TIMESTAMP =3D 1483123856 > +SHA256 (acme-client-portable-0.1.15.tgz) =3D = 910f4ffab4aea2dc9563405aa6a53e85d00166a020c74c28d719f290c610e71e > +SIZE (acme-client-portable-0.1.15.tgz) =3D 51986 >=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?57AE8237-2717-492B-AB2C-36BF87F09421>