Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Mar 2009 10:48:20 -0400 (EDT)
From:      Wesley Shields <wxs@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        mnag@FreeBSD.org
Subject:   ports/132582: [PATCH]: Update lighttpd to 1.4.22
Message-ID:  <20090312144820.3A1A95C2D@syn.atarininja.org>
Resent-Message-ID: <200903121450.n2CEo1Zi050872@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         132582
>Category:       ports
>Synopsis:       [PATCH]: Update lighttpd to 1.4.22
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 12 14:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Wesley Shields
>Release:        FreeBSD 7.0-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD syn.csh.rit.edu 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #2: Wed Sep 3 17:03:38 EDT 2008 root@syn.csh.rit.edu:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
www/lighttpd has a new version out which includes the patches recently
added to the port to fix regressions in the last release.  It also fixes
a segfault in mod_scgi.  The attached patch updates the port to the
newest version and removes the now unnecessary patches.

I've CC'ed the maintainer on this PR.

>How-To-Repeat:
N/A
>Fix:

Index: Makefile
===================================================================
RCS file: /ncvs/ports/www/lighttpd/Makefile,v
retrieving revision 1.68
diff -u -r1.68 Makefile
--- Makefile	24 Feb 2009 19:06:36 -0000	1.68
+++ Makefile	12 Mar 2009 13:52:21 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lighttpd
-PORTVERSION=	1.4.21
-PORTREVISION=	2
+PORTVERSION=	1.4.22
 CATEGORIES=	www
 MASTER_SITES=	http://www.lighttpd.net/download/ \
 		http://mirrors.cat.pdx.edu/lighttpd/
Index: distinfo
===================================================================
RCS file: /ncvs/ports/www/lighttpd/distinfo,v
retrieving revision 1.36
diff -u -r1.36 distinfo
--- distinfo	21 Feb 2009 18:38:00 -0000	1.36
+++ distinfo	12 Mar 2009 13:52:33 -0000
@@ -1,3 +1,3 @@
-MD5 (lighttpd-1.4.21.tar.bz2) = 49eeba63c931fa82120711adc7182731
-SHA256 (lighttpd-1.4.21.tar.bz2) = 1c5f4e3643773fc5885c1fb0eb588852099ceb1f2517cf4e5e5211cc5504ebd1
-SIZE (lighttpd-1.4.21.tar.bz2) = 657787
+MD5 (lighttpd-1.4.22.tar.bz2) = ed4ca3897eadf419c893b03fee53c982
+SHA256 (lighttpd-1.4.22.tar.bz2) = 6d217dd47fbbf431ee37aa6f12604411204be1fb37bc2a70e14d15dab507c451
+SIZE (lighttpd-1.4.22.tar.bz2) = 657939
Index: files/patch-src__network_freebsd_sendfile.c
===================================================================
RCS file: files/patch-src__network_freebsd_sendfile.c
diff -N files/patch-src__network_freebsd_sendfile.c
--- files/patch-src__network_freebsd_sendfile.c	24 Feb 2009 19:06:37 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-#
-# Backport http://redmine.lighttpd.net/issues/show/1913
-#
---- src/network_freebsd_sendfile.c.orig	2009-02-05 09:41:44.000000000 -0200
-+++ src/network_freebsd_sendfile.c	2009-02-24 15:11:29.000000000 -0300
-@@ -167,8 +167,9 @@
- 				switch(errno) {
- 				case EAGAIN:
- 				case EINTR:
--					r = 0; /* try again later */
--					break;
-+					/* for EAGAIN/EINTR r still contains the sent bytes */
-+					break; /* try again later */
-+				case EPIPE:
- 				case ENOTCONN:
- 					return -2;
- 				default:
-
Index: files/patch-src_mod_simple_vhost.c
===================================================================
RCS file: files/patch-src_mod_simple_vhost.c
diff -N files/patch-src_mod_simple_vhost.c
--- files/patch-src_mod_simple_vhost.c	21 Feb 2009 18:38:01 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Index: src/mod_simple_vhost.c
-===================================================================
---- src/mod_simple_vhost.c	(revision 2398)
-+++ src/mod_simple_vhost.c	(revision 2399)
-@@ -249,6 +249,8 @@
- 				return HANDLER_GO_ON;
- 			} else {
- 				buffer_copy_string_buffer(con->server_name, p->conf.default_host);
-+				buffer_copy_string_buffer(con->physical.doc_root, p->doc_root);
-+
- 				/* do not cache default host */
- 				return HANDLER_GO_ON;
- 			}
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090312144820.3A1A95C2D>