Index: branches/2017Q4/www/h2o/Makefile =================================================================== --- branches/2017Q4/www/h2o/Makefile (revision 452705) +++ branches/2017Q4/www/h2o/Makefile (revision 452706) @@ -1,75 +1,70 @@ # Created by: Dave Cottlehuber # $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 SUB_FILES= ${PORTNAME} SUB_LIST+= H2O_USER=${H2O_USER} \ H2O_GROUP=${H2O_GROUP} \ H2O_LOGDIR=${H2O_LOGDIR} PLIST_SUB= H2O_USER=${H2O_USER} \ H2O_GROUP=${H2O_GROUP} \ H2O_LOGDIR=${H2O_LOGDIR} H2O_USER?= www H2O_GROUP?= www 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 \ ${WRKSRC}/share/h2o/fetch-ocsp-response \ ${WRKSRC}/share/h2o/kill-on-close \ ${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 Index: branches/2017Q4/www/h2o/distinfo =================================================================== --- branches/2017Q4/www/h2o/distinfo (revision 452705) +++ branches/2017Q4/www/h2o/distinfo (revision 452706) @@ -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 Index: branches/2017Q4/www/h2o/files/h2o.in =================================================================== --- branches/2017Q4/www/h2o/files/h2o.in (revision 452705) +++ branches/2017Q4/www/h2o/files/h2o.in (revision 452706) @@ -1,40 +1,42 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: h2o # REQUIRE: LOGIN DAEMON NETWORKING # KEYWORD: shutdown # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # h2o_enable (bool): Set to NO by default. # Set it to YES to enable h2o. # # h2o_config (string): Optional full path for h2o config file # h2o_perl (string): Optional full path to perl executable . /etc/rc.subr 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` h2o_env="H2O_PERL=${h2o_perl}" command="%%PREFIX%%/bin/${name}" 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" Index: branches/2017Q4/www/h2o/pkg-descr =================================================================== --- branches/2017Q4/www/h2o/pkg-descr (revision 452705) +++ branches/2017Q4/www/h2o/pkg-descr (revision 452706) @@ -1,23 +1,23 @@ H2O is a very fast HTTP server written in C. It can also be used as a library. It supports: - HTTP/1.0, HTTP/1.1 - [HTTP/2](http://http2.github.io/) - draft 16 (and draft 14 to support older clients) - persistent connections - chunked encoding - 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 - OCSP stapling (automatically enabled) - session resumption (internal memory) - conditional GET using last-modified / etag - mime-type configuration - reverse proxy - persistent upstream connection WWW: https://github.com/h2o/h2o Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 452705) +++ branches/2017Q4 (revision 452706) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r452687