svn commit: r416438 - in head: . www/h2o www/h2o/files

[Jason Unovitch]

Author: junovitch
Date: Sun Jun  5 22:38:48 2016
New Revision: 416438
URL: https://svnweb.freebsd.org/changeset/ports/416438

Log:
  www/h2o: update 1.7.3 -> 2.0.0
  
  - explicitly set H2O_PERL via rc.d script
  
  Summary of major changes:
  - support for Brotli compression
  - directives for file-level resource mapping
  - addition of the status handler
  - reverse proxying using HTTPS
  
  Changes:	https://github.com/h2o/h2o/releases/tag/v2.0.0
  
  PR:		209927
  Submitted by:	Dave Cottlehuber <dch at skunkwerks.at> (maintainer)

Modified:
  head/UPDATING
  head/www/h2o/Makefile
  head/www/h2o/distinfo
  head/www/h2o/files/h2o.in
  head/www/h2o/pkg-plist

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun Jun  5 21:52:36 2016	(r416437)
+++ head/UPDATING	Sun Jun  5 22:38:48 2016	(r416438)
@@ -5,6 +5,15 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20160605
+  AFFECTS: Users of www/h2o
+  AUTHOR: junovitch at FreeBSD.org
+
+  File paths no longer have a trailing / appended to them. This enables
+  directing specific paths to a file but may break existing configurations.
+  Refer to https://h2o.examp1e.net/configure/file_directives.html and
+  revise your yaml config appropriately.
+
 20160601
   AFFECTS: users of security/libressl-devel
   AUTHOR: brnrd at FreeBSD.org
@@ -34,7 +43,6 @@ you update your ports collection, before
   Portupgrade users:
       portupgrade -fr security/libressl-devel
 
-
 20160527
   AFFECTS: Users of mail/opensmtpd-extras (any of them)
   AUTHOR: adamw at FreeBSD.org

Modified: head/www/h2o/Makefile
==============================================================================
--- head/www/h2o/Makefile	Sun Jun  5 21:52:36 2016	(r416437)
+++ head/www/h2o/Makefile	Sun Jun  5 22:38:48 2016	(r416438)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	h2o
-PORTVERSION=	1.7.3
+PORTVERSION=	2.0.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 

Modified: head/www/h2o/distinfo
==============================================================================
--- head/www/h2o/distinfo	Sun Jun  5 21:52:36 2016	(r416437)
+++ head/www/h2o/distinfo	Sun Jun  5 22:38:48 2016	(r416438)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464774475
-SHA256 (h2o-h2o-v1.7.3_GH0.tar.gz) = 546bcde8aa3cf996d161d1e75aaad159d10fca1b3d368c4270f0674e8c78a213
-SIZE (h2o-h2o-v1.7.3_GH0.tar.gz) = 6541316
+TIMESTAMP = 1464775587
+SHA256 (h2o-h2o-v2.0.0_GH0.tar.gz) = 068cc88fe7313ea3c637764abc296629f6c9250e12b714f5629065bdc49d28c8
+SIZE (h2o-h2o-v2.0.0_GH0.tar.gz) = 15007086

Modified: head/www/h2o/files/h2o.in
==============================================================================
--- head/www/h2o/files/h2o.in	Sun Jun  5 21:52:36 2016	(r416437)
+++ head/www/h2o/files/h2o.in	Sun Jun  5 22:38:48 2016	(r416438)
@@ -14,6 +14,7 @@
 # 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
 
@@ -23,9 +24,11 @@ rcvar=h2o_enable
 # defaults
 : ${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"

Modified: head/www/h2o/pkg-plist
==============================================================================
--- head/www/h2o/pkg-plist	Sun Jun  5 21:52:36 2016	(r416437)
+++ head/www/h2o/pkg-plist	Sun Jun  5 22:38:48 2016	(r416438)
@@ -3,8 +3,10 @@ share/h2o/annotate-backtrace-symbols
 share/h2o/fetch-ocsp-response
 share/h2o/kill-on-close
 share/h2o/start_server
+%%DATADIR%%/ca-bundle.crt
 %%DATADIR%%/fastcgi-cgi
 %%DATADIR%%/setuidgid
+%%DATADIR%%/status/index.html
 @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
 %%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
@@ -19,11 +21,11 @@ share/h2o/start_server
 %%PORTDOCS%%%%DOCSDIR%%/configure/basic_auth.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/cgi.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/command_options.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/compress_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/errordoc_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/expires_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/fastcgi_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/file_directives.html
-%%PORTDOCS%%%%DOCSDIR%%/configure/gzip_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/headers_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/http1_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/http2_directives.html
@@ -33,7 +35,21 @@ share/h2o/start_server
 %%PORTDOCS%%%%DOCSDIR%%/configure/quick_start.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/redirect_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/reproxy_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/status_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/syntax_and_structure.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.alternate/index.txt
+%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root/index.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt
+%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.key
+%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/h2o.conf
+%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.crt
+%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.key
+%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf
+%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb
+%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/http1client.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/simple.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/socket-client.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/websocket.c
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install.html