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

Requested by Christoph Badura.

2 files changed, 9 insertions, 79 deletions

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 */
-