Attachment 176052 Details for Bug 213695 – v1.1

[patch] v1.1

acme-client.bundle-libressl.diff (text/plain), 2.94 KB, created by Jan Beich on 2016-10-22 00:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-10-22 00:10:00 UTC

Size: 2.94 KB

patch

obsolete

>Index: security/acme-client/Makefile
>===================================================================
>--- security/acme-client/Makefile	(revision 424428)
>+++ security/acme-client/Makefile	(working copy)
>@@ -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,15 +14,8 @@ COMMENT=	Native C client for Let's Encrypt, design
> 
> LICENSE=	ISCL
> 
>-USES=		gmake tar:tgz
>+USES=		gmake ssl 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
>-
> 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>
>Index: security/acme-client/files/extra-patch-GNUmakefile
>===================================================================
>--- security/acme-client/files/extra-patch-GNUmakefile	(revision 424428)
>+++ security/acme-client/files/extra-patch-GNUmakefile	(nonexistent)
>@@ -1,11 +0,0 @@
>---- GNUmakefile.orig	2016-09-01 05:48:04 UTC
>-+++ GNUmakefile
>-@@ -71,7 +71,7 @@ endif
>- all: acme-client
>- 
>- acme-client: $(OBJS)
>--	$(CC) -o $@ $(OBJS) $(LDFLAGS) -ltls -lssl -lcrypto $(LIBBSD)
>-+	$(CC) -o $@ $(OBJS) $(LDFLAGS) ${PREFIX}/lib/libtls.a ${PREFIX}/lib/libssl.a ${PREFIX}/lib/libcrypto.a $(LIBBSD)
>- 
>- # This is for synchronising from -portable to the master.
>- rmerge:
>
>Property changes on: security/acme-client/files/extra-patch-GNUmakefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

jbeich: maintainer-approval? (brnrd)

Actions: View | Diff

Attachments on bug 213695: 176050 | 176051 | 176052