3 files changed, 36 insertions, 8 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 3dbb8cf6647f..bda527ee9007 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -57,6 +57,7 @@ OPTIONS=	DEBUG			"Build with debug" off \
 		HTTP_UPLOAD_MODULE	"3rd party upload module" off \
 		HTTP_UPLOAD_PROGRESS	"3rd party uploadprogress module" off \
 		HTTP_UPSTREAM_FAIR	"3rd party upstream fair module" off \
+		HTTP_UPSTREAM_HASH	"3rd party upstream hash module" off \
 		HTTP_UPSTREAM_KEEPALIVE "3rd party upstream keepalive module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
 		MEMC_MODULE		"3rd party memc (memcached) module" off \
@@ -199,7 +200,7 @@ CONFIGURE_ARGS+=--with-http_image_filter_module
 .endif
 
 .if defined(WITH_HTTP_MOGILEFS_MODULE)
-NGINX_MOGILEFS_MODULE_VERSION=	1.0.2
+NGINX_MOGILEFS_MODULE_VERSION=	1.0.3
 MASTER_SITES+=	http://www.grid.net.ru/nginx/download/:mogilefs
 DISTFILES+=	nginx_mogilefs_module-${NGINX_MOGILEFS_MODULE_VERSION}.tar.gz:mogilefs
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_mogilefs_module-${NGINX_MOGILEFS_MODULE_VERSION}
@@ -294,6 +295,13 @@ DISTFILES+=	nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.gz:upstreamfa
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}
 .endif
 
+.if defined(WITH_HTTP_UPSTREAM_HASH)
+NGINX_UPSTREAM_HASH_VERSION=	0.3.1
+MASTER_SITES+=	http://wiki.nginx.org/images/1/11/:upstreamhash
+DISTFILES+=	Nginx_upstream_hash-${NGINX_UPSTREAM_HASH_VERSION}.tar.gz:upstreamhash
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_hash-${NGINX_UPSTREAM_HASH_VERSION}
+.endif
+
 .if defined(WITH_HTTP_UPSTREAM_KEEPALIVE)
 NGINX_UPSTREAM_KEEPALIVE_VERSION=	0.2
 MASTER_SITES+=	http://mdounin.ru/files/:upstream
@@ -339,7 +347,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
 .endif
 
 .if defined(WITH_SLOWFS_CACHE_MODULE)
-NGINX_SLOWFS_CACHE_MODULE_VERSION=	1.2
+NGINX_SLOWFS_CACHE_MODULE_VERSION=	1.3
 MASTER_SITES+=	http://labs.frickle.com/files/:slowfs_cache
 DISTFILES+=	ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_MODULE_VERSION}.tar.gz:slowfs_cache
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_MODULE_VERSION}
@@ -429,6 +437,10 @@ post-patch:
 		s!-lpthread!${PTHREAD_LIBS}!g' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info.rb
 .endif
