Update third-party dynamic_upstream module.

Add third-party dynamic_healthcheck module.

Bump PORTREVISION.

6 files changed, 26 insertions, 6 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 7517ed09fe1e..564c82413d7a 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	nginx
 PORTVERSION=	1.19.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
@@ -81,7 +81,7 @@ OPTIONS_GROUP_STREAMGRP=	STREAM STREAM_REALIP STREAM_SSL \
 
 # External modules (arrayvar MUST appear after devel_kit for build-dep)
 OPTIONS_GROUP_HTTPGRP+=	AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE COOKIE_FLAG CT \
-	DEVEL_KIT ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION \
+	DEVEL_KIT ARRAYVAR DRIZZLE DYNAMIC_HC DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION \
 	FORMINPUT GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST \
 	HTTP_AUTH_KRB5 HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL \
 	HTTP_FANCYINDEX HTTP_FOOTER HTTP_GEOIP2 HTTP_IP2LOCATION HTTP_IP2PROXY \
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 1c9d61799cbe..0dd97e9b5716 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -43,9 +43,14 @@ DRIZZLE_GH_TUPLE=	openresty:drizzle-nginx-module:e93542e:drizzle
 DRIZZLE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config
 DRIZZLE_VARS=		DSO_EXTMODS+=drizzle
 
-DYNAMIC_UPSTREAM_GH_TUPLE=	cubicdaiya:ngx_dynamic_upstream:v0.1.6:dynamic_upstream
+DYNAMIC_UPSTREAM_GH_TUPLE=	ZigzagAK:ngx_dynamic_upstream:960eef2:dynamic_upstream
 DYNAMIC_UPSTREAM_VARS=		DSO_EXTMODS+=dynamic_upstream
 
+DYNAMIC_HC_GH_TUPLE=		ZigzagAK:ngx_dynamic_healthcheck:61acf02:dynamic_hc
+DYNAMIC_HC_VARS=		DSO_EXTMODS+=dynamic_hc
+DYNAMIC_HC_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_dynamic_healthcheck-config
+DYNAMIC_HC_IMPLIES=		DYNAMIC_UPSTREAM
+
 DEVEL_KIT_GH_TUPLE=		simpl:ngx_devel_kit:v0.3.1:devel_kit
 DEVEL_KIT_VARS=			FIRST_DSO_EXTMODS+=devel_kit
 
diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc
index ba9a85835b58..4aad31bbfd77 100644
--- a/www/nginx-devel/Makefile.options.desc
+++ b/www/nginx-devel/Makefile.options.desc
@@ -13,6 +13,7 @@ DEBUG_DESC=			Build with debugging support
 DEVEL_KIT_DESC=			3rd party Nginx Development Kit module
 DRIZZLE_DESC=			3rd party drizzle module
 DSO_DESC=			Enable dynamic modules support
+DYNAMIC_HC_DESC=		3rd party dynamic_healthcheck module
 DYNAMIC_UPSTREAM_DESC=		3rd party dynamic_upstream module
 ECHO_DESC=			3rd party echo module
 ENCRYPTSESSION_DESC=		3rd party encrypted_session module
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 3c92efe78f8e..f2870d38fff0 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1597239094
+TIMESTAMP = 1598129132
 SHA256 (nginx-1.19.2.tar.gz) = 7c1f7bb13e79433ee930c597d272a64bc6e30c356a48524f38fd34fa88d62473
 SIZE (nginx-1.19.2.tar.gz) = 1048727
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -31,8 +31,10 @@ SHA256 (simpl-ngx_devel_kit-v0.3.1_GH0.tar.gz) = 0e971105e210d272a497567fa2e2c25
 SIZE (simpl-ngx_devel_kit-v0.3.1_GH0.tar.gz) = 66542
 SHA256 (openresty-drizzle-nginx-module-e93542e_GH0.tar.gz) = 2639639b99955d39cbc3e29d40a374605bddedcdb01c380f44849e9d49e3b2c3
 SIZE (openresty-drizzle-nginx-module-e93542e_GH0.tar.gz) = 50896
-SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.6_GH0.tar.gz) = 056fcd63cab39c2f0144d6a8c3ce16e8ae2cfb6e02ad66e5972ffeeca6c6a4d3
-SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.6_GH0.tar.gz) = 11015
+SHA256 (ZigzagAK-ngx_dynamic_healthcheck-61acf02_GH0.tar.gz) = 9a6ac88bcb85cd76e56ce03cf074a78b600cc787642379f76410e78326aca5aa
+SIZE (ZigzagAK-ngx_dynamic_healthcheck-61acf02_GH0.tar.gz) = 49810
+SHA256 (ZigzagAK-ngx_dynamic_upstream-960eef2_GH0.tar.gz) = 86e7c6ed6dba2d4c5f5b87ecb91f25ccdb7a08b8a88236e632114f830b9e354b
+SIZE (ZigzagAK-ngx_dynamic_upstream-960eef2_GH0.tar.gz) = 23003
 SHA256 (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = aea1d10d9175a6471b34d436df937b5c97e7ba1ac4b4b2582a2cb6716d7fba4b
 SIZE (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = 53121
 SHA256 (openresty-encrypted-session-nginx-module-v0.08_GH0.tar.gz) = 6e526ea097c6805ec2cf1d0d3d79ed24326bc2d0babe158c29edd07d8c0d106a
diff --git a/www/nginx-devel/files/extra-patch-ngx_dynamic_healthcheck-config b/www/nginx-devel/files/extra-patch-ngx_dynamic_healthcheck-config
new file mode 100644
index 000000000000..58f1bbee672a
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-ngx_dynamic_healthcheck-config
@@ -0,0 +1,11 @@
+--- ../ngx_dynamic_healthcheck-61acf02/config.orig	2020-08-22 16:35:36.127913000 -0400
++++ ../ngx_dynamic_healthcheck-61acf02/config	2020-08-22 16:39:36.187267000 -0400
+@@ -31,7 +31,7 @@
+     match($0, /([^ ]*\/stream-lua-nginx-module\/src)/, arr)
+     print arr[1]
+ }')"
+-CORE_INCS="$CORE_INCS $stream_lua_nginx_module_incs"
++CORE_INCS="$CORE_INCS src/stream $stream_lua_nginx_module_incs"
+ 
+ 
+ if test -n "$ngx_module_link"; then
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index cd8339e77492..f47e9020266e 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -20,6 +20,7 @@
 %%DSO%%%%CT%%libexec/nginx/ngx_ssl_ct_module.so
 %%DSO%%%%DEVEL_KIT%%libexec/nginx/ndk_http_module.so
 %%DSO%%%%DRIZZLE%%libexec/nginx/ngx_http_drizzle_module.so
+%%DSO%%%%DYNAMIC_HC%%libexec/nginx/ngx_dynamic_healthcheck_module.so
 %%DSO%%%%DYNAMIC_UPSTREAM%%libexec/nginx/ngx_dynamic_upstream_module.so
 %%DSO%%%%ECHO%%libexec/nginx/ngx_http_echo_module.so
 %%DSO%%%%ENCRYPTSESSION%%libexec/nginx/ngx_http_encrypted_session_module.so