MAINTAINER UPDATE: www/nginx - 0.6.34

2008-12-05 Thread Darrin Chandler 
This updates nginx to the latest stable version 0.6.34 and removed a
configure workaround (fixed upstream).

In production use on amd64 and lightly tested in sparc64. Additional
testing appreciated, especially 32-bit.

Comments?

Ok?


Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile13 May 2008 18:46:07 -  1.8
+++ Makefile6 Dec 2008 02:59:45 -
@@ -2,7 +2,7 @@
 
 COMMENT=   robust and small HTTP server and mail proxy server
 
-DISTNAME=  nginx-0.6.32
+DISTNAME=  nginx-0.6.34
 CATEGORIES=www
 
 HOMEPAGE=  http://nginx.net/
@@ -41,9 +41,6 @@ CONFIGURE_ARGS=   --prefix=${SYSCONFDIR}/
--with-http_stub_status_module \
--with-mail \
--with-mail_ssl_module
-
-# Get rid of '#include malloc.h' which caused many warnings
-CONFIGURE_ARGS+=   --with-cc-opt=-DNGX_HAVE_MALLOC_H=0
 
 NO_REGRESS=Yes
 ALL_TARGET=
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo13 May 2008 18:46:07 -  1.6
+++ distinfo6 Dec 2008 02:59:45 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.6.31.tar.gz) = gkvMJbvVtjbxgiN7aSJ70g==
-RMD160 (nginx-0.6.31.tar.gz) = edoi6rpBXrnSTdM88r4LGZm7Ebw=
-SHA1 (nginx-0.6.31.tar.gz) = wsResq41LczoL6mXqM/HbM5knBo=
-SHA256 (nginx-0.6.31.tar.gz) = 5okIcF38H7FmUG7EQSkce607bdzdt2CxZpMb/bW1gqc=
-SIZE (nginx-0.6.31.tar.gz) = 520344
+MD5 (nginx-0.6.34.tar.gz) = g3vPuIvca278TmOXnJx7QQ==
+RMD160 (nginx-0.6.34.tar.gz) = hCTxS7znIxV3wiIa5UGkn4osakE=
+SHA1 (nginx-0.6.34.tar.gz) = nwjqCIQSPrDwF7MOnwZI1GVi+N0=
+SHA256 (nginx-0.6.34.tar.gz) = uYtv8N/padUKCdlyAm9/gaKM7Xyiyvj5NJmg3SPkMSU=
+SIZE (nginx-0.6.34.tar.gz) = 524667

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation


pgpRZWGdQGQWM.pgp
Description: PGP signature

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Mike Erdely 
On Sat, Dec 29, 2007 at 05:19:52PM -0700, Darrin Chandler wrote:
 This brings nginx up to 0.5.34, the latest stable version. Change log is
 at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
 some new features.
 
 I have also made this a flavored port, with only the most common
 features enabled by default (http server  proxy, mod_ssl).

I'm not sure about the flavors.  To me if feels like you're adding
complexity where none is needed.  nginx is not a large binary with all
options compiled in.  The options do not include a large number of
dependencies which one might want to leave out.

Anyone else with opinions on this?

 Tested by me on i386, amd64, sparc64.
 
 Diff attached. Tarball available at
 http://phxbsd.com/OpenBSD/nginx.tar.gz
 
 Please test and commit. Feedback appreciated.

-ME

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Bernd Ahlers 
Mike Erdely [Sun, Dec 30, 2007 at 12:40:47PM -0500] wrote:
On Sat, Dec 29, 2007 at 05:19:52PM -0700, Darrin Chandler wrote:
 This brings nginx up to 0.5.34, the latest stable version. Change log is
 at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
 some new features.
 
 I have also made this a flavored port, with only the most common
 features enabled by default (http server  proxy, mod_ssl).

I'm not sure about the flavors.  To me if feels like you're adding
complexity where none is needed.  nginx is not a large binary with all
options compiled in.

Hmm? It is a large binary, no?

The options do not include a large number of
dependencies which one might want to leave out.

Anyone else with opinions on this?

I don't like adding flavors to nginx. What's the gain?

