Add 4 third-party modules:

o) arrayvar, add support for array variables to nginx config files;
o) encrypted-session, for encrypt and decrypt nginx variable values;
o) form-input, reads HTTP POST and PUT request body encoded in
   "application/x-www-form-urlencoded", and parse the arguments in
   request body into nginx variables;
o) iconv, to convert characters of different encoding (by libiconv).

3 files changed, 78 insertions, 0 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 63f9dc736092..758bf143da0c 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -70,9 +70,13 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		HTTP_UPSTREAM_FAIR	"3rd party upstream fair module" off \
 		HTTP_UPSTREAM_HASH	"3rd party upstream hash 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 \
 		DRIZZLE_MODULE		"3rd party drizzlie module" off \
+		ENCRYPTSESSION_MODULE	"3rd party encrypted_session module" off \
+		FORMINPUT_MODULE	"3rd party form_input module" off \
 		GRIDFS_MODULE		"3rd party gridfs module" off \
+		ICONV_MODULE		"3rd party iconv module" off \
 		LUA_MODULE		"3rd party lua module" off \
 		MEMC_MODULE		"3rd party memc (memcached) module" off \
 		NAXSI_MODULE		"3rd party naxsi module" off \
@@ -428,6 +432,16 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DR
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module::config
 .endif
 
