mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-14 03:10:47 +00:00
Code Issues Releases Activity

www/obhttpd: Fix libressl build dependency

Browse Source 
PR:		219081
Submitted by:	Nikola Kolev <koue@chaosophia.net> (maintainer)
This commit is contained in:
Steve Wills 2017-11-09 23:06:50 +00:00
parent 1552e8cfa5
commit 5b4285d4e3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=453878
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
www/obhttpd/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= obhttpd
PORTVERSION= 6.0.20161006
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MAINTAINER= koue@chaosophia.net
@ -44,8 +44,26 @@ post-install:
.include <bsd.port.pre.mk>
.if empty(SSL_DEFAULT:Mlibressl*)
IGNORE= needs LibreSSL to build. Set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything
.endif
.if ! ${SSL_DEFAULT:Mlibressl*}
BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage
do-configure:
${REINPLACE_CMD} -e 's|/usr/local|${WRKDIR}/libressl|g' \
${WRKSRC}/usr.sbin/httpd/Makefile
${REINPLACE_CMD} -e 's|LOCALBASE|LIBRESSLBASE|g' \
${WRKSRC}/usr.sbin/httpd/Makefile
${REINPLACE_CMD} -e 's|/usr/local|${WRKDIR}/libressl|g' \
${WRKSRC}/usr.bin/htpasswd/Makefile
${REINPLACE_CMD} -e 's|LOCALBASE|LIBRESSLBASE|g' \
${WRKSRC}/usr.bin/htpasswd/Makefile
. ifnmake describe
STAGEDIR_libressl!= ${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
. endif
pre-configure:
@(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \
. ${WRKDIR}/libressl "! -name *.so*")
.endif # SSL_DEFAULT
.include <bsd.port.post.mk>

14
www/obhttpd/files/patch-lib_libtls_tls__conninfo.c Normal file
View File

@ -0,0 +1,14 @@
--- lib/libtls/tls_conninfo.c.orig 2017-05-04 18:48:54 UTC
+++ lib/libtls/tls_conninfo.c
@@ -140,9 +140,9 @@ tls_get_peer_cert_times(struct tls *ctx,
goto err;
if ((after = X509_get_notAfter(ctx->ssl_peer_cert)) == NULL)
goto err;
- if (asn1_time_parse(before->data, before->length, &before_tm, 0) == -1)
+ if (ASN1_time_parse(before->data, before->length, &before_tm, 0) == -1)
goto err;
- if (asn1_time_parse(after->data, after->length, &after_tm, 0) == -1)
+ if (ASN1_time_parse(after->data, after->length, &after_tm, 0) == -1)
goto err;
if ((*notbefore = timegm(&before_tm)) == -1)
goto err;