From root@firebird.clustercube.com  Sun Feb 20 23:00:28 2005
Return-Path: <root@firebird.clustercube.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0CC6716A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 20 Feb 2005 23:00:28 +0000 (GMT)
Received: from firebird.clustercube.com (firebird.clustercube.com [72.21.32.50])
	by mx1.FreeBSD.org (Postfix) with SMTP id 5FF4043D1F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 20 Feb 2005 23:00:27 +0000 (GMT)
	(envelope-from root@firebird.clustercube.com)
Received: (qmail 13187 invoked from network); 20 Feb 2005 23:00:27 -0000
Received: from owl.clustercube.com (72.21.32.52)
  by 127.0.0.2 with QMQP; 20 Feb 2005 23:00:27 -0000
Message-Id: <20050220230026.13183.qmail@owl.clustercube.com>
Date: 20 Feb 2005 23:00:26 -0000
From: Rui Lopes <rui@ruilopes.com>
Reply-To: Rui Lopes <rui@ruilopes.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: hendrik@scholz.net
Subject: Update port: www/lighttpd to 1.3.11
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         77811
>Category:       ports
>Synopsis:       Update port: www/lighttpd to 1.3.11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sem
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 20 23:00:37 GMT 2005
>Closed-Date:    Tue Feb 22 18:43:41 GMT 2005
>Last-Modified:  Tue Feb 22 18:43:41 GMT 2005
>Originator:     Rui Lopes
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
	
>Description:
	Update www/lighttpd from 1.3.10 to 1.3.11.
	
>How-To-Repeat:
	
>Fix:

	

--- lighttpd-update-1.3.11.patch begins here ---
diff -ruN lighttpd.orig/Makefile lighttpd/Makefile
--- lighttpd.orig/Makefile	Sun Feb 20 22:26:06 2005
+++ lighttpd/Makefile	Sun Feb 20 22:26:30 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lighttpd
-PORTVERSION=	1.3.10
-PORTREVISION=	1
+PORTVERSION=	1.3.11
 CATEGORIES=	www
 MASTER_SITES=	http://www.lighttpd.net/download/ \
 				http://dl.fkb.wormulon.net/lighttpd/ \
