Merge r537527 and r537550 from www/nginx:

1. Switch with the nginx-upload-module to fdintino, they support http/2:                                                                 https://github.com/fdintino/nginx-upload-module/.

2. Update 3rd party module nginx-link-function to 3.2.2.

Bump PORTREVISION.

PR:	246746 [1]
	246897 [2]

5 files changed, 12 insertions, 11 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 80389b3c04b9..6dd58051eafd 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.19.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 9756494a607f..67bf5e82f5af 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -157,7 +157,7 @@ HTTP_TARANTOOL_GH_TUPLE=	tarantool:nginx_upstream_module:27836e4:nginx_tarantool
 HTTP_TARANTOOL_VARS=		DSO_EXTMODS+=nginx_tarantool
 HTTP_TARANTOOL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_tarantool-config
 
-HTTP_UPLOAD_GH_TUPLE=		Austinb:nginx-upload-module:72ec037:upload
+HTTP_UPLOAD_GH_TUPLE=		fdintino:nginx-upload-module:aa42509:upload
 HTTP_UPLOAD_VARS=		DSO_EXTMODS+=upload
 
 HTTP_UPLOAD_PROGRESS_GH_TUPLE=	masterzen:nginx-upload-progress-module:afb2d31:uploadprogress
@@ -207,7 +207,7 @@ LUA_CONFIGURE_ENV=	LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
 LUA_GH_TUPLE=		openresty:lua-nginx-module:v0.10.15:lua
 LUA_VARS=		DSO_EXTMODS+=lua
 
-LINK_GH_TUPLE=		Taymindis:nginx-link-function:3.2.1:link
+LINK_GH_TUPLE=		Taymindis:nginx-link-function:3.2.2:link
 LINK_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-link-function-config \
 			${PATCHDIR}/extra-patch-ngx_link_func_module.c
 LINK_VARS=		DSO_EXTMODS+=link
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 0dc3ff3b3e8d..542faa43c332 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1590505781
+TIMESTAMP = 1591120787
 SHA256 (nginx-1.19.0.tar.gz) = 44a616171fcd7d7ad7c6af3e6f3ad0879b54db5a5d21be874cd458b5691e36c8
 SIZE (nginx-1.19.0.tar.gz) = 1043748
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -81,8 +81,8 @@ SHA256 (yaoweibin-ngx_http_substitutions_filter_module-b8a71ea_GH0.tar.gz) = 08f
 SIZE (yaoweibin-ngx_http_substitutions_filter_module-b8a71ea_GH0.tar.gz) = 94039
 SHA256 (tarantool-nginx_upstream_module-27836e4_GH0.tar.gz) = c098747380444ddc9cf428010578bc6ef70b8c3a77a801c9e01617b05462e57b
 SIZE (tarantool-nginx_upstream_module-27836e4_GH0.tar.gz) = 74010
-SHA256 (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = c6d4e38ad0712c898cc53721f492f8f73acf2753cc0a0769fa34d4d6ba4e8efd
-SIZE (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = 28303
+SHA256 (fdintino-nginx-upload-module-aa42509_GH0.tar.gz) = 2285245bdef11656e5bcc866e693e48f84b7443d36924f45a6fb8647cd35319a
+SIZE (fdintino-nginx-upload-module-aa42509_GH0.tar.gz) = 42221
 SHA256 (masterzen-nginx-upload-progress-module-afb2d31_GH0.tar.gz) = 6318851cc3a624aaad3b1f4cd9f51f79c86575c53dfe0c28bbdcf9470b6a33e6
 SIZE (masterzen-nginx-upload-progress-module-afb2d31_GH0.tar.gz) = 17269
 SHA256 (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 4404c64e845e19feeb07a37976347987892a8e8680a961f793ff0d3ef96c07f4
@@ -99,8 +99,8 @@ SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732
 SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
 SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5fbd1d8b00bc85e71f2f387c344f007773e49050
 SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617
-SHA256 (Taymindis-nginx-link-function-3.2.1_GH0.tar.gz) = d5460002dcda8e67a10027866255842a064225bb1dbcddb2db8cb18bb3fa511a
-SIZE (Taymindis-nginx-link-function-3.2.1_GH0.tar.gz) = 127676
+SHA256 (Taymindis-nginx-link-function-3.2.2_GH0.tar.gz) = ef6c17bad33af15d816e21a3c82a5feb8769564e6b52c10384cffd35f757ee5d
+SIZE (Taymindis-nginx-link-function-3.2.2_GH0.tar.gz) = 145304
 SHA256 (openresty-lua-nginx-module-v0.10.15_GH0.tar.gz) = 7d5f3439c8df56046d0564b5857fd8a30296ab1bd6df0f048aed7afb56a0a4c2
 SIZE (openresty-lua-nginx-module-v0.10.15_GH0.tar.gz) = 655110
 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8
diff --git a/www/nginx-devel/files/extra-patch-nginx-link-function-config b/www/nginx-devel/files/extra-patch-nginx-link-function-config
index 932ed09aefce..7e2971304e1a 100644
--- a/www/nginx-devel/files/extra-patch-nginx-link-function-config
+++ b/www/nginx-devel/files/extra-patch-nginx-link-function-config
@@ -1,5 +1,5 @@
---- ../nginx-link-function-3.2.1/config.orig	2019-02-22 21:19:02.000000000 -0500
-+++ ../nginx-link-function-3.2.1/config	2020-01-24 10:29:53.871805000 -0500
+--- ../nginx-link-function-3.2.2/config.orig	2019-02-22 21:19:02.000000000 -0500
++++ ../nginx-link-function-3.2.2/config	2020-01-24 10:29:53.871805000 -0500
 @@ -15,24 +15,6 @@
  #echo "#define NGINX_HTTP_HTTP_LINK_FUNC_VERSION \""$HTTP_LINK_FUNC_VERSION"\"" > $NGX_OBJS/ngx_vod_version.h
  
diff --git a/www/nginx-devel/files/extra-patch-ngx_link_func_module.c b/www/nginx-devel/files/extra-patch-ngx_link_func_module.c
index bbdbe6975ad5..845e1e06d882 100644
--- a/www/nginx-devel/files/extra-patch-ngx_link_func_module.c
+++ b/www/nginx-devel/files/extra-patch-ngx_link_func_module.c
@@ -1,5 +1,5 @@
---- ../nginx-link-function-3.2.1/src/ngx_link_func_module.c.orig	2020-01-24 10:32:50.550797000 -0500
-+++ ../nginx-link-function-3.2.1/src/ngx_link_func_module.c	2020-01-24 10:33:17.135348000 -0500
+--- ../nginx-link-function-3.2.2/src/ngx_link_func_module.c.orig	2020-01-24 10:32:50.550797000 -0500
++++ ../nginx-link-function-3.2.2/src/ngx_link_func_module.c	2020-01-24 10:33:17.135348000 -0500
 @@ -35,7 +35,7 @@
  #include <ngx_config.h>
  #include <ngx_core.h>