summaryrefslogtreecommitdiff
path: root/www/nginx
diff options
context:
space:
mode:
authorimil <imil@pkgsrc.org>2012-08-06 14:31:58 +0000
committerimil <imil@pkgsrc.org>2012-08-06 14:31:58 +0000
commit6e3d4c3e6d6d1e424d4a06dc3b718b0943d273ce (patch)
treea7c4f0f9612456badf366ab70167063f8450d168 /www/nginx
parentb4456fdc8f07907c19dc29eb1f7bd2d4e4a1381c (diff)
downloadpkgsrc-6e3d4c3e6d6d1e424d4a06dc3b718b0943d273ce.tar.gz
Updated naxsi to 0.48:
- Fixed support of LOG / ALLOW targets - LOG target for rules and actions - brings security improvements (HTTP Auth in nx_extract and file disclosure fixed in nx_extract) No revbump as this does not affect nginx package itself.
Diffstat (limited to 'www/nginx')
-rw-r--r--www/nginx/distinfo8
-rw-r--r--www/nginx/options.mk15
2 files changed, 12 insertions, 11 deletions
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index eb312097e5d..0537e5b1cd0 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2012/04/21 10:32:47 imil Exp $
+$NetBSD: distinfo,v 1.19 2012/08/06 14:31:58 imil Exp $
-SHA1 (naxsi-0.45.tgz) = e1f29219fc9f7d3b39c4abfac558816f6046363b
-RMD160 (naxsi-0.45.tgz) = bbb535c3f22c4951263a80a962ea0d8fa2208cbd
-Size (naxsi-0.45.tgz) = 175358 bytes
+SHA1 (naxsi-core-0.48.tgz) = 7391532e7026179c0c9e52e15c5d645259f94fa6
+RMD160 (naxsi-core-0.48.tgz) = 6c1c3934bb35976e7b40b39b26b07bfc6ea3cda0
+Size (naxsi-core-0.48.tgz) = 42816 bytes
SHA1 (nginx-1.0.15.tar.gz) = e506b301ea849f58f2efb499d77b819fe55eea9a
RMD160 (nginx-1.0.15.tar.gz) = 99653499916b81fb0f5842755484983606cea5ec
Size (nginx-1.0.15.tar.gz) = 693025 bytes
diff --git a/www/nginx/options.mk b/www/nginx/options.mk
index 80dced8c8de..e3515c243ee 100644
--- a/www/nginx/options.mk
+++ b/www/nginx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2012/06/12 15:46:04 wiz Exp $
+# $NetBSD: options.mk,v 1.16 2012/08/06 14:31:58 imil Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache naxsi pcre \
@@ -10,6 +10,12 @@ PLIST_VARS+= naxsi uwsgi
.include "../../mk/bsd.options.mk"
+# documentation says naxsi must be the first module
+.if !empty(PKG_OPTIONS:Mnaxsi)
+PLIST.naxsi= yes
+CONFIGURE_ARGS+= --add-module=../${NAXSI}/naxsi_src
+.endif
+
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS+= --with-debug
.endif
@@ -51,13 +57,8 @@ CONFIGURE_ARGS+= --with-mail
CONFIGURE_ARGS+= --without-http_memcached_module
.endif
-.if !empty(PKG_OPTIONS:Mnaxsi)
-PLIST.naxsi= yes
-CONFIGURE_ARGS+= --add-module=../${NAXSI}/naxsi_src
-.endif
-
.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum)
-NAXSI= naxsi-0.45
+NAXSI= naxsi-core-0.48
NAXSI_DISTFILE= ${NAXSI}.tgz
SITES.${NAXSI_DISTFILE}= http://naxsi.googlecode.com/files/
DISTFILES+= ${NAXSI_DISTFILE}