diff options
Diffstat (limited to 'www/nginx')
| -rw-r--r-- | www/nginx/Makefile | 8 | ||||
| -rw-r--r-- | www/nginx/distinfo | 10 | ||||
| -rw-r--r-- | www/nginx/patches/patch-aa | 22 |
3 files changed, 21 insertions, 19 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 4e0fb1232f4..82abdd51d2a 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.17 2011/11/20 12:37:14 shattered Exp $ +# $NetBSD: Makefile,v 1.18 2011/12/04 14:41:01 shattered Exp $ -DISTNAME= nginx-1.0.4 +DISTNAME= nginx-1.0.10 CATEGORIES= www +MASTER_SITES= http://nginx.org/download/ DISTFILES= ${DEFAULT_DISTFILES} -MASTER_SITES= http://sysoev.ru/nginx/ MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://nginx.net/ +HOMEPAGE= http://nginx.org/ COMMENT= Lightweight HTTP server and mail proxy server LICENSE= 2-clause-bsd diff --git a/www/nginx/distinfo b/www/nginx/distinfo index cee91ad19da..68a4f3d31f2 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.13 2011/06/10 10:36:18 joerg Exp $ +$NetBSD: distinfo,v 1.14 2011/12/04 14:41:01 shattered Exp $ -SHA1 (nginx-1.0.4.tar.gz) = 0496b7377e583116497f18453003cba3269417e9 -RMD160 (nginx-1.0.4.tar.gz) = 378b303ed91dc76cda12f2984b26c3aae9337599 -Size (nginx-1.0.4.tar.gz) = 661444 bytes -SHA1 (patch-aa) = 1ef1a800f0d7dffe182b8a74f115105ded205f8e +SHA1 (nginx-1.0.10.tar.gz) = 01304d44048aa57944e935dda8523afd5e5d1e23 +RMD160 (nginx-1.0.10.tar.gz) = 875082ff6e9197cc26adf4ee51eeda34b9531e29 +Size (nginx-1.0.10.tar.gz) = 686011 bytes +SHA1 (patch-aa) = adf433d1b56a88c6c2ed09c4bd54fdb1a336582f SHA1 (patch-ab) = 6f20ef8ac9a042faf7e22770de7c16b351cb1191 diff --git a/www/nginx/patches/patch-aa b/www/nginx/patches/patch-aa index eaad19f1741..04a273677a0 100644 --- a/www/nginx/patches/patch-aa +++ b/www/nginx/patches/patch-aa @@ -1,9 +1,11 @@ -$NetBSD: patch-aa,v 1.2 2010/01/23 16:32:11 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2011/12/04 14:41:01 shattered Exp $ This patch provides config file adapted to pkgsrc settings. ---- conf/nginx.conf.orig 2008-02-28 22:44:16.000000000 +0200 + +--- conf/nginx.conf.orig 2011-06-27 15:47:51.000000000 +0000 +++ conf/nginx.conf -@@ -2,12 +2,13 @@ +@@ -1,28 +1,29 @@ + -#user nobody; +user %%NGINX_USER%% %%NGINX_GROUP%%; worker_processes 1; @@ -23,7 +25,7 @@ This patch provides config file adapted to pkgsrc settings. + # After increasing this value You probably should increase limit + # of file descriptors (for example in start_precmd in startup script) worker_connections 1024; -@@ -15,14 +14,14 @@ + } http { @@ -34,13 +36,13 @@ This patch provides config file adapted to pkgsrc settings. #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' # '$status $body_bytes_sent "$http_referer" ' # '"$http_user_agent" "$http_x_forwarded_for"'; - + - #access_log logs/access.log main; + #access_log %%NGINX_LOGDIR%%/access.log main; sendfile on; #tcp_nopush on; -@@ -38,10 +37,10 @@ +@@ -38,10 +39,10 @@ http { #charset koi8-r; @@ -53,7 +55,7 @@ This patch provides config file adapted to pkgsrc settings. index index.html index.htm; } -@@ -51,7 +50,7 @@ +@@ -51,7 +52,7 @@ http { # error_page 500 502 503 504 /50x.html; location = /50x.html { @@ -62,7 +64,7 @@ This patch provides config file adapted to pkgsrc settings. } # proxy the PHP scripts to Apache listening on 127.0.0.1:80 -@@ -67,7 +66,7 @@ +@@ -67,7 +68,7 @@ http { # fastcgi_pass 127.0.0.1:9000; # fastcgi_index index.php; # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; @@ -71,7 +73,7 @@ This patch provides config file adapted to pkgsrc settings. #} # deny access to .htaccess files, if Apache's document root -@@ -87,7 +86,7 @@ +@@ -87,7 +88,7 @@ http { # server_name somename alias another.alias; # location / { @@ -80,7 +82,7 @@ This patch provides config file adapted to pkgsrc settings. # index index.html index.htm; # } #} -@@ -110,7 +109,7 @@ +@@ -110,7 +111,7 @@ http { # ssl_prefer_server_ciphers on; # location / { |