Update to 2.5c, which fixes descriptor leakage on zero-length directories.

Requested by Christoph Badura.

7 files changed, 30 insertions, 101 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 1ed964f4bbb..0554cc62913 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2000/01/25 02:48:11 fredb Exp $
+# $NetBSD: Makefile,v 1.14 2000/02/16 00:24:39 itohy Exp $
 
-DISTNAME=	wwwoffle-2.5b
+DISTNAME=	wwwoffle-2.5c
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/unix/httpd/ \
 		${MASTER_SITE_SUNSITE:=apps/www/servers/}
diff --git a/www/wwwoffle/files/md5 b/www/wwwoffle/files/md5
index 1f95a34d098..b53988d4612 100644
--- a/www/wwwoffle/files/md5
+++ b/www/wwwoffle/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/11/26 06:09:01 itohy Exp $
+$NetBSD: md5,v 1.6 2000/02/16 00:24:40 itohy Exp $
 
-MD5 (wwwoffle-2.5b.tgz) = 45cac8f1c09b91f08e139acac212acfd
+MD5 (wwwoffle-2.5c.tgz) = 12c9805fdfbf72bc148f5540538c35c8
diff --git a/www/wwwoffle/files/patch-sum b/www/wwwoffle/files/patch-sum
index 623e244e7f6..1a0dab56b9b 100644
--- a/www/wwwoffle/files/patch-sum
+++ b/www/wwwoffle/files/patch-sum
@@ -1,12 +1,11 @@
-$NetBSD: patch-sum,v 1.6 1999/12/07 08:50:50 agc Exp $
+$NetBSD: patch-sum,v 1.7 2000/02/16 00:24:40 itohy Exp $
 
-MD5 (patch-aa) = ab2df42869748c73b1b69c430646b7ed
-MD5 (patch-ab) = 290bc5f165fc2cd7afe5bce775cbf58d
+MD5 (patch-aa) = 3cec3275cb18eb2627dcbddb63aba11d
 MD5 (patch-ba) = 697b7cad9f1cd82c4b74da1317f4f987
 MD5 (patch-bb) = 06fd1d3b05e51f2594d97c4213b897ae
-MD5 (patch-bc) = ae6ff7004707b57b4e6e465db9c25e8d
+MD5 (patch-bc) = 6bb173924ac901827f282fcdef72b71a
 MD5 (patch-bd) = 526ecc28c80aaaf26fd5fc34893a97fa
 MD5 (patch-be) = 0a1d40853dc4b1efaff7d96981efad2d
 MD5 (patch-bf) = 757112e555a41d0365eaaf85d177dadd
-MD5 (patch-bg) = b0fceece78a62c8a59e7efc20b0f3dfc
+MD5 (patch-bg) = 857bca473f196dffcee7cd6b2f04cba2
 MD5 (patch-bh) = 1241dca0eb0e06a56ad2bee04c4b0591
diff --git a/www/wwwoffle/patches.v6/patch-bc b/www/wwwoffle/patches.v6/patch-bc
index 298bb64aa6c..e4b22a6744c 100644
--- a/www/wwwoffle/patches.v6/patch-bc
+++ b/www/wwwoffle/patches.v6/patch-bc
@@ -1,7 +1,7 @@
-$NetBSD: patch-bc,v 1.4 1999/11/30 03:53:30 itohy Exp $
+$NetBSD: patch-bc,v 1.5 2000/02/16 00:24:41 itohy Exp $
 
---- misc.c.nov6	Mon Nov 29 11:11:55 1999
-+++ misc.c	Tue Nov 30 09:07:18 1999
+--- misc.c.orig	Sun Dec 19 01:07:01 1999
++++ misc.c	Wed Feb 16 07:49:26 2000
 @@ -44,7 +44,7 @@
   URL *Url=(URL*)malloc(sizeof(URL));
   char *copyurl,*mallocurl=malloc(strlen(url)+2);
@@ -11,7 +11,7 @@ $NetBSD: patch-bc,v 1.4 1999/11/30 03:53:30 itohy Exp $
  
   copyurl=mallocurl;
   strcpy(copyurl,url);
-@@ -172,12 +172,17 @@
+@@ -175,12 +175,17 @@
      strcpy(Url->host,copyurl);
     }
  
