Page MenuHomeFreeBSD
Files F163234444

D12619.id34196.diff
No OneTemporary
Actions

D12619.id34196.diff
View Options

Index: www/h2o/Makefile
===================================================================
--- www/h2o/Makefile
+++ www/h2o/Makefile
@@ -2,20 +2,19 @@
# $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
@@ -37,25 +36,21 @@
USE_RC_SUBR= ${PORTNAME}
-OPTIONS_DEFINE= MRUBY
-OPTIONS_DEFAULT= MRUBY
+OPTIONS_DEFINE= MRUBY DOCS
+OPTIONS_DEFAULT= MRUBY DOCS
OPTIONS_SUB= yes
MRUBY_DESC= Build with mruby handler support
-CMAKE_ARGS+= -DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON -DWITH_BUNDLED_SSL=OFF
+CMAKE_ARGS+= -DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON -DWITH_BUNDLED_SSL=OFF -DUSE_PICOTLS=ON
CMAKE_VERBOSE= yes
.include <bsd.port.options.mk>
-MRUBY_CMAKE_ON= -DWITH_MRUBY=ON
-MRUBY_CMAKE_OFF= -DWITH_MRUBY=OFF
+MRUBY_CMAKE_BOOL= WITH_MRUBY
+MRUBY_USES= bison
+MRUBY_USE_RUBY= yes
+MRUBY_VARS= RUBY_NO_RUN_DEPENDS=yes
-.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 +59,14 @@
${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 <bsd.port.mk>
Index: www/h2o/distinfo
===================================================================
--- www/h2o/distinfo
+++ www/h2o/distinfo
@@ -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: www/h2o/files/h2o.in
===================================================================
--- www/h2o/files/h2o.in
+++ www/h2o/files/h2o.in
@@ -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 @@
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: www/h2o/pkg-descr
===================================================================
--- www/h2o/pkg-descr
+++ www/h2o/pkg-descr
@@ -9,7 +9,7 @@
- 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

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 7:17 AM (51 m, 51 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35353515
Default Alt Text
D12619.id34196.diff (3 KB)

Event Timeline