NetBSD Problem Report #45317

From www@NetBSD.org  Wed Aug 31 10:04:07 2011
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id A47D963C780
	for <gnats-bugs@gnats.NetBSD.org>; Wed, 31 Aug 2011 10:04:07 +0000 (UTC)
Message-Id: <20110831100406.5EF4963C0E2@www.NetBSD.org>
Date: Wed, 31 Aug 2011 10:04:06 +0000 (UTC)
From: osa@FreeBSD.ORG
Reply-To: osa@FreeBSD.ORG
To: gnats-bugs@NetBSD.org
Subject: [PATCH] update www/nginx from 1.0.4 to latest stable version 1.0.6
X-Send-Pr-Version: www-1.0

>Number:         45317
>Category:       pkg
>Synopsis:       [PATCH] update www/nginx from 1.0.4 to latest stable version 1.0.6
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    joerg
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Aug 31 10:05:00 +0000 2011
>Closed-Date:    Thu Dec 10 19:09:33 +0000 2015
>Last-Modified:  Thu Dec 10 19:09:33 +0000 2015
>Originator:     Sergey A. Osokin
>Release:        NetBSD 5.1 i386
>Organization:
n/a
>Environment:
NetBSD nbsd5.FreeBSD.ORG.ru 5.1 NetBSD 5.1 (GENERIC) #0: Sun Nov  7 14:39:56 UTC 2010  builds@b6.netbsd.org:/home/builds/ab/netbsd-5-1-RELEASE/i386/201011061943Z-obj/home/builds/ab/netbsd-5-1-RELEASE/src/sys/arch/i386/compile/GENERIC i386
>Description:
29 Aug 2011 released latest stable version of nginx - 1.0.6.

I don't know how to submit the patch against current (1.0.4) version.
>How-To-Repeat:
% cd /usr/pkgsrc/www/nginx && make -V DISTNAME
nginx-1.0.4
% 
>Fix:
Index: pkgsrc/www/nginx/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/nginx/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- pkgsrc/www/nginx/Makefile   10 Jun 2011 10:36:18 -0000      1.16
+++ pkgsrc/www/nginx/Makefile   31 Aug 2011 08:08:19 -0000
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.16 2011/06/10 10:36:18 joerg Exp $

-DISTNAME=              nginx-1.0.4
+DISTNAME=              nginx-1.0.6
 DISTFILES=             ${DEFAULT_DISTFILES}
 CATEGORIES=            www
-MASTER_SITES=          http://sysoev.ru/nginx/
+MASTER_SITES=          http://nginx.org/download/

 MAINTAINER=            joerg@NetBSD.org
 HOMEPAGE=              http://nginx.net/
@@ -43,8 +43,8 @@
 CONFIGURE_ARGS+=       --error-log-path=${NGINX_LOGDIR}/error.log
 CONFIGURE_ARGS+=       --http-log-path=${NGINX_LOGDIR}/access.log
 CONFIGURE_ARGS+=       --http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp
-CONFIGURE_ARGS+=       --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp
 CONFIGURE_ARGS+=       --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp
+CONFIGURE_ARGS+=       --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp

 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/www/nginx/PLIST
===================================================================

RCS file: /cvsroot/pkgsrc/www/nginx/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkgsrc/www/nginx/PLIST      10 Jun 2011 10:36:18 -0000      1.5
+++ pkgsrc/www/nginx/PLIST      31 Aug 2011 08:08:19 -0000
@@ -7,6 +7,7 @@
 share/examples/nginx/conf/koi-win
 share/examples/nginx/conf/mime.types
 share/examples/nginx/conf/nginx.conf
+${PLIST.scgi}share/examples/nginx/conf/scgi_params
 ${PLIST.uwsgi}share/examples/nginx/conf/uwsgi_params
 share/examples/nginx/conf/win-utf
 share/examples/nginx/html/50x.html
