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

[Jason Unovitch]

Author: junovitch
Date: Sun Jan 10 15:59:19 2016
New Revision: 405714
URL: https://svnweb.freebsd.org/changeset/ports/405714

Log:
  www/h2o: update 1.6.0 -> 1.6.1 and add LibreSSL option
  
  - OPTIONS: Add bundled LIBRESSL option and set as default
    - HTTP/2 support requires TLS ALPN extension missing in base OpenSSL
    - Upstream expectation is the bundled LibreSSL is used to support HTTP/2
    - Enables ChaCha20-Poly1305 ciphers as a bonus
  - Update sample configuration file
  
  Changes:	https://github.com/h2o/h2o/releases/tag/v1.6.1
  
  PR:		205946
  Submitted by:	Dave Cottlehuber <dch at skunkwerks.at> (maintainer)

Modified:
  head/www/h2o/Makefile
  head/www/h2o/distinfo
  head/www/h2o/files/h2o.conf.sample

Modified: head/www/h2o/Makefile
==============================================================================
--- head/www/h2o/Makefile	Sun Jan 10 15:56:26 2016	(r405713)
+++ head/www/h2o/Makefile	Sun Jan 10 15:59:19 2016	(r405714)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	h2o
-PORTVERSION=	1.6.0
+PORTVERSION=	1.6.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -35,10 +35,21 @@ H2O_LOGDIR=	/var/log/${PORTNAME}/
 
 USE_RC_SUBR=	${PORTNAME}
 
+OPTIONS_DEFINE=	LIBRESSL
+LIBRESSL_DESC=	Build with bundled LibreSSL instead of OpenSSL
+OPTIONS_DEFAULT=	LIBRESSL
+
+CMAKE_ARGS+=	-DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
+
 .include <bsd.port.options.mk>
 
-CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
+.if ${PORT_OPTIONS:MLIBRESSL}
+CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=ON
+USE_OPENSSL_PORT=	no
+.else
+CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF
 USE_OPENSSL_PORT=	yes
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \

Modified: head/www/h2o/distinfo
==============================================================================
--- head/www/h2o/distinfo	Sun Jan 10 15:56:26 2016	(r405713)
+++ head/www/h2o/distinfo	Sun Jan 10 15:59:19 2016	(r405714)
@@ -1,2 +1,2 @@
-SHA256 (h2o-h2o-v1.6.0_GH0.tar.gz) = 5c8b96ac9e930fbd563359323413e3e08057fe850e515eb41c3bfff896a78593
-SIZE (h2o-h2o-v1.6.0_GH0.tar.gz) = 6279605
+SHA256 (h2o-h2o-v1.6.1_GH0.tar.gz) = b9ffb59ecce6c35ea55cc95c71c7d85e91ac5fc888ada264da7c77f1d8e655f0
+SIZE (h2o-h2o-v1.6.1_GH0.tar.gz) = 6304959

Modified: head/www/h2o/files/h2o.conf.sample
==============================================================================
--- head/www/h2o/files/h2o.conf.sample	Sun Jan 10 15:56:26 2016	(r405713)
+++ head/www/h2o/files/h2o.conf.sample	Sun Jan 10 15:59:19 2016	(r405714)
@@ -1,5 +1,6 @@
 # vi: ft=yaml
-# to find out the configuration commands, run: h2o --help
+# see https://h2o.examp1e.net/ for detailed documentation
+# see h2o --help for command-line options and settings
 user: www
 pid-file: /var/run/h2o.pid
 access-log: /var/log/h2o/h2o-access.log
@@ -12,7 +13,8 @@ listen:
         # generate your own certificates
         certificate-file: /usr/local/etc/h2o/server.crt
         key-file: /usr/local/etc/h2o/server.key
-file.dirlisting: on
+# enable Apache-style directory listings
+# file.dirlisting: on
 # per-host configuration
 hosts:
     my.example.org:
@@ -25,6 +27,6 @@ hosts:
             "/poudriere":
                 file.dir: "/usr/local/poudriere/data/logs/bulk"
             "/FreeBSD:10:amd64":
-                file.dir: "/usr/local/poudriere/data/packages/10_1_amd64-default/"
+                file.dir: "/usr/local/poudriere/data/packages/10_2_amd64-default/"
             "/FreeBSD:11:amd64":
                 file.dir: "/usr/local/poudriere/data/packages/current_amd64-default/"