NetBSD Problem Report #45612
From www@NetBSD.org Sun Nov 13 18:41:41 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 F3F5963D855
for <gnats-bugs@gnats.NetBSD.org>; Sun, 13 Nov 2011 18:41:40 +0000 (UTC)
Message-Id: <20111113184140.73C9E63B8A8@www.NetBSD.org>
Date: Sun, 13 Nov 2011 18:41:40 +0000 (UTC)
From: ano@bestmx.ru
Reply-To: ano@bestmx.ru
To: gnats-bugs@NetBSD.org
Subject: www/nginx: update to new version and add some options
X-Send-Pr-Version: www-1.0
>Number: 45612
>Category: pkg
>Synopsis: www/nginx: update to new version and add some options
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: joerg
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Sun Nov 13 18:45:00 +0000 2011
>Closed-Date: Wed Dec 14 12:27:07 +0000 2011
>Last-Modified: Wed Dec 14 12:27:07 +0000 2011
>Originator: Andrey N. Oktyabrski
>Release: OpenIndiana 151a, DragonFly BSD 2.10
>Organization:
>Environment:
OS-independent
>Description:
The 1.0.4 version is very old. Changelog is here:
http://nginx.org/en/CHANGES-1.0
The "debug" option added because debug log does not work without it.
MASTER_SITES must be nginx.org/download/ now instead of sysoev.ru/nginx/
New option added for compile with nginx_upload_module
(http://www.grid.net.ru/nginx/upload.en.html)
New option added for compile with http_image_filter_module
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
From: "Andrey N. Oktyabrski" <ano@bestmx.ru>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/45612: www/nginx: update to new version and add some options
Date: Sun, 13 Nov 2011 22:53:13 +0300
This is a multi-part message in MIME format.
--------------070902010705000308000801
Content-Type: text/plain; charset=KOI8-R; format=flowed
Content-Transfer-Encoding: 7bit
Patch.
--------------070902010705000308000801
Content-Type: text/plain;
name="nginx_pkgsrc.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="nginx_pkgsrc.patch"
diff -ruN nginx.orig/CVS/Entries nginx/CVS/Entries
--- nginx.orig/CVS/Entries 2011-11-13 21:58:22.699356382 +0300
+++ nginx/CVS/Entries 2011-11-13 21:57:35.393014699 +0300
@@ -2,7 +2,7 @@
D/patches////
/DESCR/1.1.1.1/Tue Dec 11 09:12:26 2007//
/MESSAGE/1.1/Sat Jan 23 16:33:23 2010//
+/Makefile/1.16/Fri Jun 10 10:36:18 2011//
/PLIST/1.5/Fri Jun 10 10:36:18 2011//
-/Makefile/1.16/Sun Nov 13 18:58:22 2011//
-/distinfo/1.13/Sun Nov 13 18:58:22 2011//
-/options.mk/1.11/Sun Nov 13 18:58:22 2011//
+/options.mk/1.11/Sun Nov 13 17:52:26 2011//
+/distinfo/1.13/Sun Nov 13 18:47:43 2011//
diff -ruN nginx.orig/Makefile nginx/Makefile
--- nginx.orig/Makefile 2011-11-13 21:58:22.426018499 +0300
+++ nginx/Makefile 2011-11-13 22:12:21.543009011 +0300
@@ -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.9
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/
diff -ruN nginx.orig/distinfo nginx/distinfo
--- nginx.orig/distinfo 2011-11-13 21:58:22.431557041 +0300
+++ nginx/distinfo 2011-11-13 21:57:35.401275001 +0300
@@ -1,7 +1,12 @@
$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 (patch-aa) = 1ef1a800f0d7dffe182b8a74f115105ded205f8e
+SHA1 (nginx-1.0.9.tar.gz) = f926bc18170177d0b7fc0ecbf5cdd5103f4c20d7
+RMD160 (nginx-1.0.9.tar.gz) = db2b4d8df237c11c081fb6910a460cc0f30705f9
+Size (nginx-1.0.9.tar.gz) = 685717 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 (nginx_upload_module-2.2.0.tar.gz) = 93d6e83e613a0ce2ed057a434b344fa1b6609b47
+Size (nginx_upload_module-2.2.0.tar.gz) = 25796 bytes
+SHA1 (patch-aa) = cca1ff3f67e31de3bf41afb23e9d78ed2667b152
SHA1 (patch-ab) = 6f20ef8ac9a042faf7e22770de7c16b351cb1191
diff -ruN nginx.orig/options.mk nginx/options.mk
--- nginx.orig/options.mk 2011-11-13 21:58:22.698816346 +0300
+++ nginx/options.mk 2011-11-13 22:10:02.217517603 +0300
@@ -2,13 +2,29 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache pcre \
- push realip ssl sub uwsgi
+ push realip ssl sub uwsgi image-filter upload debug
PKG_SUGGESTED_OPTIONS= pcre ssl
PLIST_VARS+= uwsgi
.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+= --with-debug
+.endif
+
+.if !empty(PKG_OPTIONS:Mupload)
+NGX_UPLOAD= nginx_upload_module-2.2.0
+DISTFILES+= ${NGX_UPLOAD}.tar.gz
+SITES.${NGX_UPLOAD}.tar.gz= http://www.grid.net.ru/nginx/download/
+CONFIGURE_ARGS+= --add-module=../${NGX_UPLOAD}
+.endif
+
+.if !empty(PKG_OPTIONS:Mimage-filter)
+.include "../../graphics/gd/buildlink3.mk"
+CONFIGURE_ARGS+= --with-http_image_filter_module
+.endif
+
.if !empty(PKG_OPTIONS:Mssl)
.include "../../security/openssl/buildlink3.mk"
CONFIGURE_ARGS+= --with-mail_ssl_module
diff -ruN nginx.orig/patches/CVS/Entries nginx/patches/CVS/Entries
--- nginx.orig/patches/CVS/Entries 2011-11-13 22:00:48.525992284 +0300
+++ nginx/patches/CVS/Entries 2011-11-13 21:57:35.384507514 +0300
@@ -1,3 +1,3 @@
+/patch-aa/1.2/Sat Jan 23 16:32:11 2010//
/patch-ab/1.1/Tue Jun 15 20:05:48 2010//
-/patch-aa/1.2/Sun Nov 13 19:00:48 2011//
D
diff -ruN nginx.orig/patches/patch-aa nginx/patches/patch-aa
--- nginx.orig/patches/patch-aa 2011-11-13 22:00:48.509237620 +0300
+++ nginx/patches/patch-aa 2011-11-13 21:57:35.374523385 +0300
@@ -3,7 +3,8 @@
This patch provides config file adapted to pkgsrc settings.
--- conf/nginx.conf.orig 2008-02-28 22:44:16.000000000 +0200
+++ conf/nginx.conf
-@@ -2,12 +2,13 @@
+@@ -1,28 +1,29 @@
+
-#user nobody;
+user %%NGINX_USER%% %%NGINX_GROUP%%;
worker_processes 1;
@@ -13,8 +14,8 @@
-#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;
++#error_log %%NGINX_LOGDIR%%/error.log notice;
+#error_log %%NGINX_LOGDIR%%/error.log info;
+#pid %%NGINX_PIDDIR%%/nginx.pid;
@@ -23,7 +24,7 @@
+ # 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 +35,13 @@
#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 @@
#charset koi8-r;
@@ -53,7 +54,7 @@
index index.html index.htm;
}
-@@ -51,7 +50,7 @@
+@@ -51,7 +52,7 @@
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
@@ -62,7 +63,7 @@
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
-@@ -67,7 +66,7 @@
+@@ -67,7 +68,7 @@
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
@@ -71,7 +72,7 @@
#}
# deny access to .htaccess files, if Apache's document root
-@@ -87,7 +86,7 @@
+@@ -87,7 +88,7 @@
# server_name somename alias another.alias;
# location / {
@@ -80,7 +81,7 @@
# index index.html index.htm;
# }
#}
-@@ -110,7 +109,7 @@
+@@ -110,7 +111,7 @@
# ssl_prefer_server_ciphers on;
# location / {
--------------070902010705000308000801--
Responsible-Changed-From-To: pkg-manager->joerg
Responsible-Changed-By: wiz@NetBSD.org
Responsible-Changed-When: Sun, 13 Nov 2011 19:59:51 +0000
Responsible-Changed-Why:
Over to maintainer.
From: "Sergey Svishchev" <shattered@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/45612 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.
From: "Joerg Sonnenberger" <joerg@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/45612 CVS commit: pkgsrc/www/nginx
Date: Tue, 13 Dec 2011 22:00:47 +0000
Module Name: pkgsrc
Committed By: joerg
Date: Tue Dec 13 22:00:47 UTC 2011
Modified Files:
pkgsrc/www/nginx: distinfo options.mk
Log Message:
Add back distfile for push option and decouple it from uwsgi.
Adjust logic to generate the full distinfo if makesum is called.
Add image-filter, upload and debug options (PR 45612).
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/nginx/options.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
From: "Andrey N. Oktyabrski" <ano@bestmx.ru>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: PR/45612 CVS commit: pkgsrc/www/nginx
Date: Wed, 14 Dec 2011 08:50:36 +0300
On 14.12.11 01:05, Joerg Sonnenberger wrote:
> Log Message:
> Add back distfile for push option and decouple it from uwsgi.
> Adjust logic to generate the full distinfo if makesum is called.
> Add image-filter, upload and debug options (PR 45612).
Thank you, this is exactly what I want.
State-Changed-From-To: open->closed
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Wed, 14 Dec 2011 12:27:07 +0000
State-Changed-Why:
Fixed, thanks.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2007
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.
Home