Mon Aug 6 14:31:58 2012 UTC ()
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.


(imil)
diff -r1.18 -r1.19 pkgsrc/www/nginx/distinfo
diff -r1.15 -r1.16 pkgsrc/www/nginx/options.mk
cvs diff -r1.18 -r1.19 pkgsrc/www/nginx/distinfo (expand / switch to unified diff)

--- pkgsrc/www/nginx/distinfo 2012/04/21 10:32:47 1.18
+++ pkgsrc/www/nginx/distinfo 2012/08/06 14:31:58 1.19
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.18 2012/04/21 10:32:47 imil Exp $ 1$NetBSD: distinfo,v 1.19 2012/08/06 14:31:58 imil Exp $
2 2
3SHA1 (naxsi-0.45.tgz) = e1f29219fc9f7d3b39c4abfac558816f6046363b 3SHA1 (naxsi-core-0.48.tgz) = 7391532e7026179c0c9e52e15c5d645259f94fa6
4RMD160 (naxsi-0.45.tgz) = bbb535c3f22c4951263a80a962ea0d8fa2208cbd 4RMD160 (naxsi-core-0.48.tgz) = 6c1c3934bb35976e7b40b39b26b07bfc6ea3cda0
5Size (naxsi-0.45.tgz) = 175358 bytes 5Size (naxsi-core-0.48.tgz) = 42816 bytes
6SHA1 (nginx-1.0.15.tar.gz) = e506b301ea849f58f2efb499d77b819fe55eea9a 6SHA1 (nginx-1.0.15.tar.gz) = e506b301ea849f58f2efb499d77b819fe55eea9a
7RMD160 (nginx-1.0.15.tar.gz) = 99653499916b81fb0f5842755484983606cea5ec 7RMD160 (nginx-1.0.15.tar.gz) = 99653499916b81fb0f5842755484983606cea5ec
8Size (nginx-1.0.15.tar.gz) = 693025 bytes 8Size (nginx-1.0.15.tar.gz) = 693025 bytes
9SHA1 (nginx_http_push_module-0.692.tar.gz) = 72103084cad8f4d3d9a49a6b04cf780e4541605d 9SHA1 (nginx_http_push_module-0.692.tar.gz) = 72103084cad8f4d3d9a49a6b04cf780e4541605d
10RMD160 (nginx_http_push_module-0.692.tar.gz) = 9d2be16074cf28115af0f1d8f3646937cda649ad 10RMD160 (nginx_http_push_module-0.692.tar.gz) = 9d2be16074cf28115af0f1d8f3646937cda649ad
11Size (nginx_http_push_module-0.692.tar.gz) = 29119 bytes 11Size (nginx_http_push_module-0.692.tar.gz) = 29119 bytes
12SHA1 (nginx_upload_module-2.2.0.tar.gz) = 93d6e83e613a0ce2ed057a434b344fa1b6609b47 12SHA1 (nginx_upload_module-2.2.0.tar.gz) = 93d6e83e613a0ce2ed057a434b344fa1b6609b47
13RMD160 (nginx_upload_module-2.2.0.tar.gz) = 5734af837be3fe8ec444a7e5e7f6707118594098 13RMD160 (nginx_upload_module-2.2.0.tar.gz) = 5734af837be3fe8ec444a7e5e7f6707118594098
14Size (nginx_upload_module-2.2.0.tar.gz) = 25796 bytes 14Size (nginx_upload_module-2.2.0.tar.gz) = 25796 bytes
15SHA1 (patch-aa) = adf433d1b56a88c6c2ed09c4bd54fdb1a336582f 15SHA1 (patch-aa) = adf433d1b56a88c6c2ed09c4bd54fdb1a336582f
16SHA1 (patch-ab) = 6f20ef8ac9a042faf7e22770de7c16b351cb1191 16SHA1 (patch-ab) = 6f20ef8ac9a042faf7e22770de7c16b351cb1191
cvs diff -r1.15 -r1.16 pkgsrc/www/nginx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nginx/options.mk 2012/06/12 15:46:04 1.15
+++ pkgsrc/www/nginx/options.mk 2012/08/06 14:31:58 1.16
@@ -1,25 +1,31 @@ @@ -1,25 +1,31 @@
1# $NetBSD: options.mk,v 1.15 2012/06/12 15:46:04 wiz Exp $ 1# $NetBSD: options.mk,v 1.16 2012/08/06 14:31:58 imil Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx 3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
4PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache naxsi pcre \ 4PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache naxsi pcre \
5 push realip ssl sub uwsgi image-filter upload debug \ 5 push realip ssl sub uwsgi image-filter upload debug \
6 status 6 status
7PKG_SUGGESTED_OPTIONS= inet6 pcre ssl 7PKG_SUGGESTED_OPTIONS= inet6 pcre ssl
8 8
9PLIST_VARS+= naxsi uwsgi 9PLIST_VARS+= naxsi uwsgi
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
 13# documentation says naxsi must be the first module
 14.if !empty(PKG_OPTIONS:Mnaxsi)
 15PLIST.naxsi= yes
 16CONFIGURE_ARGS+= --add-module=../${NAXSI}/naxsi_src
 17.endif
 18
