Update third-party modules:

o) cache_purge from 1.5 to 1.6;
o) slowfs_cache from 1.8 to 1.9;
o) upload_progress from 0.8.3 to 0.9.0.	[*]

Remove needless extra patch.

PR:	169602				[*]

6 files changed, 20 insertions, 66 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index df5b301b230c..24f61eedcbcf 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -312,7 +312,7 @@ CONFIGURE_ARGS+=--without-http-cache
 .endif
 
 .if ${PORT_OPTIONS:MCACHE_PURGE}
-NGINX_CACHE_PURGE_VERSION=	1.5
+NGINX_CACHE_PURGE_VERSION=	1.6
 MASTER_SITES+=	http://labs.frickle.com/files/:cache_purge
 DISTFILES+=	ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION}.tar.gz:cache_purge
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION}
@@ -485,13 +485,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upload_module-${NGINX_UPLOAD_VERSIO
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS}
-NGINX_UPLOADPROGRESS_VERSION=	0.8.3
-GIT_UPLOADPROGRESS_VERSION=	0-gc7c663f
+NGINX_UPLOADPROGRESS_VERSION=	0.9.0
+GIT_UPLOADPROGRESS_VERSION=	0-ga788dea
 FETCH_ARGS=	-pRr
 MASTER_SITES+=	https://github.com/masterzen/nginx-upload-progress-module/tarball/v${NGINX_UPLOADPROGRESS_VERSION}/:uploadprogress
 DISTFILES+=	masterzen-nginx-upload-progress-module-v${NGINX_UPLOADPROGRESS_VERSION}-${GIT_UPLOADPROGRESS_VERSION}.tar.gz:uploadprogress
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${GIT_UPLOADPROGRESS_VERSION:S/^0-g//}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_uploadprogress_module.c
 .endif
 
 .if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) || !empty(PORT_OPTIONS:MSUPERVISORD)
@@ -699,7 +698,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_sflow_config.c
 .endif
 
 .if ${PORT_OPTIONS:MSLOWFS_CACHE}
-NGINX_SLOWFS_CACHE_VERSION=	1.8
+NGINX_SLOWFS_CACHE_VERSION=	1.9
 MASTER_SITES+=	http://labs.frickle.com/files/:slowfs_cache
 DISTFILES+=	ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VERSION}.tar.gz:slowfs_cache
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VERSION}
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 571b491a24a0..871ae0191d27 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -10,8 +10,8 @@ SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b
 SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424
 SHA256 (ngx_http_auth_request_module-0.2.tar.gz) = eea5d0ec02bba93d0b204a034230cc61462b60497cbac6f581d7e008a9262ba4
 SIZE (ngx_http_auth_request_module-0.2.tar.gz) = 6736
-SHA256 (ngx_cache_purge-1.5.tar.gz) = 4b9cf48c0cf8f13150dfc329a889c221f6206a44aa9dcf8fa2f347abce55995c
-SIZE (ngx_cache_purge-1.5.tar.gz) = 7149
+SHA256 (ngx_cache_purge-1.6.tar.gz) = 863d6dd60e31b3c24c1f2d314f294c62a4ab5cf37f98c20ded9f6df1018baac8
+SIZE (ngx_cache_purge-1.6.tar.gz) = 7296
 SHA256 (agentzh-echo-nginx-module-v0.38rc2-0-g43c8843.tar.gz) = b1ac031931da71a6b5ee7f51c9b031f98f5339c34d4d2a8fe361123c2a9f748d
 SIZE (agentzh-echo-nginx-module-v0.38rc2-0-g43c8843.tar.gz) = 83870
 SHA256 (agentzh-headers-more-nginx-module-v0.17rc1-0-g3580526.tar.gz) = 826b62c13605281f843ad4a612a00b38d71599a673c3112480bff9bdbbcd36cd
