Mon Feb 8 14:25:44 2010 UTC ()
nginx-0.8.33:
- fix issues with Keep-Alive in various clients
- fix issue with internal redirects between proxy/fastcgi locations
- fix a bug with discarding request bodies

Add optional uwsgi backend.


(joerg)
diff -r1.7 -r1.8 pkgsrc/www/nginx/Makefile
diff -r1.4 -r1.5 pkgsrc/www/nginx/distinfo
diff -r1.3 -r1.4 pkgsrc/www/nginx/options.mk
cvs diff -r1.7 -r1.8 pkgsrc/www/nginx/Makefile (expand / switch to unified diff)

--- pkgsrc/www/nginx/Makefile 2010/01/23 16:32:11 1.7
+++ pkgsrc/www/nginx/Makefile 2010/02/08 14:25:44 1.8
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.7 2010/01/23 16:32:11 joerg Exp $ 1# $NetBSD: Makefile,v 1.8 2010/02/08 14:25:44 joerg Exp $
2 2
3DISTNAME= nginx-0.8.32 3DISTNAME= nginx-0.8.33
 4DISTFILES= ${DEFAULT_DISTFILES}
4CATEGORIES= www 5CATEGORIES= www
5MASTER_SITES= http://sysoev.ru/nginx/ 6MASTER_SITES= http://sysoev.ru/nginx/
6 7
7MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
8HOMEPAGE= http://nginx.net/ 9HOMEPAGE= http://nginx.net/
9COMMENT= Lightweight HTTP server and mail proxy server 10COMMENT= Lightweight HTTP server and mail proxy server
10LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
11 12
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
15 16
16NGINX_USER?= nginx 17NGINX_USER?= nginx
cvs diff -r1.4 -r1.5 pkgsrc/www/nginx/distinfo (expand / switch to unified diff)

--- pkgsrc/www/nginx/distinfo 2010/01/23 16:32:11 1.4
+++ pkgsrc/www/nginx/distinfo 2010/02/08 14:25:44 1.5
@@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
1$NetBSD: distinfo,v 1.4 2010/01/23 16:32:11 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2010/02/08 14:25:44 joerg Exp $
2 2
3SHA1 (nginx-0.8.32.tar.gz) = 03c8177ec4943a9f7c33dbd20b1ef5d8dd5a0f9b 3SHA1 (nginx-0.8.33.tar.gz) = bf3e3ab90609a62e8896f49895c3f4b4fa308270
4RMD160 (nginx-0.8.32.tar.gz) = 4abacc587bf5fb400933d48bbbd7e92283de8683 4RMD160 (nginx-0.8.33.tar.gz) = 3ab3ea6d07fcac74465dbf40af824fccfd7f5fdd
5Size (nginx-0.8.32.tar.gz) = 619865 bytes 5Size (nginx-0.8.33.tar.gz) = 620448 bytes
 6SHA1 (uwsgi-0.9.3.tar.gz) = da8bb329e6deb9eae095889be95c81b50e533a3e
 7RMD160 (uwsgi-0.9.3.tar.gz) = 5b5e1aca59f3d4655b31d84a04e8ffe496bbe301
 8Size (uwsgi-0.9.3.tar.gz) = 52986 bytes
6SHA1 (patch-aa) = 1ef1a800f0d7dffe182b8a74f115105ded205f8e 9SHA1 (patch-aa) = 1ef1a800f0d7dffe182b8a74f115105ded205f8e
cvs diff -r1.3 -r1.4 pkgsrc/www/nginx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nginx/options.mk 2010/01/23 23:24:39 1.3
+++ pkgsrc/www/nginx/options.mk 2010/02/08 14:25:44 1.4
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: options.mk,v 1.3 2010/01/23 23:24:39 joerg Exp $ 1# $NetBSD: options.mk,v 1.4 2010/02/08 14:25:44 joerg Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx 3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
4PKG_SUPPORTED_OPTIONS= ssl pcre dav flv sub gtools mail-proxy memcache \ 4PKG_SUPPORTED_OPTIONS= ssl pcre dav flv sub gtools mail-proxy memcache \
5 realip inet6 5 realip inet6 uwsgi
6PKG_SUGGESTED_OPTIONS= ssl pcre 6PKG_SUGGESTED_OPTIONS= ssl pcre
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10.if !empty(PKG_OPTIONS:Mssl) 10.if !empty(PKG_OPTIONS:Mssl)
11.include "../../security/openssl/buildlink3.mk" 11.include "../../security/openssl/buildlink3.mk"
12CONFIGURE_ARGS+= --with-mail_ssl_module 12CONFIGURE_ARGS+= --with-mail_ssl_module
13CONFIGURE_ARGS+= --with-http_ssl_module 13CONFIGURE_ARGS+= --with-http_ssl_module
14.endif 14.endif
15 15
16.if !empty(PKG_OPTIONS:Mpcre) 16.if !empty(PKG_OPTIONS:Mpcre)
17.include "../../devel/pcre/buildlink3.mk" 17.include "../../devel/pcre/buildlink3.mk"
18.else 18.else
@@ -43,13 +43,20 @@ CONFIGURE_ARGS+= --with-mail @@ -43,13 +43,20 @@ CONFIGURE_ARGS+= --with-mail
43.if empty(PKG_OPTIONS:Mmemcache) 43.if empty(PKG_OPTIONS:Mmemcache)
44CONFIGURE_ARGS+= --without-http_memcached_module 44CONFIGURE_ARGS+= --without-http_memcached_module
45.endif 45.endif
46 46
47.if !empty(PKG_OPTIONS:Mrealip) 47.if !empty(PKG_OPTIONS:Mrealip)
48CONFIGURE_ARGS+= --with-http_realip_module 48CONFIGURE_ARGS+= --with-http_realip_module
49.endif 49.endif
50 50
51.if !empty(PKG_OPTIONS:Minet6) 51.if !empty(PKG_OPTIONS:Minet6)
52CONFIGURE_ARGS+= --with-ipv6 52CONFIGURE_ARGS+= --with-ipv6
53.else 53.else
54CONFIGURE_ARGS+= --without-ipv6 54CONFIGURE_ARGS+= --without-ipv6
55.endif 55.endif
 56
 57.if !empty(PKG_OPTIONS:Muwsgi)
 58UWSGI= uwsgi-0.9.3
 59DISTFILES+= ${UWSGI}.tar.gz
 60SITES.${UWSGI}.tar.gz= http://projects.unbit.it/downloads/
 61CONFIGURE_ARGS+= --add-module=../${UWSGI}/nginx
 62.endif