From owner-svn-ports-all@freebsd.org Sun Oct 30 11:14:43 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A255C1402F; Sun, 30 Oct 2016 11:14:43 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB32F1615; Sun, 30 Oct 2016 11:14:42 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9UBEgoH001834; Sun, 30 Oct 2016 11:14:42 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9UBEfuD001833; Sun, 30 Oct 2016 11:14:41 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201610301114.u9UBEfuD001833@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 30 Oct 2016 11:14:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424941 - in head/security/acme-client: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Oct 2016 11:14:43 -0000 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 -.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