Merge latest changes from www/nginx-devel:

 update mod_zip from 1.1.4 to 1.1.5;
 update passenger module support from 2.2.4 to 2.2.5;
 update upload_progress module from 0.5 to 0.6;
 remove needless patch.

Do not bump PORTREVISION.

3 files changed, 18 insertions, 63 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index fc77e8f39c9d..18d936946b9f 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -226,11 +226,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upload_module-${NGINX_UPLOAD_MODULE
 .endif
 
 .if defined(WITH_HTTP_UPLOAD_PROGRESS)
-NGINX_UPLOAD_PROGRESS_MODULE_VERSION=	0.5
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:uploadprogress/}
-MASTER_SITE_SUBDIR+=	osa/:uploadprogress
-DISTFILES+=	nginx_uploadprogress_module-${NGINX_UPLOAD_PROGRESS_MODULE_VERSION}.tar.gz:uploadprogress
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_uploadprogress_module
+NGINX_UPLOAD_PROGRESS_MODULE_VERSION=	0.6
+MASTER_SITES+=	http://wiki.nginx.org/images/7/70/:uploadprogress
+DISTFILES+=	Nginx-upload-progress-module-${NGINX_UPLOAD_PROGRESS_MODULE_VERSION}.tar.gz:uploadprogress
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-upload-progress-module
 .endif
 
 .if defined(WITH_HTTP_UPSTREAM_FAIR)
@@ -254,10 +253,10 @@ CONFIGURE_ARGS+=--with-http_xslt_module
 .endif
 
 .if defined(WITH_HTTP_ZIP_MODULE)
-NGINX_ZIP_MODULE_VERSION=	1.1.4
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:zip/}
-MASTER_SITE_SUBDIR+=	osa/:zip
-DISTFILES+=	nginx_mod_zip-${NGINX_ZIP_MODULE_VERSION}.tar.gz:zip
+NGINX_ZIP_MODULE_VERSION=	1.1.5
+MASTER_SITES+=	${MASTER_SITE_GOOGLE_CODE:}:zip
+PROJECTHOST=	mod-zip
+DISTFILES+=	mod_zip-${NGINX_ZIP_MODULE_VERSION}.tar.gz:zip
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_MODULE_VERSION}
 .endif
 
@@ -271,7 +270,7 @@ CONFIGURE_ARGS+=--with-pcre
 .endif
 
 .if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION=	2.2.4
+PASSENGER_VERSION=	2.2.5
 MASTER_SITES+=	RF/passenger/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
@@ -334,10 +333,6 @@ post-patch:
 	@${PATCH} ${PATCH_ARGS} < \
 		${PATCHDIR}/extra-patch-ngx_http_fancyindex_module.c
 .endif
-.if defined(WITH_HTTP_UPLOAD_PROGRESS)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_uploadprogress_module.c
-.endif
 .if defined(WITH_HTTP_NOTICE_MODULE)
 	@${PATCH} ${PATCH_ARGS} < \
 		${PATCHDIR}/extra-patch-ngx_http_notice_module.c
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 4e7bd0895b48..4ffbe7fafa57 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -25,18 +25,18 @@ SIZE (ngx_http_response-0.3.tar.gz) = 2244
 MD5 (nginx_upload_module-2.0.9.tar.gz) = bd8ee6011e3e24805c8ead617211a04b
 SHA256 (nginx_upload_module-2.0.9.tar.gz) = 3c43e185f85a5a719de2cd02083ae0802a8fd2645c79a78c7d37c3d1f0361f9f
 SIZE (nginx_upload_module-2.0.9.tar.gz) = 18232
