4 files changed, 60 insertions, 14 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index bbe693896969..80ffb22c4c2f 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -72,6 +72,7 @@ OPTIONS=	DEBUG			"Enable nginx debugging" 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_STICKY	"3rd party upstream sticky module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
 		ARRAYVAR_MODULE		"3rd party array_var module" off \
 		CHUNKIN_MODULE		"3rd party chunkin module" off \
@@ -80,6 +81,7 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		FORMINPUT_MODULE	"3rd party form_input module" off \
 		GRIDFS_MODULE		"3rd party gridfs module" off \
 		ICONV_MODULE		"3rd party iconv module" off \
+		LET_MODULE		"3rd party let module" off \
 		LUA_MODULE		"3rd party lua module" off \
 		MEMC_MODULE		"3rd party memc (memcached) module" off \
 		NAXSI_MODULE		"3rd party naxsi module" off \
@@ -377,11 +379,6 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_subs_filter_module-${NGINX_HTTP_
 CONFIGURE_ARGS+=--with-http_secure_link_module
 .endif
 
-.if defined(WITH_HTTP_SSL_MODULE)
-NGINX_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-http_ssl_module
-.endif
-
 .if defined(WITH_HTTP_STATUS_MODULE)
 CONFIGURE_ARGS+=--with-http_stub_status_module
 .endif
@@ -423,6 +420,14 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_hash-${NGINX_UPSTREAM_HASH
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_upstream.h
 .endif
 
+.if defined(WITH_HTTP_UPSTREAM_STICKY)
+USE_HTTP_SSL_MODULE=	yes
+NGINX_UPSTREAM_STICKY_VERSION=	1.0
+MASTER_SITES+=	http://nginx-sticky-module.googlecode.com/files/:upstreamsticky
+DISTFILES+=	nginx-sticky-module-${NGINX_UPSTREAM_STICKY_VERSION}.tar.gz:upstreamsticky
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-sticky-module-${NGINX_UPSTREAM_STICKY_VERSION}
+.endif
+
 .if defined(WITH_HTTP_XSLT_MODULE)
 USE_GNOME=	libxml2 libxslt
 CONFIGURE_ARGS+=--with-http_xslt_module
@@ -478,6 +483,15 @@ DISTFILES+=	mongodb-mongo-c-driver-v${MONGO_C_DRIVER_VERSION}-${GIT_MONGO_C_DRIV
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_MODULE_VERSION:S/^0-g//}
 .endif
 
+.if defined(WITH_LET_MODULE)
+NGINX_LET_MODULE_VERSION=	0.0.4
+GIT_LET_MODULE_VERSION=	0-ga5e1dc5
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/arut/nginx-let-module/tarball/v${NGINX_LET_MODULE_VERSION}/:let
+DISTFILES+=	arut-nginx-let-module-v${NGINX_LET_MODULE_VERSION}-${GIT_LET_MODULE_VERSION}.tar.gz:let
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/arut-nginx-let-module-${GIT_LET_MODULE_VERSION:S/^0-g//}
+.endif
+
 .if defined(WITH_LUA_MODULE)
 LIB_DEPENDS+=	luajit-5.1.2:${PORTSDIR}/lang/luajit
 CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
@@ -658,8 +672,9 @@ CONFIGURE_ARGS+=--with-mail_ssl_module
 .endif
 .endif		# WITH_MAIL_MODULE
 
-.if defined(NGINX_OPENSSL)
-USE_OPENSSL=	yes
+.if defined(WITH_HTTP_SSL_MODULE) || defined(USE_HTTP_SSL_MODULE)
+NGINX_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-http_ssl_module
 .endif
 
 .if defined(USE_NGINX_DEVEL_KIT)
@@ -710,6 +725,10 @@ GROUPS?=${WWWGRP}
 
 .include <bsd.port.pre.mk>
 
+.if defined(NGINX_OPENSSL)
+USE_OPENSSL=	yes
+.endif
+
 pre-everything::
 	@${ECHO_MSG}
 .if defined(WITH_HTTP_UPSTREAM_FAIR)
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 189b82ba27c2..c8eb6af3b16c 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -46,6 +46,8 @@ SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc72099323
 SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024
 SHA256 (Nginx_upstream_hash-0.3.1.tar.gz) = 51929c5352d4c2608b3f852987830be08b6946baf20da346fe520d9b12e39968
 SIZE (Nginx_upstream_hash-0.3.1.tar.gz) = 5049
+SHA256 (nginx-sticky-module-1.0.tar.gz) = 415beaac0dd229c271128b461f6059601f4889714b548b20a4720fc5f0a86b60
+SIZE (nginx-sticky-module-1.0.tar.gz) = 114184
 SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
 SHA256 (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 23c41a6743803f8521c55b9c76d5c35b20e9870576478ce9152d2ecddffbf2ca
@@ -58,6 +60,8 @@ SHA256 (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = f55617873c9b123d610d59e4d
 SIZE (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = 18882
 SHA256 (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = bfcdd60c6b53bd499e2bf22fefc96848de37e7d57dfaf7303bb00376dcb812f0
 SIZE (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = 53033
+SHA256 (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 9253581f11966329f64b4b4a49a2a60798665812f9007222592586e64bcd66da
+SIZE (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 20543
 SHA256 (chaoslawful-lua-nginx-module-v0.5.0rc24-0-g6ff5df6.tar.gz) = 9939f0c796c0695f48007600a7f2aa2300718c9f1d52f11fdc482c8d262fc051
 SIZE (chaoslawful-lua-nginx-module-v0.5.0rc24-0-g6ff5df6.tar.gz) = 307657
 SHA256 (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 8c6f7a421346be1f53240b370cd29edd833f8ca32f6f9b926d66230b15727f0c
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 958d708b9d2b..4470cbf6784a 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -72,6 +72,7 @@ OPTIONS=	DEBUG			"Enable nginx debugging" 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_STICKY	"3rd party upstream sticky module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
 		ARRAYVAR_MODULE		"3rd party array_var module" off \
 		CHUNKIN_MODULE		"3rd party chunkin module" off \
@@ -80,6 +81,7 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		FORMINPUT_MODULE	"3rd party form_input module" off \
 		GRIDFS_MODULE		"3rd party gridfs module" off \
 		ICONV_MODULE		"3rd party iconv module" off \
+		LET_MODULE		"3rd party let module" off \
 		LUA_MODULE		"3rd party lua module" off \
 		MEMC_MODULE		"3rd party memc (memcached) module" off \
 		NAXSI_MODULE		"3rd party naxsi module" off \
@@ -377,11 +379,6 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_subs_filter_module-${NGINX_HTTP_
 CONFIGURE_ARGS+=--with-http_secure_link_module
 .endif
 
-.if defined(WITH_HTTP_SSL_MODULE)
-NGINX_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-http_ssl_module
-.endif
-
 .if defined(WITH_HTTP_STATUS_MODULE)
 CONFIGURE_ARGS+=--with-http_stub_status_module
 .endif
@@ -423,6 +420,14 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_hash-${NGINX_UPSTREAM_HASH
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_upstream.h
 .endif
 
+.if defined(WITH_HTTP_UPSTREAM_STICKY)
+USE_HTTP_SSL_MODULE=	yes
+NGINX_UPSTREAM_STICKY_VERSION=	1.0
+MASTER_SITES+=	http://nginx-sticky-module.googlecode.com/files/:upstreamsticky
+DISTFILES+=	nginx-sticky-module-${NGINX_UPSTREAM_STICKY_VERSION}.tar.gz:upstreamsticky
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-sticky-module-${NGINX_UPSTREAM_STICKY_VERSION}
+.endif
+
 .if defined(WITH_HTTP_XSLT_MODULE)
 USE_GNOME=	libxml2 libxslt
 CONFIGURE_ARGS+=--with-http_xslt_module
@@ -478,6 +483,15 @@ DISTFILES+=	mongodb-mongo-c-driver-v${MONGO_C_DRIVER_VERSION}-${GIT_MONGO_C_DRIV
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_MODULE_VERSION:S/^0-g//}
 .endif
 
+.if defined(WITH_LET_MODULE)
+NGINX_LET_MODULE_VERSION=	0.0.4
+GIT_LET_MODULE_VERSION=	0-ga5e1dc5
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/arut/nginx-let-module/tarball/v${NGINX_LET_MODULE_VERSION}/:let
+DISTFILES+=	arut-nginx-let-module-v${NGINX_LET_MODULE_VERSION}-${GIT_LET_MODULE_VERSION}.tar.gz:let
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/arut-nginx-let-module-${GIT_LET_MODULE_VERSION:S/^0-g//}
+.endif
+
 .if defined(WITH_LUA_MODULE)
 LIB_DEPENDS+=	luajit-5.1.2:${PORTSDIR}/lang/luajit
 CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
@@ -658,8 +672,9 @@ CONFIGURE_ARGS+=--with-mail_ssl_module
 .endif
 .endif		# WITH_MAIL_MODULE
 
-.if defined(NGINX_OPENSSL)
-USE_OPENSSL=	yes
+.if defined(WITH_HTTP_SSL_MODULE) || defined(USE_HTTP_SSL_MODULE)
+NGINX_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-http_ssl_module
 .endif
 
 .if defined(USE_NGINX_DEVEL_KIT)
@@ -710,6 +725,10 @@ GROUPS?=${WWWGRP}
 
 .include <bsd.port.pre.mk>
 
+.if defined(NGINX_OPENSSL)
+USE_OPENSSL=	yes
+.endif
+
 pre-everything::
 	@${ECHO_MSG}
 .if defined(WITH_HTTP_UPSTREAM_FAIR)
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 189b82ba27c2..c8eb6af3b16c 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -46,6 +46,8 @@ SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc72099323
 SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024
 SHA256 (Nginx_upstream_hash-0.3.1.tar.gz) = 51929c5352d4c2608b3f852987830be08b6946baf20da346fe520d9b12e39968
 SIZE (Nginx_upstream_hash-0.3.1.tar.gz) = 5049
+SHA256 (nginx-sticky-module-1.0.tar.gz) = 415beaac0dd229c271128b461f6059601f4889714b548b20a4720fc5f0a86b60
+SIZE (nginx-sticky-module-1.0.tar.gz) = 114184
 SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
 SHA256 (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 23c41a6743803f8521c55b9c76d5c35b20e9870576478ce9152d2ecddffbf2ca
@@ -58,6 +60,8 @@ SHA256 (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = f55617873c9b123d610d59e4d
 SIZE (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = 18882
 SHA256 (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = bfcdd60c6b53bd499e2bf22fefc96848de37e7d57dfaf7303bb00376dcb812f0
 SIZE (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = 53033
+SHA256 (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 9253581f11966329f64b4b4a49a2a60798665812f9007222592586e64bcd66da
+SIZE (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 20543
 SHA256 (chaoslawful-lua-nginx-module-v0.5.0rc24-0-g6ff5df6.tar.gz) = 9939f0c796c0695f48007600a7f2aa2300718c9f1d52f11fdc482c8d262fc051
 SIZE (chaoslawful-lua-nginx-module-v0.5.0rc24-0-g6ff5df6.tar.gz) = 307657
 SHA256 (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 8c6f7a421346be1f53240b370cd29edd833f8ca32f6f9b926d66230b15727f0c