From owner-svn-ports-head@freebsd.org Thu Nov 9 23:06:51 2017 Return-Path: Delivered-To: svn-ports-head@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 62A82E5EACD; Thu, 9 Nov 2017 23:06:51 +0000 (UTC) (envelope-from swills@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 3A4B57CA34; Thu, 9 Nov 2017 23:06:51 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA9N6obe039979; Thu, 9 Nov 2017 23:06:50 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA9N6oof039977; Thu, 9 Nov 2017 23:06:50 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201711092306.vA9N6oof039977@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Thu, 9 Nov 2017 23:06:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453878 - in head/www/obhttpd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/www/obhttpd: . files X-SVN-Commit-Revision: 453878 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2017 23:06:51 -0000 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 (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@chaosophia.net @@ -44,8 +44,26 @@ post-install: .include -.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 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;