Bernd

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Okan Demirmen 
On Sun 2007.12.30 at 12:40 -0500, Mike Erdely wrote:
 On Sat, Dec 29, 2007 at 05:19:52PM -0700, Darrin Chandler wrote:
  This brings nginx up to 0.5.34, the latest stable version. Change log is
  at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
  some new features.
  
  I have also made this a flavored port, with only the most common
  features enabled by default (http server  proxy, mod_ssl).
 
 I'm not sure about the flavors.  To me if feels like you're adding
 complexity where none is needed.  nginx is not a large binary with all
 options compiled in.  The options do not include a large number of
 dependencies which one might want to leave out.
 
 Anyone else with opinions on this?

yes - i agree with ME - the binary isn't that large, and the dependency
tree doesn't grow or shrink with each flavor; it's not really worth it,
is it?

  Tested by me on i386, amd64, sparc64.
  
  Diff attached. Tarball available at
  http://phxbsd.com/OpenBSD/nginx.tar.gz
  
  Please test and commit. Feedback appreciated.
 
 -ME

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Joachim Schipper 
On Sun, Dec 30, 2007 at 12:40:47PM -0500, Mike Erdely wrote:
 On Sat, Dec 29, 2007 at 05:19:52PM -0700, Darrin Chandler wrote:
  This brings nginx up to 0.5.34, the latest stable version. Change log is
  at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
  some new features.
  
  I have also made this a flavored port, with only the most common
  features enabled by default (http server  proxy, mod_ssl).
 
 I'm not sure about the flavors.  To me if feels like you're adding
 complexity where none is needed.  nginx is not a large binary with all
 options compiled in.  The options do not include a large number of
 dependencies which one might want to leave out.
 
 Anyone else with opinions on this?

Unless there is a good reason to leave out some code (for instance, it's
very new and of unknown quality, and hence may have security issues), I
see no real point.

I *am* not really qualified to comment, of course.

Joachim

-- 
TFMotD: nologin (8) - politely refuse a login

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Darrin Chandler 
On Sun, Dec 30, 2007 at 12:40:47PM -0500, Mike Erdely wrote:
 On Sat, Dec 29, 2007 at 05:19:52PM -0700, Darrin Chandler wrote:
  This brings nginx up to 0.5.34, the latest stable version. Change log is
  at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
  some new features.
  
  I have also made this a flavored port, with only the most common
  features enabled by default (http server  proxy, mod_ssl).
 
 I'm not sure about the flavors.  To me if feels like you're adding
 complexity where none is needed.  nginx is not a large binary with all
 options compiled in.  The options do not include a large number of
 dependencies which one might want to leave out.
 
 Anyone else with opinions on this?
 
  Tested by me on i386, amd64, sparc64.
  
  Diff attached. Tarball available at
  http://phxbsd.com/OpenBSD/nginx.tar.gz
  
  Please test and commit. Feedback appreciated.

Thanks Mike, Bernd, Okan, and you too Joachim :)

Unflavored diff attached.

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile8 Oct 2007 19:23:43 -   1.3
+++ Makefile29 Dec 2007 22:56:50 -
@@ -2,7 +2,7 @@
 
 COMMENT=   robust and small HTTP server and IMAP/POP3 proxy server
 
-DISTNAME=  nginx-0.5.32
+DISTNAME=  nginx-0.5.34
 PKGNAME=   ${DISTNAME}
 CATEGORIES=www
 
@@ -28,11 +28,17 @@ SUBST_VARS+=NGINX_DIR
 
 CONFIGURE_STYLE=   simple
 
+FLAVORS=   mail_proxy mod_status mod_perl no_http_proxy no_ssl
+FLAVOR?=
+
 # Some conf files are relative to --prefix and
 # have no --xxx-path of their own. Set this so
 # all runtime configs live in the same place.
 CONFIGURE_ARGS+=   --prefix=${SYSCONFDIR}/nginx
 
+# Get rid of '#include malloc.h' which caused many warnings
+CONFIGURE_ARGS+=   --with-cc-opt=-DNGX_HAVE_MALLOC_H=0
+
 CONFIGURE_ARGS+=   --conf-path=${SYSCONFDIR}/nginx/nginx.conf \
