From owner-svn-ports-all@freebsd.org Sun Oct 22 22:34:59 2017 Return-Path: Delivered-To: svn-ports-all@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 C7AA3E387A1; Sun, 22 Oct 2017 22:34:59 +0000 (UTC) (envelope-from dch@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 A1D2277DFC; Sun, 22 Oct 2017 22:34:59 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MMYwQj097248; Sun, 22 Oct 2017 22:34:58 GMT (envelope-from dch@FreeBSD.org) Received: (from dch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MMYwKt097244; Sun, 22 Oct 2017 22:34:58 GMT (envelope-from dch@FreeBSD.org) Message-Id: <201710222234.v9MMYwKt097244@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dch set sender to dch@FreeBSD.org using -f From: Dave Cottlehuber Date: Sun, 22 Oct 2017 22:34:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452687 - in head/www/h2o: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dch X-SVN-Commit-Paths: in head/www/h2o: . files X-SVN-Commit-Revision: 452687 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Oct 2017 22:34:59 -0000 Author: dch Date: Sun Oct 22 22:34:58 2017 New Revision: 452687 URL: https://svnweb.freebsd.org/changeset/ports/452687 Log: www/h2o: update to 2.2.3 - resolve security vulnerabilities via new release - ensure custom config files are loaded by re-ordering h2o rc.d script - clean up options while we are here - full changelog: https://github.com/h2o/h2o/releases/tag/v2.2.3 PR: 222281 Reported by: freebsd@get-experience.com Reviewed by: jrm (mentor) Approved by: jrm (mentor) MFH: 2017Q4 Security: CVE-2017-10868 Security: CVE-2017-10869 Differential Revision: https://reviews.freebsd.org/D12619 Modified: head/www/h2o/Makefile head/www/h2o/distinfo head/www/h2o/files/h2o.in head/www/h2o/pkg-descr Modified: head/www/h2o/Makefile ============================================================================== --- head/www/h2o/Makefile Sun Oct 22 22:25:53 2017 (r452686) +++ head/www/h2o/Makefile Sun Oct 22 22:34:58 2017 (r452687) @@ -2,21 +2,20 @@ # $FreeBSD$ PORTNAME= h2o -PORTVERSION= 2.2.2 -PORTREVISION= 1 DISTVERSIONPREFIX= v +DISTVERSION= 2.2.3 CATEGORIES= www MAINTAINER= dch@skunkwerks.at -COMMENT= Optimized HTTP2 server with support for HTTP/1.x +COMMENT= Optimized HTTP/2 server including support for TLS 1.3 and HTTP/1.x LICENSE= MIT -USE_GITHUB= yes - USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl CPE_VENDOR= h2o_project +USE_GITHUB= yes USE_PERL5= run + SHEBANG_FILES= share/h2o/start_server PORTDOCS= README.md @@ -37,25 +36,19 @@ H2O_LOGDIR= /var/log/${PORTNAME}/ USE_RC_SUBR= ${PORTNAME} -OPTIONS_DEFINE= MRUBY +OPTIONS_DEFINE= MRUBY DOCS OPTIONS_DEFAULT= MRUBY OPTIONS_SUB= yes -MRUBY_DESC= Build with mruby handler support +MRUBY_DESC= Build with embedded mruby handler support CMAKE_ARGS+= -DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON -DWITH_BUNDLED_SSL=OFF CMAKE_VERBOSE= yes -.include +MRUBY_CMAKE_BOOL= WITH_MRUBY +MRUBY_USES= bison +MRUBY_USE= ruby=yes +MRUBY_VARS= RUBY_NO_RUN_DEPENDS=yes -MRUBY_CMAKE_ON= -DWITH_MRUBY=ON -MRUBY_CMAKE_OFF= -DWITH_MRUBY=OFF - -.if ${PORT_OPTIONS:MMRUBY} -USE_RUBY= yes -RUBY_NO_RUN_DEPENDS= yes -USES+= bison -.endif - post-patch: @${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \ ${WRKSRC}/share/h2o/annotate-backtrace-symbols \ @@ -64,12 +57,14 @@ post-patch: ${WRKSRC}/share/h2o/start_server post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} \ - ${STAGEDIR}${ETCDIR} \ + ${MKDIR} ${STAGEDIR}${ETCDIR} \ ${STAGEDIR}${H2O_LOGDIR} - ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} \ ${FILESDIR}/${PORTNAME}.conf.sample \ ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include Modified: head/www/h2o/distinfo ============================================================================== --- head/www/h2o/distinfo Sun Oct 22 22:25:53 2017 (r452686) +++ head/www/h2o/distinfo Sun Oct 22 22:34:58 2017 (r452687) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492946918 -SHA256 (h2o-h2o-v2.2.2_GH0.tar.gz) = cf45780058566bd63d90ad0b52b1d15f8515519090753398b9bcf770162a0433 -SIZE (h2o-h2o-v2.2.2_GH0.tar.gz) = 16192602 +TIMESTAMP = 1508527966 +SHA256 (h2o-h2o-v2.2.3_GH0.tar.gz) = d40401ca714d00ca5204e8d22148dbaa9cae3407e3b4b6b62bd208543901ea51 +SIZE (h2o-h2o-v2.2.3_GH0.tar.gz) = 16207150 Modified: head/www/h2o/files/h2o.in ============================================================================== --- head/www/h2o/files/h2o.in Sun Oct 22 22:25:53 2017 (r452686) +++ head/www/h2o/files/h2o.in Sun Oct 22 22:34:58 2017 (r452687) @@ -20,11 +20,14 @@ name=h2o rcvar=h2o_enable +desc="An HTTP/2 high-performance webserver" +load_rc_config $name + # defaults -: ${h2o_enable:="NO"} -: ${h2o_config:="%%PREFIX%%/etc/${name}/${name}.conf"} -: ${h2o_perl:="%%LOCALBASE%%/bin/perl"} +: ${h2o_enable:=NO} +: ${h2o_config:=%%PREFIX%%/etc/${name}/${name}.conf} +: ${h2o_perl:=%%LOCALBASE%%/bin/perl} # daemon pidfile=`grep pid-file ${h2o_config} | cut -d' ' -f2` @@ -34,7 +37,6 @@ command_args="-m daemon -c ${h2o_config}" procname="%%LOCALBASE%%/bin/perl" # support SIGHUP to reload configuration file -extra_commands="reload" +extra_commands=reload -load_rc_config $name run_rc_command "$1" Modified: head/www/h2o/pkg-descr ============================================================================== --- head/www/h2o/pkg-descr Sun Oct 22 22:25:53 2017 (r452686) +++ head/www/h2o/pkg-descr Sun Oct 22 22:34:58 2017 (r452687) @@ -9,7 +9,7 @@ It supports: - negotiation methods: NPN, ALPN, Upgrade, direct - dependency and weight-based prioritization - server push -- TLS +- TLS up to 1.3 - uses [OpenSSL](https://www.openssl.org/) - forward secrecy - AEAD ciphers