Attachment 176205 Details for Bug 213822 – v1

[patch] v1

obhttpd.ressl_static.diff (text/plain), 1.30 KB, created by Jan Beich on 2016-10-27 00:04:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-10-27 00:04:17 UTC

Size: 1.30 KB

patch

obsolete

>Index: www/obhttpd/Makefile
>===================================================================
>--- www/obhttpd/Makefile	(revision 424718)
>+++ www/obhttpd/Makefile	(working copy)
>@@ -15,12 +15,9 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	koue
> GH_PROJECT=	httpd
> 
>-USE_OPENSSL=	yes
> USE_RC_SUBR=	obhttpd
>-USES=		uidfix
>+USES=		ssl uidfix
> 
>-WITH_OPENSSL_PORT=yes
>-
> CFLAGS+=	-Wall
> 
> MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
>@@ -49,8 +46,24 @@ post-install:
> 
> .include <bsd.port.pre.mk>
> 
>-.if empty(SSL_DEFAULT:Mlibressl*)
>-IGNORE=		Need LibreSSL to build. set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything.
>-.endif
>+.if ! ${SSL_DEFAULT:Mlibressl*}
>+BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
>+CFLAGS+=		-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>

Actions: View | Diff

Attachments on bug 213822: 176205 | 176206 | 176311