diff --git a/www/wwwoffle/patches.v6/patch-bg b/www/wwwoffle/patches.v6/patch-bg
index 8631a1c63aa..9255f67c570 100644
--- a/www/wwwoffle/patches.v6/patch-bg
+++ b/www/wwwoffle/patches.v6/patch-bg
@@ -1,8 +1,8 @@
-$NetBSD: patch-bg,v 1.3 1999/11/26 06:09:01 itohy Exp $
+$NetBSD: patch-bg,v 1.4 2000/02/16 00:24:41 itohy Exp $
 
---- wwwoffled.c.orig	Sun Aug  8 18:22:33 1999
-+++ wwwoffled.c	Thu Nov 25 20:00:36 1999
-@@ -49,8 +49,8 @@
+--- wwwoffled.c.orig	Sun Nov 28 01:16:39 1999
++++ wwwoffled.c	Wed Feb 16 07:49:27 2000
+@@ -50,8 +50,8 @@
  
  
  /*+ The server sockets that we listen on +*/
@@ -13,7 +13,7 @@ $NetBSD: patch-bg,v 1.3 1999/11/26 06:09:01 itohy Exp $
  
  /*+ The online / offline /autodial status. +*/
  int online=0;
-@@ -169,12 +169,12 @@
+@@ -172,12 +172,12 @@
   if(WWWOFFLE_Gid != -1 || WWWOFFLE_Uid != -1)
      PrintMessage(Inform,"Running with uid=%d, gid=%d.",getuid(),getgid());
  
@@ -30,7 +30,7 @@ $NetBSD: patch-bg,v 1.3 1999/11/26 06:09:01 itohy Exp $
      PrintMessage(Fatal,"Cannot create WWWOFFLE server socket.");
  
   umask(0);
