diff options
| -rw-r--r-- | www/nginx-devel/Makefile | 4 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 12 | ||||
| -rw-r--r-- | www/nginx-devel/patches/patch-auto_install (renamed from www/nginx-devel/patches/patch-ab) | 8 | ||||
| -rw-r--r-- | www/nginx-devel/patches/patch-conf_nginx.conf (renamed from www/nginx-devel/patches/patch-aa) | 26 |
4 files changed, 23 insertions, 27 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 0afd2499323..2fccbb5951c 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2013/08/18 08:11:04 imil Exp $ +# $NetBSD: Makefile,v 1.8 2013/12/05 15:04:05 imil Exp $ -DISTNAME= nginx-1.5.3 +DISTNAME= nginx-1.5.7 MAINTAINER= imil@NetBSD.org .include "../../www/nginx/Makefile.common" diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index bd9dd07412c..ab57ee57eed 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,16 +1,16 @@ -$NetBSD: distinfo,v 1.5 2013/08/18 08:11:04 imil Exp $ +$NetBSD: distinfo,v 1.6 2013/12/05 15:04:05 imil Exp $ SHA1 (naxsi-core-0.51-1.tgz) = e6b97c599955d1b7dc3559c5e391a551174abe91 RMD160 (naxsi-core-0.51-1.tgz) = ce29bf13805fb512f2099c2599fe705f17bf3c2d Size (naxsi-core-0.51-1.tgz) = 53908 bytes -SHA1 (nginx-1.5.3.tar.gz) = 88f4548e46c25d32f08681c0aba39b86b84ec3a3 -RMD160 (nginx-1.5.3.tar.gz) = fb57b7609d8e1de06e6dc1376bf4d239c06daa37 -Size (nginx-1.5.3.tar.gz) = 769755 bytes +SHA1 (nginx-1.5.7.tar.gz) = 4dd04c73c3081277fe9c98c4a386c8baf956f5ca +RMD160 (nginx-1.5.7.tar.gz) = a74277133f5028b4c63acc53de84c1439b14df0a +Size (nginx-1.5.7.tar.gz) = 779985 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 SHA1 (nginx_upload_module-2.2.0.tar.gz) = 93d6e83e613a0ce2ed057a434b344fa1b6609b47 RMD160 (nginx_upload_module-2.2.0.tar.gz) = 5734af837be3fe8ec444a7e5e7f6707118594098 Size (nginx_upload_module-2.2.0.tar.gz) = 25796 bytes -SHA1 (patch-aa) = adf433d1b56a88c6c2ed09c4bd54fdb1a336582f -SHA1 (patch-ab) = 6f20ef8ac9a042faf7e22770de7c16b351cb1191 +SHA1 (patch-auto_install) = 723e2ae222146775ae66aed7815bf3f911dd1cd7 +SHA1 (patch-conf_nginx.conf) = ee9fbc3838cc006f6e1cddddadf6603f4941d171 diff --git a/www/nginx-devel/patches/patch-ab b/www/nginx-devel/patches/patch-auto_install index 0c37fdfc799..01566c9a51c 100644 --- a/www/nginx-devel/patches/patch-ab +++ b/www/nginx-devel/patches/patch-auto_install @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.1 2013/02/22 17:06:54 imil Exp $ +$NetBSD: patch-auto_install,v 1.1 2013/12/05 15:04:06 imil Exp $ -Workaround for /bin/sh bug on NetBSD +Do not create PID directory. ---- auto/install.orig 2010-06-15 19:50:33.000000000 +0000 +--- auto/install.orig 2013-11-19 10:03:47.000000000 +0000 +++ auto/install -@@ -114,9 +114,6 @@ install: $NGX_OBJS${ngx_dirsep}nginx${ng +@@ -141,9 +141,6 @@ install: $NGX_OBJS${ngx_dirsep}nginx${ng || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH' cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' diff --git a/www/nginx-devel/patches/patch-aa b/www/nginx-devel/patches/patch-conf_nginx.conf index b19839affcc..f51b9ee0d75 100644 --- a/www/nginx-devel/patches/patch-aa +++ b/www/nginx-devel/patches/patch-conf_nginx.conf @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.1 2013/02/22 17:06:54 imil Exp $ +$NetBSD: patch-conf_nginx.conf,v 1.1 2013/12/05 15:04:06 imil Exp $ This patch provides config file adapted to pkgsrc settings. ---- conf/nginx.conf.orig 2011-06-27 15:47:51.000000000 +0000 +--- conf/nginx.conf.orig 2013-11-19 10:03:47.000000000 +0000 +++ conf/nginx.conf -@@ -1,28 +1,29 @@ +@@ -1,28 +1,23 @@ -#user nobody; +user %%NGINX_USER%% %%NGINX_GROUP%%; @@ -15,12 +15,8 @@ This patch provides config file adapted to pkgsrc settings. -#error_log logs/error.log info; - -#pid logs/nginx.pid; -+#error_log %%NGINX_LOGDIR%%/error.log; -+#error_log %%NGINX_LOGDIR%%/error.log notice; -+#error_log %%NGINX_LOGDIR%%/error.log info; - -+#pid %%NGINX_PIDDIR%%/nginx.pid; - +- +- events { + # After increasing this value You probably should increase limit + # of file descriptors (for example in start_precmd in startup script) @@ -42,7 +38,7 @@ This patch provides config file adapted to pkgsrc settings. sendfile on; #tcp_nopush on; -@@ -38,10 +39,10 @@ http { +@@ -38,10 +33,10 @@ http { #charset koi8-r; @@ -55,7 +51,7 @@ This patch provides config file adapted to pkgsrc settings. index index.html index.htm; } -@@ -51,7 +52,7 @@ http { +@@ -51,7 +46,7 @@ http { # error_page 500 502 503 504 /50x.html; location = /50x.html { @@ -64,7 +60,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 +68,7 @@ http { +@@ -67,7 +62,7 @@ http { # fastcgi_pass 127.0.0.1:9000; # fastcgi_index index.php; # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; @@ -73,7 +69,7 @@ This patch provides config file adapted to pkgsrc settings. #} # deny access to .htaccess files, if Apache's document root -@@ -87,7 +88,7 @@ http { +@@ -87,7 +82,7 @@ http { # server_name somename alias another.alias; # location / { @@ -82,8 +78,8 @@ This patch provides config file adapted to pkgsrc settings. # index index.html index.htm; # } #} -@@ -110,7 +111,7 @@ http { - # ssl_prefer_server_ciphers on; +@@ -109,7 +104,7 @@ http { + # ssl_prefer_server_ciphers on; # location / { - # root html; |