Added form-input https://github.com/calio/form-input-nginx-module and

encrypted-session https://github.com/agentzh/encrypted-session-nginx-module

3 files changed, 33 insertions, 6 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 1d2518169ce..4a5df5d1038 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2014/03/21 11:36:47 imil Exp $
+# $NetBSD: Makefile,v 1.53 2014/03/21 21:41:19 imil Exp $
 
 DISTNAME=		nginx-1.4.7
-PKGREVISION=		3
+PKGREVISION=		4
 MAINTAINER=		joerg@NetBSD.org
 
 .include "../../www/nginx/Makefile.common"
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 56f477f9507..7dbd119fb5b 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2014/03/21 11:36:47 imil Exp $
+$NetBSD: distinfo,v 1.40 2014/03/21 21:41:19 imil Exp $
 
 SHA1 (array-var-nginx-module-0.03.tar.gz) = b2666aa3c092060fcd3931a6d45798a5745c1ad6
 RMD160 (array-var-nginx-module-0.03.tar.gz) = 171c2d9bd02d7a7ede9f87ab348ef035cea14aec
@@ -6,6 +6,12 @@ Size (array-var-nginx-module-0.03.tar.gz) = 9520 bytes
 SHA1 (echo-nginx-module-0.51.tar.gz) = 127d011f146a7e611f328cd4f2f29cdde1227f07
 RMD160 (echo-nginx-module-0.51.tar.gz) = 79bb11c34735381a5a90176eb4d07dec8b469ab4
 Size (echo-nginx-module-0.51.tar.gz) = 63460 bytes
+SHA1 (encrypted-session-nginx-module-0.03.tar.gz) = b33a74b83a200299fe80a2441b4cc014fab02a6a
+RMD160 (encrypted-session-nginx-module-0.03.tar.gz) = 89cab2054f95e1017c109238d399afe23ce499e6
+Size (encrypted-session-nginx-module-0.03.tar.gz) = 8949 bytes
+SHA1 (form-input-nginx-module-0.07.tar.gz) = 4f68ad4b6b19f313582523585aee4e4473666ea3
+RMD160 (form-input-nginx-module-0.07.tar.gz) = 1d543c15c1ced82497987b7fd71d79d7c818b9bf
+Size (form-input-nginx-module-0.07.tar.gz) = 10563 bytes
 SHA1 (headers-more-nginx-module-0.25.tar.gz) = 514bc3df30b24eb0a06533f1ebaa579b898990f5
 RMD160 (headers-more-nginx-module-0.25.tar.gz) = 8270edae05b2cf24f1d46fb1b217d4943bf56372
 Size (headers-more-nginx-module-0.25.tar.gz) = 27973 bytes
diff --git a/www/nginx/options.mk b/www/nginx/options.mk
index 783a8dd4f7f..bddbea9f5fd 100644
--- a/www/nginx/options.mk
+++ b/www/nginx/options.mk
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.27 2014/03/21 11:36:47 imil Exp $
+# $NetBSD: options.mk,v 1.28 2014/03/21 21:41:19 imil Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS=	dav flv gtools inet6 luajit mail-proxy memcache naxsi \
 			pcre push realip ssl sub uwsgi image-filter upload \
 			debug status nginx-autodetect-cflags spdy echo \
-			set-misc headers-more array-var
+			set-misc headers-more array-var encrypted-session \
+			form-input
 PKG_SUGGESTED_OPTIONS=	inet6 pcre ssl
 
 PLIST_VARS+=		naxsi uwsgi
@@ -79,7 +80,7 @@ CONFIGURE_ARGS+=	--with-ipv6
 .endif
 
 # NDK must be added once and before 3rd party modules needing it
-.for _ngx_mod in luajit set-misc array-var
+.for _ngx_mod in luajit set-misc array-var form-input encrypted-session
 .	if !defined(NEED_NDK) && !empty(PKG_OPTIONS:M${_ngx_mod}:O)
 CONFIGURE_ARGS+=	--add-module=../${NDK}
 NEED_NDK=		yes
@@ -134,6 +135,26 @@ SITES.${ARRAYVAR_DISTFILE}=	http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
 DISTFILES+=		${ARRAYVAR_DISTFILE}
 .endif
 
+.if !empty(PKG_OPTIONS:Mencrypted-session)
+CONFIGURE_ARGS+=	--add-module=../${ENCSESS}
+.endif
+.if !empty(PKG_OPTIONS:Mencrypted-session) || make(makesum)
+ENCSESS=		encrypted-session-nginx-module-0.03
+ENCSESS_DISTFILE=	${ENCSESS}.tar.gz
+SITES.${ENCSESS_DISTFILE}=	http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+DISTFILES+=		${ENCSESS_DISTFILE}
+.endif
+
+.if !empty(PKG_OPTIONS:Mform-input)
+CONFIGURE_ARGS+=	--add-module=../${FORMINPUT}
+.endif
+.if !empty(PKG_OPTIONS:Mform-input) || make(makesum)
+FORMINPUT=		form-input-nginx-module-0.07
+FORMINPUT_DISTFILE=	${FORMINPUT}.tar.gz
+SITES.${FORMINPUT_DISTFILE}=	http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+DISTFILES+=		${FORMINPUT_DISTFILE}
+.endif
+
 .if !empty(PKG_OPTIONS:Mheaders-more)
 CONFIGURE_ARGS+=	--add-module=../${HEADMORE}
 .endif