Index: head/www/obhttpd/Makefile =================================================================== --- head/www/obhttpd/Makefile (revision 434256) +++ head/www/obhttpd/Makefile (revision 434257) @@ -1,50 +1,51 @@ # $FreeBSD$ PORTNAME= obhttpd PORTVERSION= 6.0.20161006 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= koue@chaosophia.net COMMENT= OpenBSD http server LICENSE= BSD3CLAUSE WRKSRC_SUBDIR= src 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 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 empty(SSL_DEFAULT:Mlibressl*) IGNORE= needs LibreSSL to build. Set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything .endif .include Index: head/www/obhttpd/files/patch-usr.sbin_httpd_server__file.c =================================================================== --- head/www/obhttpd/files/patch-usr.sbin_httpd_server__file.c (nonexistent) +++ head/www/obhttpd/files/patch-usr.sbin_httpd_server__file.c (revision 434257) @@ -0,0 +1,30 @@ +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 ___________________________________________________________________ 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