Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Jan 2016 09:48:59 +0000 (UTC)
From:      Jason Unovitch <junovitch@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r406677 - in branches/2016Q1/www/h2o: . files
Message-ID:  <201601190948.u0J9mxFD032493@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: junovitch
Date: Tue Jan 19 09:48:59 2016
New Revision: 406677
URL: https://svnweb.freebsd.org/changeset/ports/406677

Log:
  MFH: r405714, r406010 (manual; www/h2o only), r406168
  
  www/h2o: update 1.6.0 -> 1.6.2 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
  - Fix typos in USE_* knobs for www/h2o
  
  Changes:	https://github.com/h2o/h2o/releases/tag/v1.6.1
  Changes:	https://github.com/h2o/h2o/releases/tag/v1.6.2
  
  PR:		205946
  PR:		206193
  Submitted by:	Dave Cottlehuber <dch@skunkwerks.at> (maintainer)
  Approved by:	ports-secteam (miwi)
  Security:	6c808811-bb9a-11e5-a65c-485d605f4717

Modified:
  branches/2016Q1/www/h2o/Makefile
  branches/2016Q1/www/h2o/distinfo
  branches/2016Q1/www/h2o/files/h2o.conf.sample
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/www/h2o/Makefile
==============================================================================
--- branches/2016Q1/www/h2o/Makefile	Tue Jan 19 08:56:34 2016	(r406676)
+++ branches/2016Q1/www/h2o/Makefile	Tue Jan 19 09:48:59 2016	(r406677)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	h2o
-PORTVERSION=	1.6.0
+PORTVERSION=	1.6.2
 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
-USE_OPENSSL_PORT=	yes
+.if ${PORT_OPTIONS:MLIBRESSL}
+CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=ON
+WITH_OPENSSL_PORT=	no
+.else
+CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF
+WITH_OPENSSL_PORT=	yes
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \

Modified: branches/2016Q1/www/h2o/distinfo
==============================================================================
--- branches/2016Q1/www/h2o/distinfo	Tue Jan 19 08:56:34 2016	(r406676)
+++ branches/2016Q1/www/h2o/distinfo	Tue Jan 19 09:48:59 2016	(r406677)
@@ -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.2_GH0.tar.gz) = 84602a50aec62c30af46996922db7bbfc4a3fe74779dc074d5ff32313d27d03c
+SIZE (h2o-h2o-v1.6.2_GH0.tar.gz) = 6305853

Modified: branches/2016Q1/www/h2o/files/h2o.conf.sample
==============================================================================
--- branches/2016Q1/www/h2o/files/h2o.conf.sample	Tue Jan 19 08:56:34 2016	(r406676)
+++ branches/2016Q1/www/h2o/files/h2o.conf.sample	Tue Jan 19 09:48:59 2016	(r406677)
@@ -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/"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601190948.u0J9mxFD032493>