From hscholz@mail.wormulon.net  Tue Aug 30 08:21:08 2005
Return-Path: <hscholz@mail.wormulon.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D29CD16A423
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 30 Aug 2005 08:21:08 +0000 (GMT)
	(envelope-from hscholz@mail.wormulon.net)
Received: from mail.wormulon.net (plant.wormulon.net [81.169.153.132])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A73CF43D5C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 30 Aug 2005 08:21:06 +0000 (GMT)
	(envelope-from hscholz@mail.wormulon.net)
Received: from localhost (localhost [127.0.0.1])
	by mail.wormulon.net (Postfix) with ESMTP id C85F455154;
	Tue, 30 Aug 2005 10:21:02 +0200 (CEST)
Received: from mail.wormulon.net ([127.0.0.1])
 by localhost (plant.wormulon.net [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 90453-03; Tue, 30 Aug 2005 10:20:57 +0200 (CEST)
Received: by mail.wormulon.net (Postfix, from userid 1001)
	id 0238D55130; Tue, 30 Aug 2005 10:20:57 +0200 (CEST)
Message-Id: <20050830082057.0238D55130@mail.wormulon.net>
Date: Tue, 30 Aug 2005 10:20:57 +0200 (CEST)
From: Hendrik Scholz <hendrik@scholz.net>
Reply-To: Hendrik Scholz <hendrik@scholz.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Hendrik Scholz <hendrik@scholz.net>
Subject: maintainer-update: www/lighttpd to 1.4.2 (bugfix release)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         85463
>Category:       ports
>Synopsis:       maintainer-update: www/lighttpd to 1.4.2 (bugfix release)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 30 08:30:07 GMT 2005
>Closed-Date:    Tue Aug 30 11:39:24 GMT 2005
>Last-Modified:  Tue Aug 30 11:39:24 GMT 2005
>Originator:     Hendrik Scholz
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD plant.wormulon.net 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #0: Fri Aug 13 11:32:22 CEST 2004 hscholz@h2012.ka.strato.de:/usr/src/sys/i386/compile/PLANT i386


	
>Description:

This patch upgrades lighttpd to 1.4.2 which itself is a bugfix release and
upgrading is encouraged.
A small patch is needed to allow compilation on FreeBSD (already fixed in
lighttpd).
lighttpd.sh.in did not show up on my mirror so it's once more included
in this patch. It might already be in the main repository as the commit
message suggests this and then can be ignored.

>How-To-Repeat:
	
>Fix:

	

--- lighttpd-1.4.2.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/lighttpd/Makefile,v
retrieving revision 1.24
diff -u -u -r1.24 Makefile
--- Makefile	29 Aug 2005 10:13:32 -0000	1.24
+++ Makefile	30 Aug 2005 08:13:16 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lighttpd
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.lighttpd.net/download/ \
 		http://dl.fkb.wormulon.net/lighttpd/ \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/lighttpd/distinfo,v
retrieving revision 1.17
diff -u -u -r1.17 distinfo
--- distinfo	29 Aug 2005 10:13:32 -0000	1.17
+++ distinfo	30 Aug 2005 08:13:16 -0000
@@ -1,2 +1,2 @@
-MD5 (lighttpd-1.4.1.tar.gz) = 3abffbe574fd835721760a37c00d3714
-SIZE (lighttpd-1.4.1.tar.gz) = 759063
+MD5 (lighttpd-1.4.2.tar.gz) = c26eea734490129a45e465ac0f327e4a
+SIZE (lighttpd-1.4.2.tar.gz) = 763765
Index: files/lighttpd.sh.in
===================================================================
RCS file: files/lighttpd.sh.in
diff -N files/lighttpd.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/lighttpd.sh.in	30 Aug 2005 08:13:19 -0000
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: lighttpd
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable lighttpd:
+#
+#lighttpd_enable="YES"
+#
+# See lighttpd(1) for manual
+#
+
+. %%RC_SUBR%%
+
+name=lighttpd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/lighttpd
+pidfile=/var/run/lighttpd.pid
+required_files=${lighttpd_conf}
+
+stop_postcmd=stop_postcmd
+
+stop_postcmd()
+{
+  rm -f $pidfile
+}
+
+# set defaults
+
+lighttpd_enable=${lighttpd_enable:-"NO"}
+lighttpd_conf=${lighttpd_conf:-"%%PREFIX%%/etc/lighttpd.conf"}
+
+load_rc_config $name
+
+command_args="-f ${lighttpd_conf}"
+run_rc_command "$1"
Index: files/patch-src:fdevent_freebsd_kqueue.c
===================================================================
RCS file: files/patch-src:fdevent_freebsd_kqueue.c
diff -N files/patch-src:fdevent_freebsd_kqueue.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src:fdevent_freebsd_kqueue.c	30 Aug 2005 08:13:19 -0000
@@ -0,0 +1,10 @@
+--- src/fdevent_freebsd_kqueue.c.orig	Tue Aug 30 09:50:58 2005
++++ src/fdevent_freebsd_kqueue.c	Tue Aug 30 09:51:16 2005
+@@ -108,6 +108,7 @@
+ 			fprintf(stderr, "%s.%d: kqueue failed polling: %s\n",
+ 				__FILE__, __LINE__, strerror(errno));
+ 			break;
++		}
+ 	}
+ 
+ 	return ret;
--- lighttpd-1.4.2.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: vs 
State-Changed-When: Tue Aug 30 11:35:43 GMT 2005 
State-Changed-Why:  
Committed, thanks! 
The startup-script was okay, though. 

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