@@ -40,8 +40,8 @@ SHA256 (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 8fd9a185f092320a5290ad8b
 SIZE (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 95092
 SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805
 SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796
-SHA256 (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae
-SIZE (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = 16694
+SHA256 (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2
+SIZE (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 17020
 SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b
 SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024
 SHA256 (Nginx_upstream_hash-0.3.1.tar.gz) = 51929c5352d4c2608b3f852987830be08b6946baf20da346fe520d9b12e39968
@@ -84,8 +84,8 @@ SHA256 (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 7ade6dc6d18b
 SIZE (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 37053
 SHA256 (nginx-sflow-module-0.9.6.tar.gz) = 5e80d1f8e5ba0963445d8245e09de0cf289936ae9feecb11c5e3a77d021f1ad0
 SIZE (nginx-sflow-module-0.9.6.tar.gz) = 27758
-SHA256 (ngx_slowfs_cache-1.8.tar.gz) = 3ab8aa47912a3f7a07cda0a4fbf6d2e870b9c9cbf5477014ac109001cdcb3644
-SIZE (ngx_slowfs_cache-1.8.tar.gz) = 11408
+SHA256 (ngx_slowfs_cache-1.9.tar.gz) = 7a2e07033550f3b594949a4392ac9a34e5583025ffea4e33e39a7f0d9fdc8b42
+SIZE (ngx_slowfs_cache-1.9.tar.gz) = 11527
 SHA256 (agentzh-srcache-nginx-module-v0.13rc8-0-g5237f26.tar.gz) = 2cb76adb4cf20079b44cf951f6a7fa480265878d65a6def2ae4dc5deb17ed686
 SIZE (agentzh-srcache-nginx-module-v0.13rc8-0-g5237f26.tar.gz) = 58234
 SHA256 (ngx_supervisord-1.4.tar.gz) = 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_uploadprogress_module.c b/www/nginx-devel/files/extra-patch-ngx_http_uploadprogress_module.c
deleted file mode 100644
index 765d25d0cd91..000000000000
--- a/www/nginx-devel/files/extra-patch-ngx_http_uploadprogress_module.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../masterzen-nginx-upload-progress-module-c7c663f/ngx_http_uploadprogress_module.c.orig	2012-02-15 19:50:03.000000000 +0400
-+++ ../masterzen-nginx-upload-progress-module-c7c663f/ngx_http_uploadprogress_module.c	2012-02-15 19:53:58.000000000 +0400
-@@ -1446,18 +1446,12 @@
- 
- 
-     lzcf->timeout = ngx_parse_time(&value[2], 1);
--    if (lzcf->timeout == NGX_ERROR) {
-+    if (lzcf->timeout == (time_t) NGX_ERROR) {
-         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                            "track_uploads \"%V\" timeout value invalid", &value[1]);
-         return NGX_CONF_ERROR;
-     }
- 
--    if (lzcf->timeout == NGX_PARSE_LARGE_TIME) {
--        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
--                           "track_uploads \"%V\" timeout value must be less than 68 years", &value[1]);
--        return NGX_CONF_ERROR;
--    }
--
-     clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-     lzcf->handler = clcf->handler;
-     if ( lzcf->handler == NULL )
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index f34923e8993a..db2b7fe3542d 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -311,7 +311,7 @@ CONFIGURE_ARGS+=--without-http-cache
 .endif
 
 .if ${PORT_OPTIONS:MCACHE_PURGE}
-NGINX_CACHE_PURGE_VERSION=	1.5
+NGINX_CACHE_PURGE_VERSION=	1.6
 MASTER_SITES+=	http://labs.frickle.com/files/:cache_purge
 DISTFILES+=	ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION}.tar.gz:cache_purge
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION}
@@ -484,13 +484,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upload_module-${NGINX_UPLOAD_VERSIO
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS}
-NGINX_UPLOADPROGRESS_VERSION=	0.8.3
-GIT_UPLOADPROGRESS_VERSION=	0-gc7c663f
+NGINX_UPLOADPROGRESS_VERSION=	0.9.0
+GIT_UPLOADPROGRESS_VERSION=	0-ga788dea
 FETCH_ARGS=	-pRr
 MASTER_SITES+=	https://github.com/masterzen/nginx-upload-progress-module/tarball/v${NGINX_UPLOADPROGRESS_VERSION}/:uploadprogress
 DISTFILES+=	masterzen-nginx-upload-progress-module-v${NGINX_UPLOADPROGRESS_VERSION}-${GIT_UPLOADPROGRESS_VERSION}.tar.gz:uploadprogress
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${GIT_UPLOADPROGRESS_VERSION:S/^0-g//}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_uploadprogress_module.c
 .endif
 
 .if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) || !empty(PORT_OPTIONS:MSUPERVISORD)
@@ -697,7 +696,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_sflow_config.c
 .endif
 
 .if ${PORT_OPTIONS:MSLOWFS_CACHE}
-NGINX_SLOWFS_CACHE_VERSION=	1.8
+NGINX_SLOWFS_CACHE_VERSION=	1.9
 MASTER_SITES+=	http://labs.frickle.com/files/:slowfs_cache
 DISTFILES+=	ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VERSION}.tar.gz:slowfs_cache
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VERSION}
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 363f9f1075b9..820bffb730eb 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -10,8 +10,8 @@ SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b
 SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424
 SHA256 (ngx_http_auth_request_module-0.2.tar.gz) = eea5d0ec02bba93d0b204a034230cc61462b60497cbac6f581d7e008a9262ba4
 SIZE (ngx_http_auth_request_module-0.2.tar.gz) = 6736
-SHA256 (ngx_cache_purge-1.5.tar.gz) = 4b9cf48c0cf8f13150dfc329a889c221f6206a44aa9dcf8fa2f347abce55995c
-SIZE (ngx_cache_purge-1.5.tar.gz) = 7149
+SHA256 (ngx_cache_purge-1.6.tar.gz) = 863d6dd60e31b3c24c1f2d314f294c62a4ab5cf37f98c20ded9f6df1018baac8
+SIZE (ngx_cache_purge-1.6.tar.gz) = 7296
 SHA256 (agentzh-echo-nginx-module-v0.38rc2-0-g43c8843.tar.gz) = b1ac031931da71a6b5ee7f51c9b031f98f5339c34d4d2a8fe361123c2a9f748d
 SIZE (agentzh-echo-nginx-module-v0.38rc2-0-g43c8843.tar.gz) = 83870
 SHA256 (agentzh-headers-more-nginx-module-v0.17rc1-0-g3580526.tar.gz) = 826b62c13605281f843ad4a612a00b38d71599a673c3112480bff9bdbbcd36cd
@@ -40,8 +40,8 @@ SHA256 (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 8fd9a185f092320a5290ad8b
 SIZE (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 95092
 SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805
 SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796
-SHA256 (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae
-SIZE (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = 16694
+SHA256 (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2
+SIZE (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 17020
 SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b
 SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024
 SHA256 (Nginx_upstream_hash-0.3.1.tar.gz) = 51929c5352d4c2608b3f852987830be08b6946baf20da346fe520d9b12e39968
@@ -84,8 +84,8 @@ SHA256 (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 7ade6dc6d18b
 SIZE (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 37053
 SHA256 (nginx-sflow-module-0.9.6.tar.gz) = 5e80d1f8e5ba0963445d8245e09de0cf289936ae9feecb11c5e3a77d021f1ad0
 SIZE (nginx-sflow-module-0.9.6.tar.gz) = 27758
-SHA256 (ngx_slowfs_cache-1.8.tar.gz) = 3ab8aa47912a3f7a07cda0a4fbf6d2e870b9c9cbf5477014ac109001cdcb3644
-SIZE (ngx_slowfs_cache-1.8.tar.gz) = 11408
+SHA256 (ngx_slowfs_cache-1.9.tar.gz) = 7a2e07033550f3b594949a4392ac9a34e5583025ffea4e33e39a7f0d9fdc8b42
+SIZE (ngx_slowfs_cache-1.9.tar.gz) = 11527
 SHA256 (agentzh-srcache-nginx-module-v0.13rc8-0-g5237f26.tar.gz) = 2cb76adb4cf20079b44cf951f6a7fa480265878d65a6def2ae4dc5deb17ed686
 SIZE (agentzh-srcache-nginx-module-v0.13rc8-0-g5237f26.tar.gz) = 58234
 SHA256 (ngx_supervisord-1.4.tar.gz) = 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b
diff --git a/www/nginx/files/extra-patch-ngx_http_uploadprogress_module.c b/www/nginx/files/extra-patch-ngx_http_uploadprogress_module.c
deleted file mode 100644
index 765d25d0cd91..000000000000
--- a/www/nginx/files/extra-patch-ngx_http_uploadprogress_module.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../masterzen-nginx-upload-progress-module-c7c663f/ngx_http_uploadprogress_module.c.orig	2012-02-15 19:50:03.000000000 +0400
-+++ ../masterzen-nginx-upload-progress-module-c7c663f/ngx_http_uploadprogress_module.c	2012-02-15 19:53:58.000000000 +0400
-@@ -1446,18 +1446,12 @@
- 
- 
-     lzcf->timeout = ngx_parse_time(&value[2], 1);
--    if (lzcf->timeout == NGX_ERROR) {
-+    if (lzcf->timeout == (time_t) NGX_ERROR) {
-         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                            "track_uploads \"%V\" timeout value invalid", &value[1]);
-         return NGX_CONF_ERROR;
-     }
- 
--    if (lzcf->timeout == NGX_PARSE_LARGE_TIME) {
--        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
--                           "track_uploads \"%V\" timeout value must be less than 68 years", &value[1]);
--        return NGX_CONF_ERROR;
--    }
--
-     clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-     lzcf->handler = clcf->handler;
-     if ( lzcf->handler == NULL )