-@@ -209,20 +209,29 @@
+@@ -212,20 +212,29 @@
     {
      struct timeval tv;
      fd_set readfd;
@@ -66,7 +66,7 @@ $NetBSD: patch-bg,v 1.3 1999/11/26 06:09:01 itohy Exp $
  
      tv.tv_sec=10;
      tv.tv_usec=0;
-@@ -231,56 +240,62 @@
+@@ -234,56 +243,62 @@
  
      if(retval!=-1)
        {
@@ -178,7 +178,7 @@ $NetBSD: patch-bg,v 1.3 1999/11/26 06:09:01 itohy Exp $
      if(readconfig)
        {
         readconfig=0;
-@@ -369,9 +384,11 @@
+@@ -372,9 +387,11 @@
   while(!closedown);
  
   /* Close down and exit. */
@@ -191,4 +191,4 @@ $NetBSD: patch-bg,v 1.3 1999/11/26 06:09:01 itohy Exp $
 +     CloseSocket(http_fd_list[i]);
  
   if(n_servers)
-     PrintMessage(Important,"Exit signalled - waiting for children.");
+     PrintMessage(Important,"Exit signalled - waiting for %d child wwwoffles servers.",n_servers);
diff --git a/www/wwwoffle/patches/patch-aa b/www/wwwoffle/patches/patch-aa
index 8acb380b52d..a2e310b41d1 100644
--- a/www/wwwoffle/patches/patch-aa
+++ b/www/wwwoffle/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 1999/12/07 08:50:50 agc Exp $
+$NetBSD: patch-aa,v 1.7 2000/02/16 00:24:41 itohy Exp $
 
---- Makefile.orig	Sun Oct 10 15:31:50 1999
-+++ Makefile	Tue Nov 30 14:24:28 1999
+--- Makefile.orig	Sat Dec 18 21:27:03 1999
++++ Makefile	Wed Feb 16 07:46:20 2000
 @@ -16,9 +16,9 @@
  
  LOCALHOST=localhost:8080
@@ -42,12 +42,12 @@ $NetBSD: patch-aa,v 1.6 1999/12/07 08:50:50 agc Exp $
  
  # For Solaris you need the following instead.
  #LIBRARY=-lnsl -lsocket
-@@ -272,13 +272,13 @@
+@@ -273,13 +273,13 @@
  	$(INSTALL) -c -m 644 wwwoffle.conf.man.install $(INSTDIR)/man/man5/wwwoffle.conf.5
- 	[ -x $(INSTDIR)/man/man8 ] || $(INSTALL) -d $(INSTDIR)/man/man8
+ 	[ -x $(INSTDIR)/man/man8 ] || $(INSTALL) -d -m 755 $(INSTDIR)/man/man8
  	$(INSTALL) -c -m 644 wwwoffled.man $(INSTDIR)/man/man8/wwwoffled.8
--	[ -x $(INSTDIR)/doc/wwwoffle ] || $(INSTALL) -d $(INSTDIR)/doc/wwwoffle
-+	[ -x $(INSTDIR)/share/doc/wwwoffle ] || $(INSTALL) -d $(INSTDIR)/share/doc/wwwoffle
+-	[ -x $(INSTDIR)/doc/wwwoffle ] || $(INSTALL) -d -m 755 $(INSTDIR)/doc/wwwoffle
++	[ -x $(INSTDIR)/share/doc/wwwoffle ] || $(INSTALL) -d -m 755 $(INSTDIR)/share/doc/wwwoffle
  	for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* UPGRADE ; do \
 -	  $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file ;\
 +	  $(INSTALL) -c -m 644 $$file $(INSTDIR)/share/doc/wwwoffle/$$file ;\
@@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.6 1999/12/07 08:50:50 agc Exp $
  	  done )
  
  
-@@ -348,7 +348,7 @@
+@@ -354,7 +354,7 @@
  	[    -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf
  
  install_fixup-win32:
@@ -67,4 +67,4 @@ $NetBSD: patch-aa,v 1.6 1999/12/07 08:50:50 agc Exp $
 +	for file in $(INSTDIR)/share/doc/* $(CONFDIR)/README.win32 ; do \
  	  [ -f $$file ] && awk '{print $$0 "\r";}' < $$file > $$file.txt && rm -f $$file ;\
  	done
- #	for file in $(CONFDIR)/wwwoffle.conf ; do \
+ 	rm -f $(SPOOLDIR)/html/index.html && ln $(SPOOLDIR)/html/Welcome.html $(SPOOLDIR)/html/index.html
diff --git a/www/wwwoffle/patches/patch-ab b/www/wwwoffle/patches/patch-ab
deleted file mode 100644
index afd56942e0e..00000000000
--- a/www/wwwoffle/patches/patch-ab
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/11/30 03:53:30 itohy Exp $
-
-This patch is originated from the author, and will be included
-in future releases.
-
---- misc.c.orig	Mon Nov 29 10:50:02 1999
-+++ misc.c	Mon Nov 29 11:11:55 1999
-@@ -44,7 +44,7 @@
-  URL *Url=(URL*)malloc(sizeof(URL));
-  char *copyurl,*mallocurl=malloc(strlen(url)+2);
-  int i=0,n=0;
-- char *colon,*slash,*at,*temppath,root[2];
-+ char *colon,*slash,*at,*ques,*temppath,root[2];
- 
-  copyurl=mallocurl;
-  strcpy(copyurl,url);
-@@ -73,7 +73,8 @@
-     slash=strchr(copyurl,'/');
-    }
-  else if(colon && !isdigit(*(colon+1)) &&
--         (!at || (slash && at>slash)))  /* http:www.foo.com/... */
-+         (!slash || colon<slash) &&
-+         (!at || (slash && at>slash)))  /* http:www.foo.com/...[:@]...  */
-    {
-     *colon=0;
-     Url->proto=(char*)malloc(colon-copyurl+1);
-@@ -127,6 +128,16 @@
-     Url->pass=NULL;
-    }
- 
-+ /* Arguments */
-+ ques=strchr(copyurl,'?');
-+ if(ques)                       /* ../path?... */
-+   {
-+    *ques++=0;
-+    Url->args=(char*)malloc(strlen(ques)+1);
-+    strcpy(Url->args,ques);
-+   }
-+ else
-+    Url->args=NULL;
-  /* Hostname */
- 
-  if(*copyurl=='/')              /* /path/... (local) */
-@@ -139,24 +150,11 @@
-     Url->host=copyurl;
-     Url->local=0;
- 
--    if(slash)                   /* www.foo.com/... */
-+    if(slash && (!ques || slash<ques)) /* www.foo.com/...[?]... */
-        copyurl=slash;
--    else                        /* www.foo.com */
-+    else                        /* www.foo.com[?]... */
-       {root[0]='/';root[1]=0;copyurl=root;}
-    }
--
-- /* Arguments */
--
-- Url->args=NULL;
--
-- for(i=0;copyurl[i];i++)
--    if(copyurl[i]=='?')
--      {
--       copyurl[i]=0;
--       Url->args=(char*)malloc(strlen(copyurl+i+1)+1);
--       strcpy(Url->args,copyurl+i+1);
--       break;
--      }
- 
-  /* Pathname */
-