diff options
| author | imil <imil@pkgsrc.org> | 2015-09-29 13:48:33 +0000 |
|---|---|---|
| committer | imil <imil@pkgsrc.org> | 2015-09-29 13:48:33 +0000 |
| commit | 1a665c5f59378c31ee55b9bc83d6d5671b0619c8 (patch) | |
| tree | 6fb18f8d83a2d9f5f735c4256652805cd1ba236b /www/nginx | |
| parent | a01fa7ff8182e2422b0b7f1f8dd058eb9f1a4f96 (diff) | |
| download | pkgsrc-1a665c5f59378c31ee55b9bc83d6d5671b0619c8.tar.gz | |
Updated naxsi to 0.54
From 0.53-2 "AppleJack":
* increased PCRE output vector from 6 to 30 (from 2 match groups to 10)
* removed negative rule on content-types (naxsi_core.rules) as naxsi supports
json
* Fixed broken EXLOG on |NAME match zones (issues/110)
* Integrated libinjection (xss/sqli)
Modified `options.mk' to allow www/nginx-devel to use ngx_http_v2_module instead
of ngx_http_spdy_module.
Diffstat (limited to 'www/nginx')
| -rw-r--r-- | www/nginx/distinfo | 14 | ||||
| -rw-r--r-- | www/nginx/options.mk | 19 |
2 files changed, 22 insertions, 11 deletions
diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 48380b84e85..bed66103dfe 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.47 2015/09/24 06:13:50 wiz Exp $ +$NetBSD: distinfo,v 1.48 2015/09/29 13:48:33 imil Exp $ SHA1 (array-var-nginx-module-0.03.tar.gz) = b2666aa3c092060fcd3931a6d45798a5745c1ad6 RMD160 (array-var-nginx-module-0.03.tar.gz) = 171c2d9bd02d7a7ede9f87ab348ef035cea14aec @@ -18,9 +18,12 @@ Size (headers-more-nginx-module-0.25.tar.gz) = 27973 bytes SHA1 (lua-nginx-module-0.9.5.tar.gz) = c9c752461f407ccae40870d4cabfbf2bd8c81bac RMD160 (lua-nginx-module-0.9.5.tar.gz) = 180331a69680278bac26f0a9ccd0de52fd88a7ea Size (lua-nginx-module-0.9.5.tar.gz) = 476124 bytes -SHA1 (naxsi-0.53-2.tar.gz) = e29101b3193f434e4ec503671c41d0bacc64ff39 -RMD160 (naxsi-0.53-2.tar.gz) = 198ff9d2faf55ce3ed72332615f9e555e3afc155 -Size (naxsi-0.53-2.tar.gz) = 165690 bytes +SHA1 (naxsi-0.54.tar.gz) = d5db25db19a564358af7763d4935e978d05bf6f5 +RMD160 (naxsi-0.54.tar.gz) = 094b09c198cf690ec24b3e9d3763647e06ebee64 +Size (naxsi-0.54.tar.gz) = 163809 bytes +SHA1 (nginx-1.8.0.tar.gz) = 12bad312764feae50246685ab2e74512d1aa9b2f +RMD160 (nginx-1.8.0.tar.gz) = 9af62e81b42e572615f59fcedb222e9d6ad96b53 +Size (nginx-1.8.0.tar.gz) = 832104 bytes SHA1 (nginx_http_push_module-0.692.tar.gz) = 72103084cad8f4d3d9a49a6b04cf780e4541605d RMD160 (nginx_http_push_module-0.692.tar.gz) = 9d2be16074cf28115af0f1d8f3646937cda649ad Size (nginx_http_push_module-0.692.tar.gz) = 29119 bytes @@ -30,8 +33,5 @@ Size (ngx_devel_kit-0.2.19.tar.gz) = 65029 bytes SHA1 (set-misc-nginx-module-0.24.tar.gz) = da404a7dac5fa4a0a86f42b4ec7648b607f4cd66 RMD160 (set-misc-nginx-module-0.24.tar.gz) = 07d0bb8f2a0840534a82a2d18394163342393cef Size (set-misc-nginx-module-0.24.tar.gz) = 40397 bytes -SHA1 (nginx-1.8.0.tar.gz) = 12bad312764feae50246685ab2e74512d1aa9b2f -RMD160 (nginx-1.8.0.tar.gz) = 9af62e81b42e572615f59fcedb222e9d6ad96b53 -Size (nginx-1.8.0.tar.gz) = 832104 bytes SHA1 (patch-aa) = 47f0c19b47b115f00ea6e9432d5bb12058c3bc1c SHA1 (patch-ab) = 0925a163db1ec36142fc3c32545f0abc1c5545c8 diff --git a/www/nginx/options.mk b/www/nginx/options.mk index 7ac5ed2598d..2a5175a9352 100644 --- a/www/nginx/options.mk +++ b/www/nginx/options.mk @@ -1,11 +1,18 @@ -# $NetBSD: options.mk,v 1.32 2015/09/24 06:13:50 wiz Exp $ +# $NetBSD: options.mk,v 1.33 2015/09/29 13:48:33 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 \ - debug status nginx-autodetect-cflags spdy echo \ + debug status nginx-autodetect-cflags echo \ set-misc headers-more array-var encrypted-session \ form-input perl gzip +.if !empty(NGINX_HTTP_V2) +# nginx 1.9.5+ renamed spdy to v2 +PKG_SUPPORTED_OPTIONS+= v2 +.else +PKG_SUPPORTED_OPTIONS+= spdy +.endif + PKG_SUGGESTED_OPTIONS= inet6 pcre ssl PLIST_VARS+= naxsi perl uwsgi @@ -44,10 +51,14 @@ CONFIGURE_ARGS+= --with-http_dav_module CONFIGURE_ARGS+= --with-http_flv_module .endif -.if !empty(PKG_OPTIONS:Mspdy) +.if !empty(PKG_OPTIONS:Mspdy) && empty(NGINX_HTTP_V2) CONFIGURE_ARGS+= --with-http_spdy_module .endif +.if !empty(PKG_OPTIONS:Mv2) && !empty(NGINX_HTTP_V2) +CONFIGURE_ARGS+= --with-http_v2_module +.endif + .if !empty(PKG_OPTIONS:Msub) CONFIGURE_ARGS+= --with-http_sub_module .endif @@ -65,7 +76,7 @@ CONFIGURE_ARGS+= --without-http_memcached_module .endif .if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum) -NAXSI= naxsi-0.53-2 +NAXSI= naxsi-0.54 NAXSI_DISTFILE= ${NAXSI}.tar.gz SITES.${NAXSI_DISTFILE}= http://ftp.NetBSD.org/pub/pkgsrc/distfiles/ DISTFILES+= ${NAXSI_DISTFILE} |