Attachment 179967 Details for Bug 217088 – v1 patch

[patch] v1 patch

h2o.diff (text/plain), 5.35 KB, created by Dave Cottlehuber on 2017-02-13 22:03:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Cottlehuber

Created: 2017-02-13 22:03:35 UTC

Size: 5.35 KB

patch

obsolete

>Index: www/h2o/Makefile
>===================================================================
>--- www/h2o/Makefile	(revision 434049)
>+++ www/h2o/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	h2o
>-PORTVERSION=	2.0.4
>-PORTREVISION=	2
>+PORTVERSION=	2.1.0
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> 
>@@ -14,7 +13,8 @@
> 
> USE_GITHUB=	yes
> 
>-USES=		cmake compiler:c11 perl5 shebangfix
>+USES=		cmake compiler:c11 cpe perl5 shebangfix ssl
>+CPE_VENDOR=	h2o_project
> USE_PERL5=	run
> SHEBANG_FILES=	share/h2o/start_server
> 
>@@ -36,28 +36,19 @@
> 
> USE_RC_SUBR=	${PORTNAME}
> 
>-OPTIONS_DEFINE=	LIBRESSL MRUBY
>-OPTIONS_DEFAULT=	LIBRESSL MRUBY
>-OPTIONS_SUB=	yes
>-LIBRESSL_DESC=	Build with bundled LibreSSL instead of OpenSSL
>-MRUBY_DESC=	Build with mruby handler support
>+OPTIONS_DEFINE=		MRUBY
>+OPTIONS_DEFAULT=	MRUBY
>+OPTIONS_SUB=		yes
>+MRUBY_DESC=			Build with mruby handler support
> 
>-CMAKE_ARGS+=	-DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
>+CMAKE_ARGS+=		-DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
>+CMAKE_VERBOSE=		yes
> 
> .include <bsd.port.options.mk>
> 
>-LIBRESSL_CMAKE_ON=	-DWITH_BUNDLED_SSL=ON
>-LIBRESSL_CMAKE_OFF=	-DWITH_BUNDLED_SSL=OFF
>-LIBRESSL_USES_OFF=	ssl
> MRUBY_CMAKE_ON=		-DWITH_MRUBY=ON
>-MRUBY_CMAKE_OFF=		-DWITH_MRUBY=OFF
>+MRUBY_CMAKE_OFF=	-DWITH_MRUBY=OFF
> 
>-.if ${PORT_OPTIONS:MLIBRESSL}
>-USES_SSL=	yes
>-.else
>-USES_SSL=	no
>-.endif
>-
> .if ${PORT_OPTIONS:MMRUBY}
> USE_RUBY=	yes
> BUILD_DEPENDS+=	bison:devel/bison
>Index: www/h2o/distinfo
>===================================================================
>--- www/h2o/distinfo	(revision 434049)
>+++ www/h2o/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1473753131
>-SHA256 (h2o-h2o-v2.0.4_GH0.tar.gz) = c0efa18f0ffb0f68ee4b60a6ed1feb54c770458c59e48baa2d9d0906ef9c68c0
>-SIZE (h2o-h2o-v2.0.4_GH0.tar.gz) = 15015392
>+TIMESTAMP = 1484725591
>+SHA256 (h2o-h2o-v2.1.0_GH0.tar.gz) = 41f3853f3083c2fe8e70d3ab7be02c3de3c26fb77ba5fc56fdaf46712418b999
>+SIZE (h2o-h2o-v2.1.0_GH0.tar.gz) = 15207573
>Index: www/h2o/files/patch-CMakeLists.txt
>===================================================================
>--- www/h2o/files/patch-CMakeLists.txt	(revision 434049)
>+++ www/h2o/files/patch-CMakeLists.txt	(working copy)
>@@ -1,12 +1,12 @@
>---- CMakeLists.txt.orig	2016-03-04 12:09:30 UTC
>+--- CMakeLists.txt.orig	2017-01-17 23:43:27 UTC
> +++ CMakeLists.txt
>-@@ -419,7 +419,8 @@ INSTALL(TARGETS h2o
>-     LIBRARY DESTINATION lib)
>+@@ -462,7 +462,8 @@ INSTALL(TARGETS h2o
>+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
>  
>  IF (NOT WITHOUT_LIBS)
>--    INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
>-+    INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"
>+-    INSTALL(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h")
>++    INSTALL(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h"
> +        EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
>      IF (LIBUV_FOUND)
>-         INSTALL(FILES "${CMAKE_BINARY_DIR}/libh2o.pc" DESTINATION lib/pkgconfig)
>+         INSTALL(FILES "${CMAKE_BINARY_DIR}/libh2o.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
>      ENDIF ()
>Index: www/h2o/pkg-plist
>===================================================================
>--- www/h2o/pkg-plist	(revision 434049)
>+++ www/h2o/pkg-plist	(working copy)
>@@ -7,7 +7,13 @@
> %%DATADIR%%/fastcgi-cgi
> %%DATADIR%%/setuidgid
> %%DATADIR%%/status/index.html
>+%%MRUBY%%%%DATADIR%%/mruby/acl.rb
>+%%MRUBY%%%%DATADIR%%/mruby/bootstrap.rb
>+%%MRUBY%%%%DATADIR%%/mruby/dos_detector.rb
> %%MRUBY%%%%DATADIR%%/mruby/htpasswd.rb
>+%%MRUBY%%%%DATADIR%%/mruby/lru_cache.rb
>+%%MRUBY%%%%DATADIR%%/mruby/preloads.rb
>+%%MRUBY%%%%DATADIR%%/mruby/trie_addr.rb
> %%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
> %%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
> %%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png
>@@ -16,6 +22,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/assets/style.css
> %%PORTDOCS%%%%DOCSDIR%%/benchmarks.html
> %%PORTDOCS%%%%DOCSDIR%%/configure.html
>+%%PORTDOCS%%%%DOCSDIR%%/configure/access_control.html
> %%PORTDOCS%%%%DOCSDIR%%/configure/access_log_directives.html
> %%PORTDOCS%%%%DOCSDIR%%/configure/base_directives.html
> %%PORTDOCS%%%%DOCSDIR%%/configure/basic_auth.html
>@@ -22,6 +29,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/configure/cgi.html
> %%PORTDOCS%%%%DOCSDIR%%/configure/command_options.html
> %%PORTDOCS%%%%DOCSDIR%%/configure/compress_directives.html
>+%%PORTDOCS%%%%DOCSDIR%%/configure/dos_detection.html
> %%PORTDOCS%%%%DOCSDIR%%/configure/errordoc_directives.html
> %%PORTDOCS%%%%DOCSDIR%%/configure/expires_directives.html
> %%PORTDOCS%%%%DOCSDIR%%/configure/fastcgi_directives.html
>@@ -37,6 +45,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/configure/reproxy_directives.html
> %%PORTDOCS%%%%DOCSDIR%%/configure/status_directives.html
> %%PORTDOCS%%%%DOCSDIR%%/configure/syntax_and_structure.html
>+%%PORTDOCS%%%%DOCSDIR%%/configure/throttle_response_directives.html
> %%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.alternate/index.txt
> %%PORTDOCS%%%%DOCSDIR%%/examples/doc_root/index.html
> %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt
>@@ -47,6 +56,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf
> %%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb
> %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/http1client.c
>+%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/latency-optimization.c
> %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/simple.c
> %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/socket-client.c
> %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/websocket.c

Actions: View | Diff

Attachments on bug 217088: 179967 | 179986 | 180044 | 180578