svn commit: r453878 - in head/www/obhttpd: . files

[Steve Wills]

Author: swills
Date: Thu Nov  9 23:06:50 2017
New Revision: 453878
URL: https://svnweb.freebsd.org/changeset/ports/453878

Log:
  www/obhttpd: Fix libressl build dependency
  
  PR:		219081
  Submitted by:	Nikola Kolev <koue at chaosophia.net> (maintainer)

Added:
  head/www/obhttpd/files/patch-lib_libtls_tls__conninfo.c   (contents, props changed)
Modified:
  head/www/obhttpd/Makefile

Modified: head/www/obhttpd/Makefile
==============================================================================
--- head/www/obhttpd/Makefile	Thu Nov  9 23:03:17 2017	(r453877)
+++ head/www/obhttpd/Makefile	Thu Nov  9 23:06:50 2017	(r453878)
@@ -2,7 +2,7 @@
 
 PORTNAME=	obhttpd
 PORTVERSION=	6.0.20161006
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	koue at 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>

Added: head/www/obhttpd/files/patch-lib_libtls_tls__conninfo.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/obhttpd/files/patch-lib_libtls_tls__conninfo.c	Thu Nov  9 23:06:50 2017	(r453878)
@@ -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;