--sbin-path=${PREFIX}/sbin/nginx \
--pid-path=/var/run/nginx.pid \
@@ -43,13 +49,26 @@ CONFIGURE_ARGS+=--conf-path=${SYSCONFDI
--http-log-path=/var/log/nginx/access.log \
--error-log-path=/var/log/nginx/error.log \
--user=_nginx \
-   --group=_nginx \
-   --with-cc-opt=-I ${LOCALBASE}/include \
-   --with-ld-opt=-L ${LOCALBASE}/lib \
-   --with-http_ssl_module \
-   --with-http_stub_status_module \
-   --with-imap \
-   --with-imap_ssl_module
+   --group=_nginx
+
+.if ${FLAVOR:L:Mno_http_proxy}
+CONFIGURE_ARGS+=   --without-http_proxy_module
+.endif
+.if ${FLAVOR:L:Mmail_proxy}
+CONFIGURE_ARGS+=   --with-mail
+.endif
+.if !${FLAVOR:L:Mno_ssl}
+CONFIGURE_ARGS+=   --with-http_ssl_module
+.endif
+.if ${FLAVOR:L:Mmail_proxy}  !${FLAVOR:L:Mno_ssl}
+CONFIGURE_ARGS+=   --with-mail_ssl_module
+.endif
+.if ${FLAVOR:L:Mmod_perl}
+CONFIGURE_ARGS+=   --with-http_perl_module
+.endif
+.if ${FLAVOR:L:Mmod_status}
+CONFIGURE_ARGS+=   --with-http_stub_status_module
+.endif
 
 NO_REGRESS=Yes
 ALL_TARGET=
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo8 Oct 2007 19:23:43 -   1.2
+++ distinfo29 Dec 2007 22:56:50 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.5.32.tar.gz) = AIgmm4pZoUawupye4phTuw==
-RMD160 (nginx-0.5.32.tar.gz) = ZxF7YuJr8P8oQwQoZ630OI+k0aE=
-SHA1 (nginx-0.5.32.tar.gz) = PLS8CXZ15cGpDlm/UfSiS5habfo=
-SHA256 (nginx-0.5.32.tar.gz) = jLlcxhuv7HsP4+kfBvLnruexLxKmr4IA1gA4+NXlLKw=
-SIZE (nginx-0.5.32.tar.gz) = 479982
+MD5 (nginx-0.5.34.tar.gz) = j30+/NfKrx8G5Nld+urCOA==
+RMD160 (nginx-0.5.34.tar.gz) = oFdlHrkGWx5JHOOMc7yeSJfJgsc=
+SHA1 (nginx-0.5.34.tar.gz) = 929ssawKMW8glYv33GoDcj+1jt8=
+SHA256 (nginx-0.5.34.tar.gz) = ZOJVu3avoczitluisztNHP8DRlT/IPZLTChdFD8Fmjo=
+SIZE (nginx-0.5.34.tar.gz) = 487815

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Darrin Chandler 
 Unflavored diff attached.

 +FLAVORS= mail_proxy mod_status mod_perl no_http_proxy no_ssl
 +FLAVOR?=

Not sure how THAT happened! New diff coming soon, when I'm SURE.

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Darrin Chandler 
On Sun, Dec 30, 2007 at 02:42:12PM -0700, Darrin Chandler wrote:
  Unflavored diff attached.
 
  +FLAVORS=   mail_proxy mod_status mod_perl no_http_proxy no_ssl
  +FLAVOR?=
 
 Not sure how THAT happened! New diff coming soon, when I'm SURE.

Minor copying screwup. Here's the diff...

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile8 Oct 2007 19:23:43 -   1.3
+++ Makefile30 Dec 2007 21:47:06 -
@@ -2,7 +2,7 @@
 
 COMMENT=   robust and small HTTP server and IMAP/POP3 proxy server
 
-DISTNAME=  nginx-0.5.32
+DISTNAME=  nginx-0.5.34
 PKGNAME=   ${DISTNAME}
 CATEGORIES=www
 
@@ -33,6 +33,9 @@ CONFIGURE_STYLE=  simple
 # all runtime configs live in the same place.
 CONFIGURE_ARGS+=   --prefix=${SYSCONFDIR}/nginx
 