+.if defined(WITH_HTTP_UPSTREAM_HASH)
+	@${PATCH} ${PATCH_ARGS} < \
+		${PATCHDIR}/extra-patch-ngx_http_upstream.h
+.endif
 .if defined(WITH_SUPERVISORD_MODULE)
 	( cd ${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} && \
 		${PATCH} -p0 < \
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index b77f7beaa871..e475fc20cdd5 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -19,9 +19,9 @@ SIZE (nginx-fancyindex-0.1_beta5.tar.bz2) = 12211
 MD5 (ngx_http_gunzip_filter_module-0.1.tar.gz) = 958dc44c287d9f4b5dc63c055144126c
 SHA256 (ngx_http_gunzip_filter_module-0.1.tar.gz) = 3ab322c2e3266e0ea0be1b12ff4a29b2c70d681ec897bd8b60d42dab551bf860
 SIZE (ngx_http_gunzip_filter_module-0.1.tar.gz) = 6927
-MD5 (nginx_mogilefs_module-1.0.2.tar.gz) = 62a72ce32d10b7811a18b672d8f69e17
-SHA256 (nginx_mogilefs_module-1.0.2.tar.gz) = fb9910e220567c7e19e2508c7d3a45e54c69b617c0eeb5eac7dbe728dc964855
-SIZE (nginx_mogilefs_module-1.0.2.tar.gz) = 13706
+MD5 (nginx_mogilefs_module-1.0.3.tar.gz) = e3c1b9f4ceb26d7573af5acfda59e9a8
+SHA256 (nginx_mogilefs_module-1.0.3.tar.gz) = cfebf3d5ed978ec89067790fcaa94d38e399e15f6165f1aae2838f09382239e0
+SIZE (nginx_mogilefs_module-1.0.3.tar.gz) = 15090
 MD5 (nginx_mod_h264_streaming-2.2.5.tar.gz) = 204fc4feb56fb68669b4499008b409ca
 SHA256 (nginx_mod_h264_streaming-2.2.5.tar.gz) = e285f0df518817eaa4bb92746286aff3364a2b67bc1cc1fd98b368194d85ab7d
 SIZE (nginx_mod_h264_streaming-2.2.5.tar.gz) = 39771
@@ -46,6 +46,9 @@ SIZE (nginx_uploadprogress_module-0.8.tar.gz) = 16364
 MD5 (nginx_upstream_fair-20090923.tar.gz) = a8443d779ee91db2290efc83832ac88d
 SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b
 SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024
+MD5 (Nginx_upstream_hash-0.3.1.tar.gz) = 75ec3d6412cdec77aadaeecab67bb484
+SHA256 (Nginx_upstream_hash-0.3.1.tar.gz) = 51929c5352d4c2608b3f852987830be08b6946baf20da346fe520d9b12e39968
+SIZE (Nginx_upstream_hash-0.3.1.tar.gz) = 5049
 MD5 (ngx_http_upstream_keepalive-0.2.tar.gz) = 1d9663a22c25633b5ad1c8a0f6fea467
 SHA256 (ngx_http_upstream_keepalive-0.2.tar.gz) = fdea0f46ce24c8889827993902659d41efa62b93b1a8000975a023209e138c2d
 SIZE (ngx_http_upstream_keepalive-0.2.tar.gz) = 7092
@@ -58,9 +61,9 @@ SIZE (ngx_http_memc_module-0.05.tar.gz) = 88253
 MD5 (passenger-2.2.8.tar.gz) = a5632323a573a039ea889c93396ad986
 SHA256 (passenger-2.2.8.tar.gz) = bfd37266f4afa7ab08c47cd731ce2048fc2195b793384882211ad61824893d52
 SIZE (passenger-2.2.8.tar.gz) = 1993046
-MD5 (ngx_slowfs_cache-1.2.tar.gz) = e79af4a6eecd7c385d76a92f814d0720
-SHA256 (ngx_slowfs_cache-1.2.tar.gz) = 5e04bcdcde52d7958f397acdc4af2c1961e5384499e627400c1c2f166930fa1c
-SIZE (ngx_slowfs_cache-1.2.tar.gz) = 9610
+MD5 (ngx_slowfs_cache-1.3.tar.gz) = 38823dbd8322ebc90f96d66b4a0501bf
+SHA256 (ngx_slowfs_cache-1.3.tar.gz) = 3e15447a467480800b3a08dcb4d893edc5c96a127c17c5c3359da10e683636dd
+SIZE (ngx_slowfs_cache-1.3.tar.gz) = 9680
 MD5 (ngx_supervisord-1.3.tar.gz) = d632977d94f0d8cfffcf3fe7bd83e2ce
 SHA256 (ngx_supervisord-1.3.tar.gz) = d168e4bd5c4d5cbcaa23c924a0259a63ce0cf99ca204d9eba1a8931cd0ba46af
 SIZE (ngx_supervisord-1.3.tar.gz) = 18750
diff --git a/www/nginx/files/extra-patch-ngx_http_upstream.h b/www/nginx/files/extra-patch-ngx_http_upstream.h
new file mode 100644
index 000000000000..f4c1f7ada782
--- /dev/null
+++ b/www/nginx/files/extra-patch-ngx_http_upstream.h
@@ -0,0 +1,13 @@
+--- src/http/ngx_http_upstream.h.orig	2010-01-14 04:20:57.000000000 +0300
++++ src/http/ngx_http_upstream.h	2010-01-14 04:22:00.000000000 +0300
+@@ -105,6 +105,10 @@
+ 
+     ngx_array_t                     *servers;  /* ngx_http_upstream_server_t */
+ 
++    ngx_array_t                     *values;
++    ngx_array_t                     *lengths;
++    ngx_uint_t                       retries;
++
+     ngx_uint_t                       flags;
+     ngx_str_t                        host;
+     u_char                          *file_name;