Update from 1.15.7 to 1.15.8.

Update clojure, modsecurity and njs third-party modules to their recent versions.
Disable anonymous telemetry reporting in third-party passenger module
by default.

<ChangeLog>

*) Feature: the $upstream_bytes_sent variable.
   Thanks to Piotr Sikora.

*) Feature: new directives in vim syntax highlighting scripts.
   Thanks to Gena Makhomed.

*) Bugfix: in the "proxy_cache_background_update" directive.

*) Bugfix: in the "geo" directive when using unix domain listen sockets.

*) Workaround: the "ignoring stale global SSL error ... bad length"
   alerts might appear in logs when using the "ssl_early_data" directive
   with OpenSSL.

*) Bugfix: in nginx/Windows.

*) Bugfix: in the ngx_http_autoindex_module on 32-bit platforms.

</ChangeLog>

3 files changed, 15 insertions, 15 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index c992012894c4..6821c9fbb093 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nginx
-PORTVERSION=	1.15.7
-PORTREVISION=	2
+PORTVERSION=	1.15.8
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/ \
 		LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 0e5a23f4ffee..ad8534f2923b 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -22,7 +22,7 @@ CACHE_PURGE_CONFIGURE_ON=	--add-module=${WRKDIR}/ngx_cache_purge-2.3
 CLOJURE_CATEGORIES+=	java
 CLOJURE_USE=		JAVA=yes JAVA_OS=native JAVA_VERSION=1.8 \
 			JAVA_VENDOR=openjdk JAVA_BUILD=yes JAVA_RUN=yes
-CLOJURE_GH_TUPLE=	nginx-clojure:nginx-clojure:9d35bff:clojure
+CLOJURE_GH_TUPLE=	nginx-clojure:nginx-clojure:50096bd:clojure
 CLOJURE_CONFIGURE_ENV=	"JNI_INCS=-I${LOCALBASE}/openjdk8/include -I${LOCALBASE}/openjdk8/include/freebsd"
 CLOJURE_VARS=		DSO_EXTMODS+=clojure CLOJURE_SUBDIR=/src/c
 
@@ -212,14 +212,14 @@ MODSECURITY_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-modsecurity-configure
 MODSECURITY_VARS=		WRKSRC_modsecurity=${WRKDIR}/modsecurity-2.9.2
 
 MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:security/modsecurity3
-MODSECURITY3_GH_TUPLE=		SpiderLabs:ModSecurity-nginx:4cde86b:modsec
+MODSECURITY3_GH_TUPLE=		SpiderLabs:ModSecurity-nginx:ecb255a:modsec
 MODSECURITY3_CONFIGURE_ON=	--add-module=${WRKSRC_modsec}
 
 NAXSI_NGINX_VER=	0.56
 NAXSI_GH_TUPLE=		nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi
 NAXSI_VARS=		DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
 
-NJS_GH_TUPLE=		nginx:njs:ca2bcd2:njs
+NJS_GH_TUPLE=		nginx:njs:0.2.7:njs
 NJS_VARS=		DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
 
 PASSENGER_NGINX_VER=	6.0.0
@@ -231,7 +231,8 @@ PASSENGER_MASTER_SITES=	http://s3.amazonaws.com/phusion-passenger/releases/:pass
 PASSENGER_DISTFILES=	passenger-${PASSENGER_NGINX_VER}.tar.gz:passenger
 PASSENGER_VARS=		WRKSRC_passenger=${WRKDIR}/passenger-${PASSENGER_NGINX_VER} \
 			DSO_EXTDIRS+=passenger-${PASSENGER_NGINX_VER}/src/nginx_module
-PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb
+PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \
+			${PATCHDIR}/extra-patch-passenger-disable-telemetry
 
 POSTGRES_USES=		pgsql
 POSTGRES_GH_TUPLE=	FRiCKLE:ngx_postgres:1.0rc7:postgres
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 2ebc566e4672..6b7354090661 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1543773518
-SHA256 (nginx-1.15.7.tar.gz) = 8f22ea2f6c0e0a221b6ddc02b6428a3ff708e2ad55f9361102b1c9f4142bdf93
-SIZE (nginx-1.15.7.tar.gz) = 1026732
+TIMESTAMP = 1545769559
+SHA256 (nginx-1.15.8.tar.gz) = a8bdafbca87eb99813ae4fcac1ad0875bf725ce19eb265d28268c309b2b40787
+SIZE (nginx-1.15.8.tar.gz) = 1027862
 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
@@ -25,8 +25,8 @@ SHA256 (anomalizer-ngx_aws_auth-f1bcf3b_GH0.tar.gz) = e250ce159a10dfbfa0d6658704
 SIZE (anomalizer-ngx_aws_auth-f1bcf3b_GH0.tar.gz) = 15369
 SHA256 (eustas-ngx_brotli-e26248e_GH0.tar.gz) = 915d35ecbc58ceb20f8d1b9463719f9934ca24f5a5ab261f44cb8263f8c5aa0f
 SIZE (eustas-ngx_brotli-e26248e_GH0.tar.gz) = 12673
-SHA256 (nginx-clojure-nginx-clojure-9d35bff_GH0.tar.gz) = d0db12b13bc73c9909cbd789723782b3b6e898b1c440d893df5b704c78cd7715
-SIZE (nginx-clojure-nginx-clojure-9d35bff_GH0.tar.gz) = 624402
+SHA256 (nginx-clojure-nginx-clojure-50096bd_GH0.tar.gz) = 0a737c16c78e5c3a291a139f79606c8d6f4a1b08ff3917694a7a9326953a2141
+SIZE (nginx-clojure-nginx-clojure-50096bd_GH0.tar.gz) = 624362
 SHA256 (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 72fdd125b9207cdda135f368095f85b943a78a4ff004d1cd217972e12b1571b2
 SIZE (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 7224
 SHA256 (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619
@@ -103,12 +103,12 @@ SHA256 (openresty-lua-nginx-module-v0.10.13_GH0.tar.gz) = ecea8c3d7f69dd48c61324
 SIZE (openresty-lua-nginx-module-v0.10.13_GH0.tar.gz) = 624102
 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8
 SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654
-SHA256 (SpiderLabs-ModSecurity-nginx-4cde86b_GH0.tar.gz) = d56e12955d933a39c7573ebc327e0aed32fdcc40cc39770a612b9a584b3f1705
-SIZE (SpiderLabs-ModSecurity-nginx-4cde86b_GH0.tar.gz) = 26453
+SHA256 (SpiderLabs-ModSecurity-nginx-ecb255a_GH0.tar.gz) = 5db295eec3936ab2bd519e13fad3bb48507ca22a6c0284a0d8dd3b07cfe8eec7
+SIZE (SpiderLabs-ModSecurity-nginx-ecb255a_GH0.tar.gz) = 31087
 SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4
 SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120
-SHA256 (nginx-njs-ca2bcd2_GH0.tar.gz) = 7ab07dd5a95aad3f1c25a7599aae7a277979b9ec96bba95a557ef8f2caa482fc
-SIZE (nginx-njs-ca2bcd2_GH0.tar.gz) = 284764
+SHA256 (nginx-njs-0.2.7_GH0.tar.gz) = e386f391b8dda7e6396418109270b30bd44c507767c67d9f041d45fe3f0348a9
+SIZE (nginx-njs-0.2.7_GH0.tar.gz) = 287458
 SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9
 SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742
 SHA256 (openresty-rds-csv-nginx-module-v0.09_GH0.tar.gz) = 896be99c0cad50218417800a159e43ec088d6b58c099472ed3b3d7f179d6c0ea