+# Get rid of '#include malloc.h' which caused many warnings
+CONFIGURE_ARGS+=   --with-cc-opt=-DNGX_HAVE_MALLOC_H=0
+
 CONFIGURE_ARGS+=   --conf-path=${SYSCONFDIR}/nginx/nginx.conf \
--sbin-path=${PREFIX}/sbin/nginx \
--pid-path=/var/run/nginx.pid \
@@ -44,12 +47,10 @@ CONFIGURE_ARGS+=--conf-path=${SYSCONFDI
--error-log-path=/var/log/nginx/error.log \
--user=_nginx \
--group=_nginx \
-   --with-cc-opt=-I ${LOCALBASE}/include \
-   --with-ld-opt=-L ${LOCALBASE}/lib \
--with-http_ssl_module \
--with-http_stub_status_module \
-   --with-imap \
-   --with-imap_ssl_module
+   --with-mail \
+   --with-mail_ssl_module
 
 NO_REGRESS=Yes
 ALL_TARGET=
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo8 Oct 2007 19:23:43 -   1.2
+++ distinfo30 Dec 2007 21:47:06 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.5.32.tar.gz) = AIgmm4pZoUawupye4phTuw==
-RMD160 (nginx-0.5.32.tar.gz) = ZxF7YuJr8P8oQwQoZ630OI+k0aE=
-SHA1 (nginx-0.5.32.tar.gz) = PLS8CXZ15cGpDlm/UfSiS5habfo=
-SHA256 (nginx-0.5.32.tar.gz) = jLlcxhuv7HsP4+kfBvLnruexLxKmr4IA1gA4+NXlLKw=
-SIZE (nginx-0.5.32.tar.gz) = 479982
+MD5 (nginx-0.5.34.tar.gz) = j30+/NfKrx8G5Nld+urCOA==
+RMD160 (nginx-0.5.34.tar.gz) = oFdlHrkGWx5JHOOMc7yeSJfJgsc=
+SHA1 (nginx-0.5.34.tar.gz) = 929ssawKMW8glYv33GoDcj+1jt8=
+SHA256 (nginx-0.5.34.tar.gz) = ZOJVu3avoczitluisztNHP8DRlT/IPZLTChdFD8Fmjo=
+SIZE (nginx-0.5.34.tar.gz) = 487815

MAINTAINER UPDATE: www/nginx

2007-12-29 Thread Darrin Chandler 
This brings nginx up to 0.5.34, the latest stable version. Change log is
at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
some new features.

I have also made this a flavored port, with only the most common
features enabled by default (http server  proxy, mod_ssl).

Tested by me on i386, amd64, sparc64.

Diff attached. Tarball available at
http://phxbsd.com/OpenBSD/nginx.tar.gz

Please test and commit. Feedback appreciated.

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile8 Oct 2007 19:23:43 -   1.3
+++ Makefile29 Dec 2007 22:56:50 -
@@ -2,7 +2,7 @@
 
 COMMENT=   robust and small HTTP server and IMAP/POP3 proxy server
 
-DISTNAME=  nginx-0.5.32
+DISTNAME=  nginx-0.5.34
 PKGNAME=   ${DISTNAME}
 CATEGORIES=www
 
@@ -28,11 +28,17 @@ SUBST_VARS+=NGINX_DIR
 
 CONFIGURE_STYLE=   simple
 
+FLAVORS=   mail_proxy mod_status mod_perl no_http_proxy no_ssl
+FLAVOR?=
+
 # Some conf files are relative to --prefix and
 # have no --xxx-path of their own. Set this so
 # all runtime configs live in the same place.
 CONFIGURE_ARGS+=   --prefix=${SYSCONFDIR}/nginx
 
+# Get rid of '#include malloc.h' which caused many warnings
+CONFIGURE_ARGS+=   --with-cc-opt=-DNGX_HAVE_MALLOC_H=0
+
 CONFIGURE_ARGS+=   --conf-path=${SYSCONFDIR}/nginx/nginx.conf \