-MD5 (nginx_uploadprogress_module-0.5.tar.gz) = 04cca031be26a0a37a24b8b2d475c77a
-SHA256 (nginx_uploadprogress_module-0.5.tar.gz) = b025bf8ea2e1cf405dd72587d52eb48135cb7b0843a2dbfcf91c8f562701d75c
-SIZE (nginx_uploadprogress_module-0.5.tar.gz) = 11578
+MD5 (Nginx-upload-progress-module-0.6.tar.gz) = 98cfd8a950edaecf1bdf95bd32f8c1f4
+SHA256 (Nginx-upload-progress-module-0.6.tar.gz) = 19db47b4d5e3e3c7304fb77c257daf1f8c727ccc8f16876352141152e32a2f5f
+SIZE (Nginx-upload-progress-module-0.6.tar.gz) = 11856
 MD5 (nginx_upstream_fair-20081012.tar.gz) = 1f7b4f3e47c32f89afac59fa60381dc4
 SHA256 (nginx_upstream_fair-20081012.tar.gz) = 4c2bd957168008e5b2397fad49824ca70f3685cf884e8d1be45d56c8e3bbe88c
 SIZE (nginx_upstream_fair-20081012.tar.gz) = 10021
 MD5 (ngx_http_upstream_keepalive-0.1.tar.gz) = 89c5887abfdacb87e2d21b2973d69cdd
 SHA256 (ngx_http_upstream_keepalive-0.1.tar.gz) = a0929ddff8dcf451731c95b077374b15e4306db8e83322aab6183cfed7307915
 SIZE (ngx_http_upstream_keepalive-0.1.tar.gz) = 4978
-MD5 (nginx_mod_zip-1.1.4.tar.gz) = be934138446793ca783ebfcc1a74883d
-SHA256 (nginx_mod_zip-1.1.4.tar.gz) = d152861779a7b04634e6e0b87a53707ccad06e00bba65246b9005ddc8d0f654b
-SIZE (nginx_mod_zip-1.1.4.tar.gz) = 17446
-MD5 (passenger-2.2.4.tar.gz) = 873cdc8ab69999c6e6ad02289ab30fb9
-SHA256 (passenger-2.2.4.tar.gz) = 13486cf4ef25ea76d0621ddccb2d30dc380d7c1661849b8649f25a7af5fa9afa
-SIZE (passenger-2.2.4.tar.gz) = 1789131
+MD5 (mod_zip-1.1.5.tar.gz) = cc8f5caa893f818176c08b48b2a613ca
+SHA256 (mod_zip-1.1.5.tar.gz) = 36fff54b74d82f8722d2d005aba9f767fd26faeb1cff778da3766246a44083df
+SIZE (mod_zip-1.1.5.tar.gz) = 19126
+MD5 (passenger-2.2.5.tar.gz) = 93838b842ce0a0c65d7c6ef9ce59c41f
+SHA256 (passenger-2.2.5.tar.gz) = b090817e840c7b7e0d39c5eea292c87d428b1e56f29ef4a178705db42c9ec326
+SIZE (passenger-2.2.5.tar.gz) = 1799698
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 9752602780a6..000000000000
--- a/www/nginx/files/extra-patch-ngx_http_uploadprogress_module.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- ../nginx_uploadprogress_module/ngx_http_uploadprogress_module.c.orig	2009-06-26 15:32:01.000000000 +0400
-+++ ../nginx_uploadprogress_module/ngx_http_uploadprogress_module.c	2009-06-26 15:38:30.000000000 +0400
-@@ -187,8 +187,9 @@
-         if (i) {
-             start_p = p += 14;
-             while (p < r->args.data + r->args.len) {
--                if (*p++ != '&') {
--                    continue;
-+                if (*p++ == '&') {
-+                    p--;
-+                    break;
-                 }
-             }
- 
-@@ -799,7 +799,7 @@ ngx_clean_old_connections(ngx_event_t * ev)
-     ngx_http_uploadprogress_ctx_t   *ctx;
-     ngx_slab_pool_t                 *shpool;
-     ngx_rbtree_node_t               *node;
--    ngx_http_uploadprogress_node_t  *up;
-+    ngx_http_uploadprogress_node_t  *up, *upprev;
-     time_t                           now = ngx_time();
-     int                              count = 0;
- 
-@@ -822,6 +822,7 @@ ngx_clean_old_connections(ngx_event_t * ev)
-         }
- 
-         up = (ngx_http_uploadprogress_node_t *) node;
-+        upprev = up->prev;
- 
-         ngx_log_debug3(NGX_LOG_DEBUG_HTTP, shm_zone->shm.log, 0,
-                        "uploadprogress clean: scanning %08XD (req done %ui) timeout at %T",
-@@ -840,7 +841,7 @@ ngx_clean_old_connections(ngx_event_t * ev)
-         }
-         else
-             count++;
--        node = (ngx_rbtree_node_t *) up->prev;
-+        node = (ngx_rbtree_node_t *) upprev;
-     }
- 
-     ngx_log_debug3(NGX_LOG_DEBUG_HTTP, shm_zone->shm.log, 0,