13.if !empty(PKG_OPTIONS:Mdebug) 19.if !empty(PKG_OPTIONS:Mdebug)
14CONFIGURE_ARGS+= --with-debug 20CONFIGURE_ARGS+= --with-debug
15.endif 21.endif
16 22
17.if !empty(PKG_OPTIONS:Mssl) 23.if !empty(PKG_OPTIONS:Mssl)
18.include "../../security/openssl/buildlink3.mk" 24.include "../../security/openssl/buildlink3.mk"
19CONFIGURE_ARGS+= --with-mail_ssl_module 25CONFIGURE_ARGS+= --with-mail_ssl_module
20CONFIGURE_ARGS+= --with-http_ssl_module 26CONFIGURE_ARGS+= --with-http_ssl_module
21.endif 27.endif
22 28
23.if !empty(PKG_OPTIONS:Mpcre) 29.if !empty(PKG_OPTIONS:Mpcre)
24.include "../../devel/pcre/buildlink3.mk" 30.include "../../devel/pcre/buildlink3.mk"
25.else 31.else
@@ -41,33 +47,28 @@ CONFIGURE_ARGS+= --with-http_sub_module @@ -41,33 +47,28 @@ CONFIGURE_ARGS+= --with-http_sub_module
41 47
42.if !empty(PKG_OPTIONS:Mgtools) 48.if !empty(PKG_OPTIONS:Mgtools)
43CONFIGURE_ARGS+= --with-google_perftools_module 49CONFIGURE_ARGS+= --with-google_perftools_module
44.endif 50.endif
45 51
46.if !empty(PKG_OPTIONS:Mmail-proxy) 52.if !empty(PKG_OPTIONS:Mmail-proxy)
47CONFIGURE_ARGS+= --with-mail 53CONFIGURE_ARGS+= --with-mail
48.endif 54.endif
49 55
50.if empty(PKG_OPTIONS:Mmemcache) 56.if empty(PKG_OPTIONS:Mmemcache)
51CONFIGURE_ARGS+= --without-http_memcached_module 57CONFIGURE_ARGS+= --without-http_memcached_module
52.endif 58.endif
53 59
54.if !empty(PKG_OPTIONS:Mnaxsi) 
55PLIST.naxsi= yes 
56CONFIGURE_ARGS+= --add-module=../${NAXSI}/naxsi_src 
57.endif 
58 
59.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum) 60.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum)
60NAXSI= naxsi-0.45 61NAXSI= naxsi-core-0.48
61NAXSI_DISTFILE= ${NAXSI}.tgz 62NAXSI_DISTFILE= ${NAXSI}.tgz
62SITES.${NAXSI_DISTFILE}= http://naxsi.googlecode.com/files/ 63SITES.${NAXSI_DISTFILE}= http://naxsi.googlecode.com/files/
63DISTFILES+= ${NAXSI_DISTFILE} 64DISTFILES+= ${NAXSI_DISTFILE}
64.endif 65.endif
65 66
66.if !empty(PKG_OPTIONS:Mrealip) 67.if !empty(PKG_OPTIONS:Mrealip)
67CONFIGURE_ARGS+= --with-http_realip_module 68CONFIGURE_ARGS+= --with-http_realip_module
68.endif 69.endif
69 70
70.if !empty(PKG_OPTIONS:Minet6) 71.if !empty(PKG_OPTIONS:Minet6)
71CONFIGURE_ARGS+= --with-ipv6 72CONFIGURE_ARGS+= --with-ipv6
72.endif 73.endif
73 74