--sbin-path=${PREFIX}/sbin/nginx \
--pid-path=/var/run/nginx.pid \
@@ -43,13 +49,26 @@ CONFIGURE_ARGS+=--conf-path=${SYSCONFDI
--http-log-path=/var/log/nginx/access.log \
--error-log-path=/var/log/nginx/error.log \
--user=_nginx \
-   --group=_nginx \
-   --with-cc-opt=-I ${LOCALBASE}/include \
-   --with-ld-opt=-L ${LOCALBASE}/lib \
-   --with-http_ssl_module \
-   --with-http_stub_status_module \
-   --with-imap \
-   --with-imap_ssl_module
+   --group=_nginx
+
+.if ${FLAVOR:L:Mno_http_proxy}
+CONFIGURE_ARGS+=   --without-http_proxy_module
+.endif
+.if ${FLAVOR:L:Mmail_proxy}
+CONFIGURE_ARGS+=   --with-mail
+.endif
+.if !${FLAVOR:L:Mno_ssl}
+CONFIGURE_ARGS+=   --with-http_ssl_module
+.endif
+.if ${FLAVOR:L:Mmail_proxy}  !${FLAVOR:L:Mno_ssl}
+CONFIGURE_ARGS+=   --with-mail_ssl_module
+.endif
+.if ${FLAVOR:L:Mmod_perl}
+CONFIGURE_ARGS+=   --with-http_perl_module
+.endif
+.if ${FLAVOR:L:Mmod_status}
+CONFIGURE_ARGS+=   --with-http_stub_status_module
+.endif
 
 NO_REGRESS=Yes
 ALL_TARGET=
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo8 Oct 2007 19:23:43 -   1.2
+++ distinfo29 Dec 2007 22:56:50 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.5.32.tar.gz) = AIgmm4pZoUawupye4phTuw==
-RMD160 (nginx-0.5.32.tar.gz) = ZxF7YuJr8P8oQwQoZ630OI+k0aE=
-SHA1 (nginx-0.5.32.tar.gz) = PLS8CXZ15cGpDlm/UfSiS5habfo=
-SHA256 (nginx-0.5.32.tar.gz) = jLlcxhuv7HsP4+kfBvLnruexLxKmr4IA1gA4+NXlLKw=
-SIZE (nginx-0.5.32.tar.gz) = 479982
+MD5 (nginx-0.5.34.tar.gz) = j30+/NfKrx8G5Nld+urCOA==
+RMD160 (nginx-0.5.34.tar.gz) = oFdlHrkGWx5JHOOMc7yeSJfJgsc=
+SHA1 (nginx-0.5.34.tar.gz) = 929ssawKMW8glYv33GoDcj+1jt8=
+SHA256 (nginx-0.5.34.tar.gz) = ZOJVu3avoczitluisztNHP8DRlT/IPZLTChdFD8Fmjo=
+SIZE (nginx-0.5.34.tar.gz) = 487815

MAINTAINER UPDATE: www/nginx

