From owner-freebsd-ports  Thu Aug 23 16:10:16 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id A6B5437B40E
	for <freebsd-ports@hub.freebsd.org>; Thu, 23 Aug 2001 16:10:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f7NNA2t75075;
	Thu, 23 Aug 2001 16:10:02 -0700 (PDT)
	(envelope-from gnats)
Received: from totem.fix.no (totem.fix.no [213.142.66.130])
	by hub.freebsd.org (Postfix) with ESMTP id 04F2D37B409
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 23 Aug 2001 16:00:20 -0700 (PDT)
	(envelope-from anders@totem.fix.no)
Received: by totem.fix.no (Postfix, from userid 1000)
	id BDF493C98; Fri, 24 Aug 2001 01:00:18 +0200 (CEST)
Message-Id: <20010823230018.BDF493C98@totem.fix.no>
Date: Fri, 24 Aug 2001 01:00:18 +0200 (CEST)
From: Anders Nordby <anders@fix.no>
Reply-To: Anders Nordby <anders@fix.no>
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/30009: Fox port: www/thttpd
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         30009
>Category:       ports
>Synopsis:       Fix port: www/thttpd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 23 16:10:02 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Anders Nordby
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
Fluxpod Information eXchange
>Environment:

	<Relevant environment information (multiple lines)>

>Description:

Fix kqueue support for -current. Thanks to Jonathan Lemon making patches, and
to Mike Silbersack for sending them to me.

>How-To-Repeat:

	<Code/input/activities to reproduce the problem (multiple lines)>

>Fix:

diff -Nur thttpd.old/Makefile thttpd/Makefile
--- thttpd.old/Makefile	Tue May  1 02:34:46 2001
+++ thttpd/Makefile	Fri Aug 24 00:22:14 2001
@@ -19,13 +19,6 @@
 
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-# Kqueue doesn't work in -current with thttpd.
-.if ${OSVERSION} >= 500000
-CFLAGS+=	-DHAVE_FREEBSD_CURRENT
-.endif
-
 MAN1=		makeweb.1 htpasswd.1
 MAN8=		thttpd.8 redirect.8 ssi.8 syslogtocern.8
 
@@ -87,4 +80,4 @@
 	@${ECHO} ""
 	@${ECHO} "====================================================================="
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -Nur thttpd.old/files/patch-fdwatch.c thttpd/files/patch-fdwatch.c
--- thttpd.old/files/patch-fdwatch.c	Tue May  1 02:34:46 2001
+++ thttpd/files/patch-fdwatch.c	Fri Aug 24 00:20:44 2001
@@ -1,21 +1,12 @@
---- fdwatch.c.orig	Tue Apr 24 18:40:22 2001
-+++ fdwatch.c	Tue Apr 24 19:00:57 2001
-@@ -32,6 +32,7 @@
- #include <sys/time.h>
- #include <sys/resource.h>
- #include <syslog.h>
-+#include <sys/param.h>
+--- fdwatch.c.orig	Fri Aug 24 00:19:39 2001
++++ fdwatch.c	Fri Aug 24 00:20:30 2001
+@@ -311,6 +311,9 @@
+     if ( kqchanges == (struct kevent*) 0 || kqevents == (struct kevent*) 0 ||
+ 	 kqrfdidx == (int*) 0 )
+ 	return -1;
++    memset(kqchanges, '\0', sizeof(struct kevent) * 2 * nfiles);
++    memset(kqevents, '\0', sizeof(struct kevent) * nfiles);
++    memset(kqrfdidx, '\0', sizeof(int) * nfiles);
+     return 0;
+     }
  
- #ifndef MIN
- #define MIN(a,b) ((a) < (b) ? (a) : (b))
-@@ -44,6 +45,10 @@
- #include <sys/poll.h>
- #endif /* HAVE_SYS_POLL_H */
- #endif /* HAVE_POLL_H */
-+
-+#ifdef HAVE_FREEBSD_CURRENT
-+#undef HAVE_KQUEUE
-+#endif
- 
- #ifdef HAVE_SYS_EVENT_H
- #include <sys/event.h>
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message