Index: head/www/obhttpd/Makefile =================================================================== --- head/www/obhttpd/Makefile (revision 474406) +++ head/www/obhttpd/Makefile (revision 474407) @@ -1,69 +1,65 @@ # $FreeBSD$ PORTNAME= obhttpd -PORTVERSION= 6.0.20161006 -PORTREVISION= 2 +PORTVERSION= 6.3.20180529 CATEGORIES= www MAINTAINER= koue@chaosophia.net COMMENT= OpenBSD http server LICENSE= BSD3CLAUSE WRKSRC_SUBDIR= src +USES= ssl uidfix + USE_GITHUB= yes GH_ACCOUNT= koue GH_PROJECT= httpd USE_RC_SUBR= obhttpd -USES= ssl uidfix CFLAGS+= -Wall -MAKE_ARGS+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man +MAKE_ARGS+= MANDIR=${PREFIX}/man/man USERS= www GROUPS= www post-patch: ${REINPLACE_CMD} -e 's|httpd$$|obhttpd|g' \ -e 's|httpd.conf.5|obhttpd.conf.5|g' \ -e 's|httpd.8|obhttpd.8|g' ${WRKSRC}/usr.sbin/httpd/Makefile ${REINPLACE_CMD} -e 's|htpasswd$$|obhtpasswd|g' \ -e 's|htpasswd.1|obhtpasswd.1|g' ${WRKSRC}/usr.bin/htpasswd/Makefile ${MV} ${WRKSRC}/usr.bin/htpasswd/htpasswd.1 ${WRKSRC}/usr.bin/htpasswd/obhtpasswd.1 ${MV} ${WRKSRC}/usr.sbin/httpd/httpd.conf.5 ${WRKSRC}/usr.sbin/httpd/obhttpd.conf.5 ${MV} ${WRKSRC}/usr.sbin/httpd/httpd.8 ${WRKSRC}/usr.sbin/httpd/obhttpd.8 ${REINPLACE_CMD} -e 's|/etc/httpd.conf|${PREFIX}/etc/obhttpd.conf|g' \ ${WRKSRC}/usr.sbin/httpd/httpd.h post-install: ${INSTALL_DATA} ${WRKSRC}/etc/examples/httpd.conf \ ${STAGEDIR}${PREFIX}/etc/obhttpd.conf.sample .include .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 +BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage +CFLAGS+= -I${STAGEDIR_libressl}${LOCALBASE}/include -pre-configure: - @(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \ - . ${WRKDIR}/libressl "! -name *.so*") +post-configure: + ${REINPLACE_CMD} 's|-ltls|${STAGEDIR_libressl}${LOCALBASE}/lib/libtls.a|g' \ + ${WRKSRC}/usr.sbin/httpd/Makefile + ${REINPLACE_CMD} 's|-lssl|${STAGEDIR_libressl}${LOCALBASE}/lib/libssl.a|g' \ + ${WRKSRC}/usr.sbin/httpd/Makefile + ${REINPLACE_CMD} 's|-lcrypto|${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a|g' \ + ${WRKSRC}/usr.sbin/httpd/Makefile + ${REINPLACE_CMD} 's|-lcrypto|${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a|g' \ + ${WRKSRC}/usr.bin/htpasswd/Makefile .endif # SSL_DEFAULT .include Index: head/www/obhttpd/distinfo =================================================================== --- head/www/obhttpd/distinfo (revision 474406) +++ head/www/obhttpd/distinfo (revision 474407) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476701489 -SHA256 (koue-httpd-6.0.20161006_GH0.tar.gz) = 5b26a697db0095ff06469c2005bd4c8e65b1a23c667e69b03a47b221128c7225 -SIZE (koue-httpd-6.0.20161006_GH0.tar.gz) = 162396 +TIMESTAMP = 1531153726 +SHA256 (koue-httpd-6.3.20180529_GH0.tar.gz) = 9b21fe1dc00164090aaf5c1511f7c6cd3516c24879373d5eeab21259725d1364 +SIZE (koue-httpd-6.3.20180529_GH0.tar.gz) = 171076 Index: head/www/obhttpd/files/patch-usr.sbin_httpd_server__file.c =================================================================== --- head/www/obhttpd/files/patch-usr.sbin_httpd_server__file.c (revision 474406) +++ head/www/obhttpd/files/patch-usr.sbin_httpd_server__file.c (nonexistent) @@ -1,30 +0,0 @@ -OpenBSD 6.0 errata 17, Jan 31, 2017 - -A bug in the processing of range headers in httpd can lead to memory -exhaustion. This patch disables range header processing. - ---- usr.sbin/httpd/server_file.c.orig 2016-10-17 10:49:16 UTC -+++ usr.sbin/httpd/server_file.c -@@ -66,7 +66,6 @@ server_file_access(struct httpd *env, st - struct http_descriptor *desc = clt->clt_descreq; - struct server_config *srv_conf = clt->clt_srv_conf; - struct stat st; -- struct kv *r, key; - char *newpath, *encodedpath; - int ret; - -@@ -146,13 +145,7 @@ server_file_access(struct httpd *env, st - goto fail; - } - -- key.kv_key = "Range"; -- r = kv_find(&desc->http_headers, &key); -- if (r != NULL) -- return (server_partial_file_request(env, clt, path, &st, -- r->kv_value)); -- else -- return (server_file_request(env, clt, path, &st)); -+ return (server_file_request(env, clt, path, &st)); - - fail: - switch (errno) { Property changes on: head/www/obhttpd/files/patch-usr.sbin_httpd_server__file.c ___________________________________________________________________ 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 Index: head/www/obhttpd/files/patch-lib_libtls_tls__conninfo.c =================================================================== --- head/www/obhttpd/files/patch-lib_libtls_tls__conninfo.c (revision 474406) +++ head/www/obhttpd/files/patch-lib_libtls_tls__conninfo.c (nonexistent) @@ -1,14 +0,0 @@ ---- 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; Property changes on: head/www/obhttpd/files/patch-lib_libtls_tls__conninfo.c ___________________________________________________________________ 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 Index: head/www/obhttpd/files/patch-usr.bin_htpasswd_Makefile =================================================================== --- head/www/obhttpd/files/patch-usr.bin_htpasswd_Makefile (nonexistent) +++ head/www/obhttpd/files/patch-usr.bin_htpasswd_Makefile (revision 474407) @@ -0,0 +1,9 @@ +--- usr.bin/htpasswd/Makefile.orig 2018-07-10 10:58:14 UTC ++++ usr.bin/htpasswd/Makefile +@@ -1,5 +1,6 @@ + # $OpenBSD: Makefile,v 1.4 2017/07/09 21:23:19 espie Exp $ + LOCALBASE?= /usr/local ++BINDIR?= ${LOCALBASE}/bin + + PROG= htpasswd + SRCS= htpasswd.c Property changes on: head/www/obhttpd/files/patch-usr.bin_htpasswd_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/obhttpd/files/patch-usr.sbin_httpd_Makefile =================================================================== --- head/www/obhttpd/files/patch-usr.sbin_httpd_Makefile (nonexistent) +++ head/www/obhttpd/files/patch-usr.sbin_httpd_Makefile (revision 474407) @@ -0,0 +1,10 @@ +--- usr.sbin/httpd/Makefile.orig 2018-07-10 10:58:32 UTC ++++ usr.sbin/httpd/Makefile +@@ -1,6 +1,7 @@ + # $OpenBSD: Makefile,v 1.30 2017/07/03 22:21:47 espie Exp $ + + LOCALBASE?= /usr/local ++BINDIR?= ${LOCALBASE}/sbin + PROG= httpd + SRCS= parse.y + SRCS+= config.c control.c httpd.c log.c logger.c proc.c getdtablecount.c Property changes on: head/www/obhttpd/files/patch-usr.sbin_httpd_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/obhttpd/pkg-plist =================================================================== --- head/www/obhttpd/pkg-plist (revision 474406) +++ head/www/obhttpd/pkg-plist (revision 474407) @@ -1,7 +1,7 @@ @sample etc/obhttpd.conf.sample +bin/obhtpasswd man/man1/obhtpasswd.1.gz man/man5/obhttpd.conf.5.gz man/man7/patterns.7.gz man/man8/obhttpd.8.gz -sbin/obhtpasswd sbin/obhttpd