Index: pkgsrc/www/nginx/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/nginx/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- pkgsrc/www/nginx/distinfo   10 Jun 2011 10:36:18 -0000      1.13
+++ pkgsrc/www/nginx/distinfo   31 Aug 2011 08:08:19 -0000
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.13 2011/06/10 10:36:18 joerg 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 (nginx-1.0.6.tar.gz) = e8b61da1aa5e53e0d298ec0159c4fca785dccd70
+RMD160 (nginx-1.0.6.tar.gz) = c0f81d1f15bccea44321c31e3f08e299e5e2e564
+Size (nginx-1.0.6.tar.gz) = 670835 bytes
 SHA1 (patch-aa) = 1ef1a800f0d7dffe182b8a74f115105ded205f8e
 SHA1 (patch-ab) = 6f20ef8ac9a042faf7e22770de7c16b351cb1191

Index: pkgsrc/www/nginx/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/nginx/options.mk,v
retrieving revision 1.10
diff -u -r1.10 options.mk
--- pkgsrc/www/nginx/options.mk 27 Jun 2010 18:00:24 -0000      1.10
+++ pkgsrc/www/nginx/options.mk 31 Aug 2011 08:08:19 -0000
@@ -2,10 +2,10 @@

 PKG_OPTIONS_VAR=       PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache pcre \
-                       push realip ssl sub uwsgi
+                       push realip scgi ssl sub uwsgi
 PKG_SUGGESTED_OPTIONS= pcre ssl

-PLIST_VARS+=           uwsgi
+PLIST_VARS+=           scgi uwsgi

 .include "../../mk/bsd.options.mk"

@@ -54,9 +54,16 @@
 CONFIGURE_ARGS+=       --with-ipv6
 .endif

+.if !empty(PKG_OPTIONS:Mscgi)
+EGFILES+=              scgi_params
+PLIST.scgi=            yes
+CONFIGURE_ARGS+=       --http-scgi-temp-path=${NGINX_DATADIR}/scgi_temp
+.endif
+
 .if !empty(PKG_OPTIONS:Muwsgi)

 EGFILES+=              uwsgi_params
 PLIST.uwsgi=           yes
+CONFIGURE_ARGS+=       --http-uwsgi-temp-path=${NGINX_DATADIR}/uwsgi_temp
 .else

 .if !empty(PKG_OPTIONS:Mpush)

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->joerg
Responsible-Changed-By: obache@NetBSD.org
Responsible-Changed-When: Wed, 31 Aug 2011 10:10:23 +0000
Responsible-Changed-Why:
Over to maintainer.


From: "Sergey Svishchev" <shattered@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/45317 CVS commit: pkgsrc/www/nginx
Date: Sun, 4 Dec 2011 14:41:01 +0000

 Module Name:	pkgsrc
 Committed By:	shattered
 Date:		Sun Dec  4 14:41:01 UTC 2011

 Modified Files:
 	pkgsrc/www/nginx: Makefile distinfo
 	pkgsrc/www/nginx/patches: patch-aa

 Log Message:
 Update to 1.0.10 and delint.  Partially resolves PR/45317, PR/45612 and
 PR/45506.  No new options added.  Notable changes:

     *) Bugfix: a segmentation fault might occur in a worker process if
        resolver got a big DNS response.

     *) Feature: accept filters are now supported on NetBSD.

     *) Bugfix: a segmentation fault occurred on start or while
        reconfiguration if the "ssl" directive was used at http level and
        there was no "ssl_certificate" defined.

     *) Bugfix: nginx hogged CPU if all servers in an upstream were marked as
        "down".

     *) Bugfix: a segmentation fault might occur during reconfiguration if
        ssl_session_cache was defined but not used in previous configuration.

     *) Bugfix: a segmentation fault might occur in a worker process if many
        backup servers were used in an upstream.

     *) Feature: now nginx supports ECDHE key exchange ciphers.

     *) Change: now default SSL ciphers are "HIGH:!aNULL:!MD5".

     *) Bugfix: a segmentation fault might occur in a worker process, if a
        caching was used.

     *) Bugfix: worker processes may got caught in an endless loop during
        reconfiguration, if a caching was used; the bug had appeared in 0.8.48.


 To generate a diff of this commit:
 cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/nginx/Makefile
 cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/nginx/distinfo
 cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/nginx/patches/patch-aa

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->closed
State-Changed-By: shattered@NetBSD.org
State-Changed-When: Thu, 10 Dec 2015 19:09:33 +0000
State-Changed-Why:
should have been closed back then.


>Unformatted:

Home	PR Database Search