+.if defined(WITH_ENCRYPTSESSION_MODULE)
+USE_NGINX_DEVEL_KIT=	yes
+NGINX_ENCRYPTSESSION_MODULE_VERSION=	0.01
+GIT_ENCRYPTSESSION_MODULE_VERSION=	0-g26da7fc
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/agentzh/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_MODULE_VERSION}/:encryptsession
+DISTFILES+=	agentzh-encrypted-session-nginx-module-v${NGINX_ENCRYPTSESSION_MODULE_VERSION}-${GIT_ENCRYPTSESSION_MODULE_VERSION}.tar.gz:encryptsession
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-encrypted-session-nginx-module-${GIT_ENCRYPTSESSION_MODULE_VERSION:S/^0-g//}
+.endif
+
 .if defined(WITH_GRIDFS_MODULE)
 NGINX_GRIDFS_MODULE_VERSION=	0.8
 GIT_GRIDFS_MODULE_VERSION=	0-gb5f8113
@@ -636,6 +650,38 @@ DISTFILES+=	simpl-ngx_devel_kit-v${NGINX_DEVEL_KIT_MODULE_VERSION}-${GIT_DEVEL_K
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/simpl-ngx_devel_kit-${GIT_DEVEL_KIT_MODULE_VERSION:S/^0-g//}
 .endif
 
+.if defined(WITH_ARRAYVAR_MODULE)
+USE_NGINX_DEVEL_KIT=	yes
+NGINX_ARRAYVAR_MODULE_VERSION=	0.03rc1
+GIT_ARRAYVAR_MODULE_VERSION=	0-gfed751a
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/agentzh/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_MODULE_VERSION}/:arrayvar
+DISTFILES+=	agentzh-array-var-nginx-module-v${NGINX_ARRAYVAR_MODULE_VERSION}-${GIT_ARRAYVAR_MODULE_VERSION}.tar.gz:arrayvar
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-array-var-nginx-module-${GIT_ARRAYVAR_MODULE_VERSION:S/^0-g//}
+.endif
+
+.if defined(WITH_FORMINPUT_MODULE)
+USE_NGINX_DEVEL_KIT=	yes
+NGINX_FORMINPUT_MODULE_VERSION=	0.07rc5
+GIT_FORMINPUT_MODULE_VERSION=	0-gd41681d
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/calio/form-input-nginx-module/tarball/v${NGINX_FORMINPUT_MODULE_VERSION}/:forminput
+DISTFILES+=	calio-form-input-nginx-module-v${NGINX_FORMINPUT_MODULE_VERSION}-${GIT_FORMINPUT_MODULE_VERSION}.tar.gz:forminput
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-form-input-nginx-module-${GIT_FORMINPUT_MODULE_VERSION:S/^0-g//}
+.endif
+
+.if defined(WITH_ICONV_MODULE)
+LIB_DEPENDS+=	iconv:${PORTSDIR}/converters/libiconv
+USE_NGINX_DEVEL_KIT=	yes
+NGINX_ICONV_MODULE_VERSION=	0.10rc5
+GIT_ICONV_MODULE_VERSION=	0-g4e71946
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/calio/iconv-nginx-module/tarball/v${NGINX_ICONV_MODULE_VERSION}/:iconv
+DISTFILES+=	calio-iconv-nginx-module-v${NGINX_ICONV_MODULE_VERSION}-${GIT_ICONV_MODULE_VERSION}.tar.gz:iconv
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-iconv-nginx-module-${GIT_ICONV_MODULE_VERSION:S/^0-g//}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module::config
+.endif
+
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 .include <bsd.port.pre.mk>
@@ -718,6 +764,11 @@ post-patch:
 		${PATCH} -p0 < \
 			${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION}/patches/ngx_http_upstream_init_busy-0.8.17.patch )
 .endif
+.if defined(WITH_ICONV_MODULE)
+	@${REINPLACE_CMD} \
+		's!%%PREFIX%%!${PREFIX}!g' \
+		${WRKDIR}/calio-iconv-nginx-module-${GIT_ICONV_MODULE_VERSION:S/^0-g//}/config
+.endif
 
 do-build:
 	@cd ${WRKSRC} && ${MAKE}
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 30d563bba9bb..a46f11418549 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -48,6 +48,8 @@ SHA256 (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 23c41a6743803
 SIZE (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 32575
 SHA256 (chaoslawful-drizzle-nginx-module-v0.1.2rc4-0-g46b744a.tar.gz) = 7260be8d69e1f3990061bc4ce8afbfa8150ddd74c4f3e77c405630adec2c529d
 SIZE (chaoslawful-drizzle-nginx-module-v0.1.2rc4-0-g46b744a.tar.gz) = 61019
+SHA256 (agentzh-encrypted-session-nginx-module-v0.01-0-g26da7fc.tar.gz) = bfc32f243ceb33ed9b9848ce534c1c51061d04d5c9bc6e9163c6128fc180e43b
+SIZE (agentzh-encrypted-session-nginx-module-v0.01-0-g26da7fc.tar.gz) = 62910
 SHA256 (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = f55617873c9b123d610d59e4da52703c07be0bae5c719ef0cc3d45a53480d29c
 SIZE (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = 18882
 SHA256 (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = bfcdd60c6b53bd499e2bf22fefc96848de37e7d57dfaf7303bb00376dcb812f0
@@ -84,3 +86,9 @@ SHA256 (agentzh-xss-nginx-module-v0.03rc3-0-g8618dd3.tar.gz) = 53d24316489344bea
 SIZE (agentzh-xss-nginx-module-v0.03rc3-0-g8618dd3.tar.gz) = 10016
 SHA256 (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = bf5540d76d1867b4411091f16c6c786fd66759099c59483c76c68434020fdb02
 SIZE (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = 64964
+SHA256 (agentzh-array-var-nginx-module-v0.03rc1-0-gfed751a.tar.gz) = 345e60d7a479409b7a7aba933a042629d59fd4fbfaed1d0f7fe43cc688e48ced
+SIZE (agentzh-array-var-nginx-module-v0.03rc1-0-gfed751a.tar.gz) = 9500
+SHA256 (calio-form-input-nginx-module-v0.07rc5-0-gd41681d.tar.gz) = 831bb3fa339206130b6395aa2cb4dfe4cdf9222e2a7da9de8d3de4a1a4620abc
+SIZE (calio-form-input-nginx-module-v0.07rc5-0-gd41681d.tar.gz) = 11048
+SHA256 (calio-iconv-nginx-module-v0.10rc5-0-g4e71946.tar.gz) = 5a733a45ac418b70ccc272dc9fa99b257c83e2db2282e26dea790223d80c5f8e
+SIZE (calio-iconv-nginx-module-v0.10rc5-0-g4e71946.tar.gz) = 11912
diff --git a/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config b/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config
new file mode 100644
index 000000000000..e3f803fdbc10
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config
@@ -0,0 +1,19 @@
+--- ../calio-iconv-nginx-module-4e71946/config.orig	2012-01-12 12:01:07.000000000 +0400
++++ ../calio-iconv-nginx-module-4e71946/config	2011-10-11 03:30:35.000000000 +0400
+@@ -39,12 +39,12 @@
+     fi
+ 
+     if [ $ngx_found = no ]; then
+-        ngx_feature="libiconv in /usr/local/"
+-        ngx_feature_path="/usr/local/include"
++        ngx_feature="libiconv in %%PREFIX%%/"
++        ngx_feature_path="%%PREFIX%%/include"
+         if [ $NGX_RPATH = YES ]; then
+-            ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -liconv"
++            ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -liconv"
+         else
+-            ngx_feature_libs="-L/usr/local/lib -liconv"
++            ngx_feature_libs="-L%%PREFIX%%/lib -liconv"
+         fi
+         . auto/feature
+     fi