diff -ruN lighttpd.orig/distinfo lighttpd/distinfo
--- lighttpd.orig/distinfo	Sun Feb 20 22:26:06 2005
+++ lighttpd/distinfo	Sun Feb 20 22:27:49 2005
@@ -1,2 +1,2 @@
-MD5 (lighttpd-1.3.10.tar.gz) = 28623eff50653a9b104ddb20fe65aaf1
-SIZE (lighttpd-1.3.10.tar.gz) = 667324
+MD5 (lighttpd-1.3.11.tar.gz) = 730c9b9d743360d23e523968ab4fe7c5
+SIZE (lighttpd-1.3.11.tar.gz) = 670438
diff -ruN lighttpd.orig/files/patch-src::cgi.c lighttpd/files/patch-src::cgi.c
--- lighttpd.orig/files/patch-src::cgi.c	Sun Feb 20 22:26:06 2005
+++ lighttpd/files/patch-src::cgi.c	Thu Jan  1 01:00:00 1970
@@ -1,29 +0,0 @@
---- ./src/cgi.c~	2005-02-08 00:08:01.000000000 +0200
-+++ ./src/cgi.c	2005-02-08 00:13:02.000000000 +0200
-@@ -686,16 +686,18 @@
- 	
- 	int to_cgi_fds[2];
- 	int from_cgi_fds[2];
--	struct stat st;
--	
-+
- #ifndef __WIN32	
-+	struct stat st;
- 	
--	/* stat the exec file */
--	if (-1 == (stat(cgi_handler->ptr, &st))) {
--		log_error_write(srv, __FILE__, __LINE__, "sbss", 
--				"stat for cgi-handler", cgi_handler,
--				"failed:", strerror(errno));
--		return -1;
-+	if (cgi_handler->used > 1) {
-+		/* stat the exec file */
-+		if (-1 == (stat(cgi_handler->ptr, &st))) {
-+			log_error_write(srv, __FILE__, __LINE__, "sbss", 
-+					"stat for cgi-handler", cgi_handler,
-+					"failed:", strerror(errno));
-+			return -1;
-+		}
- 	}
- 	
- 	if (pipe(to_cgi_fds)) {
diff -ruN lighttpd.orig/files/patch-src::mod_cgi.c lighttpd/files/patch-src::mod_cgi.c
--- lighttpd.orig/files/patch-src::mod_cgi.c	Thu Jan  1 01:00:00 1970
+++ lighttpd/files/patch-src::mod_cgi.c	Sun Feb 20 22:51:32 2005
@@ -0,0 +1,23 @@
+--- src/mod_cgi.c	(revision 34)
++++ src/mod_cgi.c	(revision 35)
+@@ -690,12 +690,14 @@
+ 	
+ #ifndef __WIN32	
+ 	
+-	/* stat the exec file */
+-	if (-1 == (stat(cgi_handler->ptr, &st))) {
+-		log_error_write(srv, __FILE__, __LINE__, "sbss", 
+-				"stat for cgi-handler", cgi_handler,
+-				"failed:", strerror(errno));
+-		return -1;
++	if (cgi_handler->used > 1) {
++		/* stat the exec file */
++		if (-1 == (stat(cgi_handler->ptr, &st))) {
++			log_error_write(srv, __FILE__, __LINE__, "sbss", 
++					"stat for cgi-handler", cgi_handler,
++					"failed:", strerror(errno));
++			return -1;
++		}
+ 	}
+ 	
+ 	if (pipe(to_cgi_fds)) {
--- lighttpd-update-1.3.11.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sem 
Responsible-Changed-By: sem 
Responsible-Changed-When: Mon Feb 21 18:47:52 GMT 2005 
Responsible-Changed-Why:  
Take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77811 
State-Changed-From-To: open->feedback 
State-Changed-By: sem 
State-Changed-When: Mon Feb 21 18:48:08 GMT 2005 
State-Changed-Why:  
Wait maintainer approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77811 

From: Sergey Matveychuk <sem@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, hendrik@scholz.net
Cc:  
Subject: Re: ports/77811: Update port: www/lighttpd to 1.3.11
Date: Mon, 21 Feb 2005 21:47:16 +0300

 Dear maintainer!
 
 Please approve or disprove the PR.
 -- 
 Sem.

Adding to audit trail from misfiled PRs 77834, 77850, and 77855:

Date: Mon, 21 Feb 2005 09:12:24 +0100
From: Hendrik Scholz <hscholz@raisdorf.net>
 
 I've done this on my own. The problem with just updating is that
 the lighttpd module path changed and pkg-plist has to be updated.
 I'm in touch with Jan and we'll change that back to the well known
 old path.
 
 I'll send an updated diff later today.
 
 Hendrik
Date: Mon, 21 Feb 2005 12:52:37 +0100
From: Hendrik Scholz <hscholz@raisdorf.net>
 
 Hi!
 
 This additional patch to the Makefile is needed to make pkg-plist happy:
 
 @@ -25,6 +24,7 @@
 ~ USE_GNOME= lthack
 ~ CONFIGURE_TARGET=  --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 ~ CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LIBS=-L${PREFIX}/lib
 +CONFIGURE_ARGS=    --libdir=${PREFIX}/lib/lighttpd
 ~ STARTUP_FILE=  ${PREFIX}/etc/rc.d/lighttpd.sh
 ~ RC_SCRIPTS_SUB=    PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 Other than that the patch previously sent is fine. The total thing looks
 like this:
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/www/lighttpd/Makefile,v
 retrieving revision 1.13
 diff -u -r1.13 Makefile
 - --- Makefile    12 Feb 2005 16:51:31 -0000  1.13
 +++ Makefile    21 Feb 2005 11:46:28 -0000
 @@ -6,8 +6,7 @@
 ~ #
 
 ~ PORTNAME=  lighttpd
 - -PORTVERSION=   1.3.10
 - -PORTREVISION=  1
 +PORTVERSION=   1.3.11
 ~ CATEGORIES=    www
 ~ MASTER_SITES=  http://www.lighttpd.net/download/ \
 ~                http://dl.fkb.wormulon.net/lighttpd/ \
 @@ -25,6 +24,7 @@
 ~ USE_GNOME= lthack
 ~ CONFIGURE_TARGET=  --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 ~ CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LIBS=-L${PREFIX}/lib
 +CONFIGURE_ARGS=    --libdir=${PREFIX}/lib/lighttpd
 ~ STARTUP_FILE=  ${PREFIX}/etc/rc.d/lighttpd.sh
 ~ RC_SCRIPTS_SUB=    PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/www/lighttpd/distinfo,v
 retrieving revision 1.10
 diff -u -r1.10 distinfo
 - --- distinfo    7 Feb 2005 14:05:35 -0000   1.10
 +++ distinfo    21 Feb 2005 11:46:28 -0000
 @@ -1,2 +1,2 @@
 - -MD5 (lighttpd-1.3.10.tar.gz) = 28623eff50653a9b104ddb20fe65aaf1
 - -SIZE (lighttpd-1.3.10.tar.gz) = 667324
 +MD5 (lighttpd-1.3.11.tar.gz) = 730c9b9d743360d23e523968ab4fe7c5
 +SIZE (lighttpd-1.3.11.tar.gz) = 670438
 
 Changes:
 
 ~ - update to 1.3.11
 ~ - add --libdir configure arg to preserve correct module directory
 ~ - remove files/patch-src::Makefile.in
 ~ - remove files/patch-src::cgi.c
 
 Hendrik
Date: Mon, 21 Feb 2005 13:14:15 +0000
From: Rui Lopes <rui@ruilopes.com>
 
 Hendrik Scholz wrote:
 > This additional patch to the Makefile is needed to make pkg-plist happy:
 > 
 > @@ -25,6 +24,7 @@
 > ~ USE_GNOME= lthack
 > ~ CONFIGURE_TARGET=  --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 > ~ CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LIBS=-L${PREFIX}/lib
 > +CONFIGURE_ARGS=    --libdir=${PREFIX}/lib/lighttpd
 > ~ STARTUP_FILE=  ${PREFIX}/etc/rc.d/lighttpd.sh
 > ~ RC_SCRIPTS_SUB=    PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 Ah, rigth, this --libdir is better than the patch :)
 
 > Other than that the patch previously sent is fine. The total thing looks
 > like this:
 > 
 [...patch that only missed mod_cgi.c patch...]
 > Changes:
 > 
 > ~ - update to 1.3.11
 > ~ - add --libdir configure arg to preserve correct module directory
 > ~ - remove files/patch-src::Makefile.in
 > ~ - remove files/patch-src::cgi.c
 
 Don't remove the lighttpd/files/patch-src::mod_cgi.c that I've sent in 
 the original PR (that patch didn't make into 1.3.11 release).
 
 -- Rui Lopes
 
 PS: BTW, IMO you should supply patches in unified format (diff -u); 
 they read easier and are more compact.

From: Hendrik Scholz <hscholz@raisdorf.net>
To: Sergey Matveychuk <sem@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org, hendrik@scholz.net,
	rui@ruilopes.com
Subject: Re: ports/77811: Update port: www/lighttpd to 1.3.11
Date: Tue, 22 Feb 2005 09:19:01 +0100

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Hi!
 
 Please take the patch I've filed as part of that pr and add the
 mod_cgi.c patch from Rui.
 
 Thanks,
 	Hendrik
 
 - --
 Hendrik Scholz - <hscholz@raisdorf.net> - http://www.wormulon.net/
 drag me, drop me - treat me like an object
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (FreeBSD)
 Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
 
 iD8DBQFCGur14Wmz+z2IPqARAtuXAJkByDtDTbTTPgwVN5s4Tyf4P/K/PQCeIJ5M
 6J0DQzZhVnf0I6+96/UZga8=
 =r7Aa
 -----END PGP SIGNATURE-----
State-Changed-From-To: feedback->closed 
State-Changed-By: sem 
State-Changed-When: Tue Feb 22 18:43:18 GMT 2005 
State-Changed-Why:  
Committed with maintainer modifications, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77811 
>Unformatted:
