Upgrade from 1.13.9 to 1.13.10.

Upgrade third-party modules to their recent version.

<ChangeLog>

*) Feature: the "set" parameter of the "include" SSI directive now
   allows writing arbitrary responses to a variable; the
   "subrequest_output_buffer_size" directive defines maximum response
   size.

*) Feature: now nginx uses clock_gettime(CLOCK_MONOTONIC) if available,
   to avoid timeouts being incorrectly triggered on system time changes.

*) Feature: the "escape=none" parameter of the "log_format" directive.
   Thanks to Johannes Baiter and Calin Don.

*) Feature: the $ssl_preread_alpn_protocols variable in the
   ngx_stream_ssl_preread_module.

*) Feature: the ngx_http_grpc_module.

*) Bugfix: in memory allocation error handling in the "geo" directive.

*) Bugfix: when using variables in the "auth_basic_user_file" directive
   a null character might appear in logs.
   Thanks to Vadim Filimonov.

</ChangeLog>

www/nginx-devel/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nginx
-PORTVERSION=	1.13.9
+PORTVERSION=	1.13.10
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -112,6 +112,7 @@ OPTIONS_DEFINE=	\
 	LUA \
 	MEMC \
 	MODSECURITY \
+	MODSECURITY3 \
 	NAXSI \
 	PASSENGER \
 	POSTGRES \
@@ -223,6 +224,7 @@ LET_DESC=			3rd party let module
 LUA_DESC=			3rd party lua module
 MEMC_DESC=			3rd party memc (memcached) module
 MODSECURITY_DESC=		3rd party mod_security module
+MODSECURITY3_DESC=		3rd party mod_security v3 module
 NAXSI_DESC=			3rd party naxsi module
 PASSENGER_DESC=			3rd party passenger module
 POSTGRES_DESC=			3rd party postgres module
@@ -893,6 +895,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-nginx-modsecurity-configure
 .endif
 
+.if ${PORT_OPTIONS:MMODSECURITY3}
+LIB_DEPENDS+=	libmodsecurity.so:www/mod_security3
+GH_TUPLE+=	SpiderLabs:ModSecurity-nginx:c0ae166:modsec
+CONFIGURE_ARGS+=--add-module=${WRKSRC_modsec}
+.endif
+
 .if ${PORT_OPTIONS:MNAXSI}
 NGINX_NAXSI_VERSION=	0.55.3
 GH_ACCOUNT+=	nbs-system:naxsi
@@ -911,7 +919,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	5.1.12
+PASSENGER_VERSION=	5.2.1
 MASTER_SITES+=	http://s3.amazonaws.com/phusion-passenger/releases/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 .if ${PORT_OPTIONS:MDSO}
@@ -1139,7 +1147,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_arrayvar}
 .endif
 
 .if ${PORT_OPTIONS:MBROTLI}
-NGINX_BROTLI_VERSION=	8cd9dd5
+NGINX_BROTLI_VERSION=	6a11744
 LIB_DEPENDS+=	libbrotlicommon.so:archivers/brotli
 GH_ACCOUNT+=	eustas:brotli
 GH_PROJECT+=	ngx_brotli:brotli

www/nginx-devel/distinfo

@@ -1,6 +1,6 @@
-TIMESTAMP = 1519183115
+TIMESTAMP = 1521673519
-SHA256 (nginx-1.13.9.tar.gz) = 5faea18857516fe68d30be39c3032bd22ed9cf85e1a6fdf32e3721d96ff7fa42
+SHA256 (nginx-1.13.10.tar.gz) = 336182104d90be3c40c874f7f06f87dbb357da1dc74ea573ad081a0f29a94885
-SIZE (nginx-1.13.9.tar.gz) = 994802
+SIZE (nginx-1.13.10.tar.gz) = 1014863
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
 SIZE (ngx_cache_purge-2.3.tar.gz) = 12248
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -15,8 +15,8 @@ SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546c
 SIZE (08a395c66e42.tar.gz) = 120603
 SHA256 (modsecurity-2.9.2.tar.gz) = 41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5
 SIZE (modsecurity-2.9.2.tar.gz) = 4298993
-SHA256 (passenger-5.1.12.tar.gz) = 1705bd6d1f9b9d055fb58b3545ca6f38ca6d222c07201f53c5014e0eb09f4495
+SHA256 (passenger-5.2.1.tar.gz) = d725a705124dad1ae9a4ce61d76566061dc80abd4ec7a652489f09a8de60e481
-SIZE (passenger-5.1.12.tar.gz) = 4245993
+SIZE (passenger-5.2.1.tar.gz) = 4978302
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
 SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0
@@ -127,8 +127,8 @@ SHA256 (nginx-njs-3995aba_GH0.tar.gz) = 89e575eef9ce0fa3fb99e779f313d82e5c175f85
 SIZE (nginx-njs-3995aba_GH0.tar.gz) = 232281
 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
 SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280
-SHA256 (eustas-ngx_brotli-8cd9dd5_GH0.tar.gz) = 2e5d99efc7073549337cc38cb236819a8b8900fbb8f449b587c6cd9bf3b6c920
+SHA256 (eustas-ngx_brotli-6a11744_GH0.tar.gz) = e8a34dd30ff08a23cb7060d026e4e63cf33fb9e3c3a05eb5126fafb1732a51a9
-SIZE (eustas-ngx_brotli-8cd9dd5_GH0.tar.gz) = 10585
+SIZE (eustas-ngx_brotli-6a11744_GH0.tar.gz) = 12773
 SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
 SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
 SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462

www/nginx-devel/files/extra-patch-passenger-build-nginx.rb

@@ -1,5 +1,5 @@
---- ../passenger-5.1.12/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
+--- ../passenger-5.2.1/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-5.1.12/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
++++ ../passenger-5.2.1/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
 @@ -33,13 +33,12 @@
  desc "Build Nginx support files"
  task :nginx => [