2007-10-07 Thread Darrin Chandler 
Update from nginx-0.5.31p0 to nginx-0.5.32. Several bugfixes and a few
features (changelog at http://nginx.net/CHANGES-0.5).

Tested on i386.

Please commit. Thanks!

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile22 Sep 2007 21:06:05 -  1.2
+++ Makefile7 Oct 2007 20:19:40 -
@@ -2,8 +2,8 @@
 
 COMMENT=   robust and small HTTP server and IMAP/POP3 proxy server
 
-DISTNAME=  nginx-0.5.31
-PKGNAME=   ${DISTNAME}p0
+DISTNAME=  nginx-0.5.32
+PKGNAME=   ${DISTNAME}
 CATEGORIES=www
 
 HOMEPAGE=  http://nginx.net/
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo4 Sep 2007 21:58:26 -   1.1.1.1
+++ distinfo7 Oct 2007 20:19:40 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.5.31.tar.gz) = d84ef8e624b8953faf9cee2b5da535c1
-RMD160 (nginx-0.5.31.tar.gz) = 02153a490c2b58dccf02d120da6c3fd7b26c5a61
-SHA1 (nginx-0.5.31.tar.gz) = c58076b3e1f3f4cb59afe5143fc0a893d3a4f0ba
-SHA256 (nginx-0.5.31.tar.gz) = 
34cae92545e10c6b84708d058a4981f31b688ea5309f24c394b7422ae5d71042
-SIZE (nginx-0.5.31.tar.gz) = 475892
+MD5 (nginx-0.5.32.tar.gz) = AIgmm4pZoUawupye4phTuw==
+RMD160 (nginx-0.5.32.tar.gz) = ZxF7YuJr8P8oQwQoZ630OI+k0aE=
+SHA1 (nginx-0.5.32.tar.gz) = PLS8CXZ15cGpDlm/UfSiS5habfo=
+SHA256 (nginx-0.5.32.tar.gz) = jLlcxhuv7HsP4+kfBvLnruexLxKmr4IA1gA4+NXlLKw=
+SIZE (nginx-0.5.32.tar.gz) = 479982
Index: patches/patch-src_http_modules_ngx_http_autoindex_module_c
===
RCS file: patches/patch-src_http_modules_ngx_http_autoindex_module_c
diff -N patches/patch-src_http_modules_ngx_http_autoindex_module_c
--- patches/patch-src_http_modules_ngx_http_autoindex_module_c  22 Sep 2007 
21:06:06 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_http_modules_ngx_http_autoindex_module_c,v 1.1 2007/09/22 
21:06:06 sthen Exp $
 src/http/modules/ngx_http_autoindex_module.c.orig  Sat Sep 22 21:51:41 2007
-+++ src/http/modules/ngx_http_autoindex_module.c   Sat Sep 22 21:53:41 2007
-@@ -236,6 +236,11 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
- rc = ngx_http_send_header(r);
- 
- if (rc == NGX_ERROR || rc  NGX_OK || r-header_only) {
-+if (ngx_close_dir(dir) == NGX_ERROR) {
-+ngx_log_error(NGX_LOG_ALERT, r-connection-log, ngx_errno,
-+  ngx_close_dir_n  \%V\ failed, path);
-+}
-+
- return rc;
- }
-

MAINTAINER UPDATE: www/nginx - reliability/DoS fix

2007-09-22 Thread Darrin Chandler 
With autoindexing enabled, HEAD requests to an auto indexed directory
leaks the file descriptor, eventually exhausting them. Patch from
nginx author Igor Sysoev, and bump to p0.

Tested by me on i386, sparc64, amd64.

Please review, test, commit.


Index: ports/www/nginx/Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- ports/www/nginx/Makefile4 Sep 2007 21:58:26 -   1.1.1.1
+++ ports/www/nginx/Makefile22 Sep 2007 20:14:48 -
@@ -3,6 +3,7 @@
 COMMENT=   robust and small HTTP server and IMAP/POP3 proxy server
 
 DISTNAME=  nginx-0.5.31
+PKGNAME=   ${DISTNAME}p0
 CATEGORIES=www
 
 HOMEPAGE=  http://nginx.net/
Index: 
ports/www/nginx/patches/patch-src_http_modules_ngx_http_autoindex_module_c
===
RCS file: 
ports/www/nginx/patches/patch-src_http_modules_ngx_http_autoindex_module_c
diff -N 
ports/www/nginx/patches/patch-src_http_modules_ngx_http_autoindex_module_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ ports/www/nginx/patches/patch-src_http_modules_ngx_http_autoindex_module_c  
22 Sep 2007 20:14:48 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- src/http/modules/ngx_http_autoindex_module.c.orig  Mon Nov 13 13:53:37 2006
 src/http/modules/ngx_http_autoindex_module.c   Sat Sep 22 10:58:02 2007
+@@ -236,6 +236,11 @@ ngx_http_autoindex_handler(ngx_http_requ
+ rc = ngx_http_send_header(r);
+ 
+ if (rc == NGX_ERROR || rc  NGX_OK || r-header_only) {
++if (ngx_close_dir(dir) == NGX_ERROR) {
++ngx_log_error(NGX_LOG_ALERT, r-connection-log, ngx_errno,
++  ngx_close_dir_n  \%V\ failed, path);
++}
++
+ return rc;
+ }
+ 

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation


pgpkg0zAxs4Lw.pgp
Description: PGP signature