Update third-party-module:

- brotli to 37ab9b2 (v1.0.4)
- drizzle-nginx-module to 0.1.11

- remove needless patch

5 files changed, 38 insertions, 76 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 8854c9f60aa6..2e1a007c074e 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.14.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/ \
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index 8e0d0d13297e..7c1114108840 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -12,7 +12,7 @@ AWS_AUTH_GH_TUPLE=	anomalizer:ngx_aws_auth:1e62670:aws_auth
 AWS_AUTH_VARS=		DSO_EXTMODS+=aws_auth
 
 BROTLI_LIB_DEPENDS=	libbrotlicommon.so:archivers/brotli
-BROTLI_GH_TUPLE=	eustas:ngx_brotli:8cd9dd5:brotli
+BROTLI_GH_TUPLE=	eustas:ngx_brotli:37ab9b2:brotli
 BROTLI_VARS=		DSO_EXTMODS+=brotli
 
 CACHE_PURGE_MASTER_SITES=	http://labs.frickle.com/files/:cache_purge
@@ -38,10 +38,8 @@ ECHO_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_echo_request_info.c
 DRIZZLE_LIB_DEPENDS=	libdrizzle.so:databases/libdrizzle
 DRIZZLE_CONFIGURE_ENV=	LIBDRIZZLE_INC=${LOCALBASE}/include \
 			LIBDRIZZLE_LIB=${LOCALBASE}/lib
-DRIZZLE_GH_TUPLE=	openresty:drizzle-nginx-module:v0.1.9:drizzle
+DRIZZLE_GH_TUPLE=	openresty:drizzle-nginx-module:v0.1.11:drizzle
 DRIZZLE_CONFIGURE_ON=	--add-module=${WRKSRC_drizzle}
-DRIZZLE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config \
-			${PATCHDIR}/extra-patch-ngx_http_drizzle_upstream.c
 
 DYNAMIC_UPSTREAM_GH_TUPLE=	cubicdaiya:ngx_dynamic_upstream:v0.1.3:dynamic_upstream
 DYNAMIC_UPSTREAM_VARS=		DSO_EXTMODS+=dynamic_upstream
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 70ad864c5e45..127176c65df8 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1524575246
+TIMESTAMP = 1525935620
 SHA256 (nginx-1.14.0.tar.gz) = 5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5
 SIZE (nginx-1.14.0.tar.gz) = 1016272
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -19,30 +19,48 @@ SHA256 (passenger-5.2.3.tar.gz) = 0a06a2c75688a0e6c85717fb67b57940bebca5e56b7c76
 SIZE (passenger-5.2.3.tar.gz) = 6956101
 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
-SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393
-SHA256 (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 0839c33c2f8d519f92daae274f62cf87eb68415d562c6500ee3e3721ce80557c
-SIZE (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 17815
-SHA256 (stnoonan-spnego-http-auth-nginx-module-7e028a5_GH0.tar.gz) = 13f9f8ce2e815a14e43c4741af054f96b0714327d9e248dada241d4d3eaee40d
-SIZE (stnoonan-spnego-http-auth-nginx-module-7e028a5_GH0.tar.gz) = 18227
-SHA256 (kvspb-nginx-auth-ldap-42d195d_GH0.tar.gz) = 78d74697f89821a7ed31c6c672f6c06923bb53a681ebb203eabebb657bdafd80
-SIZE (kvspb-nginx-auth-ldap-42d195d_GH0.tar.gz) = 18455
-SHA256 (sto-ngx_http_auth_pam_module-v1.5.1_GH0.tar.gz) = 77676842919134af88a7b4bfca4470223e3a00d287d17c0dbdc9a114a685b6e7
-SIZE (sto-ngx_http_auth_pam_module-v1.5.1_GH0.tar.gz) = 6863
 SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316
 SIZE (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 109704
 SHA256 (anomalizer-ngx_aws_auth-1e62670_GH0.tar.gz) = db7ceef4ae22cf5bfaf5abae64830dfeef203ca85f9f40f7d1f1d90f277478c0
 SIZE (anomalizer-ngx_aws_auth-1e62670_GH0.tar.gz) = 8260
+SHA256 (eustas-ngx_brotli-37ab9b2_GH0.tar.gz) = 402c58b4330f585153c43904b44fbcedf9ef0e0d1e5993158650ca17badfbd7b
+SIZE (eustas-ngx_brotli-37ab9b2_GH0.tar.gz) = 12687
 SHA256 (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = c6d500f935dde5f87a6eb47ca473094a8ee2c9b4bb4578c9f99ccdc70a12d59e
 SIZE (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = 602064
 SHA256 (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = b4ceae549b9dbf84b2e511633982e4efeee0388e3b7a038a8bac555008a77b88
 SIZE (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = 6844
+SHA256 (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619
+SIZE (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 66455
+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 (openresty-drizzle-nginx-module-v0.1.11_GH0.tar.gz) = a2f62c418078fe1271fcf68bbdf28164ae06885f17a2b4941fbf766f3ccf4a4f
+SIZE (openresty-drizzle-nginx-module-v0.1.11_GH0.tar.gz) = 50864
+SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = bf60cf196c86193376d11f8c7a3826994b24a48bb36943bab8a25af6e776af3b
+SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = 10921
 SHA256 (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 00d42a5f562a0be5570110d9b70c8f2cace93b292421a6f994cf4ec76a8979f0
 SIZE (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 52766
+SHA256 (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = ab7b20be9f32da846f5c380677f7bc1dff0b93ce02c06bf584cd45709896ad66
+SIZE (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = 11139
 SHA256 (happyfish100-fastdfs-nginx-module-85347be_GH0.tar.gz) = 00bbcc70bfd711cd67ca685ad5620764c54be13f95299b8a5d175cdeb10b6d3c
 SIZE (happyfish100-fastdfs-nginx-module-85347be_GH0.tar.gz) = 19835
+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 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a
+SIZE (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = 18883
+SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c114433ee783b4b06c0105921a830c9486172
+SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024
 SHA256 (openresty-headers-more-nginx-module-55fbdab_GH0.tar.gz) = ed996dc994ba31ae071e05f12bfac6ff86ee03a2e7d4263346b919870d8135ac
 SIZE (openresty-headers-more-nginx-module-55fbdab_GH0.tar.gz) = 28139
+SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0
+SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393
+SHA256 (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 0839c33c2f8d519f92daae274f62cf87eb68415d562c6500ee3e3721ce80557c
+SIZE (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 17815
+SHA256 (stnoonan-spnego-http-auth-nginx-module-7e028a5_GH0.tar.gz) = 13f9f8ce2e815a14e43c4741af054f96b0714327d9e248dada241d4d3eaee40d
+SIZE (stnoonan-spnego-http-auth-nginx-module-7e028a5_GH0.tar.gz) = 18227
+SHA256 (kvspb-nginx-auth-ldap-42d195d_GH0.tar.gz) = 78d74697f89821a7ed31c6c672f6c06923bb53a681ebb203eabebb657bdafd80
+SIZE (kvspb-nginx-auth-ldap-42d195d_GH0.tar.gz) = 18455
+SHA256 (sto-ngx_http_auth_pam_module-v1.5.1_GH0.tar.gz) = 77676842919134af88a7b4bfca4470223e3a00d287d17c0dbdc9a114a685b6e7
+SIZE (sto-ngx_http_auth_pam_module-v1.5.1_GH0.tar.gz) = 6863
 SHA256 (arut-nginx-dav-ext-module-v0.1.0_GH0.tar.gz) = 6b004eed8ea16ad8de4d304027bf0413cc323a95914e58625a7dc066481aae3a
 SIZE (arut-nginx-dav-ext-module-v0.1.0_GH0.tar.gz) = 6614
 SHA256 (openresty-nginx-eval-module-582bd25_GH0.tar.gz) = 014bedb2b334ba8e8e23b4c660590357f8055dbed7b9b017e4cc2937876a8822
@@ -77,26 +95,20 @@ SHA256 (wandenberg-nginx-video-thumbextractor-module-0.9.0_GH0.tar.gz) = 6ad7d12
 SIZE (wandenberg-nginx-video-thumbextractor-module-0.9.0_GH0.tar.gz) = 2709894
 SHA256 (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 0d780e6fef91814fbaa577c9f7cfb7b78f6898e50c34d63f3c5d101eb45afd44
 SIZE (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 26125
-SHA256 (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = aafb79d87273eec023025333c34d6d0108026a1ce2e09b20a53e8e2d9bf65080
-SIZE (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = 59024
-SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = bf60cf196c86193376d11f8c7a3826994b24a48bb36943bab8a25af6e776af3b
-SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = 10921
-SHA256 (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619
-SIZE (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 66455
-SHA256 (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = ab7b20be9f32da846f5c380677f7bc1dff0b93ce02c06bf584cd45709896ad66
-SIZE (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = 11139
-SHA256 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a
-SIZE (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = 18883
-SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c114433ee783b4b06c0105921a830c9486172
-SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024
+SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
+SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
 SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270
 SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534
 SHA256 (openresty-lua-nginx-module-v0.10.11_GH0.tar.gz) = c0fb91fcfd1c6e7dec34ca64826ef81ffebafdef6174d254467636f380566626
 SIZE (openresty-lua-nginx-module-v0.10.11_GH0.tar.gz) = 616653
 SHA256 (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 4e280d1dcb8b312bc7875604c1e35b17879279126d3d5fbf482aa9cc7c11276d
 SIZE (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 37113
+SHA256 (SpiderLabs-ModSecurity-nginx-4cde86b_GH0.tar.gz) = d56e12955d933a39c7573ebc327e0aed32fdcc40cc39770a612b9a584b3f1705
+SIZE (SpiderLabs-ModSecurity-nginx-4cde86b_GH0.tar.gz) = 26453
 SHA256 (nbs-system-naxsi-0.55.3_GH0.tar.gz) = 0b3c95d250772dc89ad8b49e47c1e024c5ae2c76c0cffa445e9fe05c4dd13495
 SIZE (nbs-system-naxsi-0.55.3_GH0.tar.gz) = 187416
+SHA256 (nginx-njs-4ed8a0b_GH0.tar.gz) = 44cd86b48bf6a65e6faf76b59cbf75b6317d62d33081671d192632baaf43f165
+SIZE (nginx-njs-4ed8a0b_GH0.tar.gz) = 229162
 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.08_GH0.tar.gz) = 26e80646cc4ad87984c60dab584e8f32faf5dbebb4c6911784339822f4675c79
@@ -119,15 +131,3 @@ SHA256 (openresty-srcache-nginx-module-v0.31_GH0.tar.gz) = 3f9729e73a8340926fa9d
 SIZE (openresty-srcache-nginx-module-v0.31_GH0.tar.gz) = 48310
 SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf
 SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477
-SHA256 (nginx-njs-4ed8a0b_GH0.tar.gz) = 44cd86b48bf6a65e6faf76b59cbf75b6317d62d33081671d192632baaf43f165
-SIZE (nginx-njs-4ed8a0b_GH0.tar.gz) = 229162
-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
-SIZE (eustas-ngx_brotli-8cd9dd5_GH0.tar.gz) = 10585
-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
-SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
-SHA256 (SpiderLabs-ModSecurity-nginx-4cde86b_GH0.tar.gz) = d56e12955d933a39c7573ebc327e0aed32fdcc40cc39770a612b9a584b3f1705
-SIZE (SpiderLabs-ModSecurity-nginx-4cde86b_GH0.tar.gz) = 26453
diff --git a/www/nginx/files/extra-patch-ngx_http_drizzle_upstream.c b/www/nginx/files/extra-patch-ngx_http_drizzle_upstream.c
deleted file mode 100644
index 614613c9ec8a..000000000000
--- a/www/nginx/files/extra-patch-ngx_http_drizzle_upstream.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../drizzle-nginx-module-0.1.9/src/ngx_http_drizzle_upstream.c.orig	2016-11-20 15:32:37.264746000 -0500
-+++ ../drizzle-nginx-module-0.1.9/src/ngx_http_drizzle_upstream.c	2016-11-20 15:33:20.909836000 -0500
-@@ -1027,12 +1027,14 @@
-             continue;
-         }
- 
-+#if (nginx_version < 1011006)
-         if (uscfp[i]->default_port && url->default_port
-             && uscfp[i]->default_port != url->default_port)
-         {
-             dd("upstream_add: default_port not match");
-             continue;
-         }
-+#endif
- 
-         return uscfp[i];
-     }
diff --git a/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config b/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config
deleted file mode 100644
index dd9749e47555..000000000000
--- a/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../drizzle-nginx-module-0.1.9/config.orig	2011-12-30 10:26:53.000000000 +0400
-+++ ../drizzle-nginx-module-0.1.9/config	2011-12-30 10:28:20.000000000 +0400
-@@ -22,12 +22,12 @@
- 
-     if [ $ngx_found = no ]; then
-         # FreeBSD, OpenBSD
--        ngx_feature="libdrizzle library in /usr/local/"
--        ngx_feature_path="/usr/local/include/libdrizzle-1.0"
-+        ngx_feature="libdrizzle library in %%PREFIX%%"
-+        ngx_feature_path="%%PREFIX%%/include/libdrizzle"
-         if [ $NGX_RPATH = YES ]; then
--            ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -ldrizzle"
-+            ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -ldrizzle"
-         else
--            ngx_feature_libs="-L/usr/local/lib -ldrizzle"
-+            ngx_feature_libs="-L%%PREFIX%%/lib -ldrizzle"
-         fi
-         . auto/feature
-     fi