Upgraded to 2.5d.

Related changes:
 - Fix the permissions for the installed files
   (this fix is the same one that Frederick Bruckman did for 2.5c).
 - Remove the extra newline added to POST requests.
 - Only clear the supplementary group list if running as root.
 - Stopped overflow of 32 bit integer when purging.
 - Allow wrong reply to CWD from broken FTP server.
 - Don't get confused by badly nested script or blink tags.
 - Disallow the Accept-Encoding header on outgoing requests.
 - Make the URL-SPECIFICATION in the config file have lower case
   for protocol and host.
 - Modified the Meta refresh tag handling.
 - Fix FTP directory listings for files with ':' in them.
 -   and other bug fixes.

 - Added Russian and Polish translations of WWWOFFLE messages.

 - Updated FAQ.

5 files changed, 28 insertions, 29 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 7e473f4fa41..9253de9d158 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2000/02/21 03:10:34 fredb Exp $
+# $NetBSD: Makefile,v 1.17 2000/02/22 00:48:58 itohy Exp $
 
-DISTNAME=	wwwoffle-2.5c
+DISTNAME=	wwwoffle-2.5d
 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 b53988d4612..57e342f4e18 100644
--- a/www/wwwoffle/files/md5
+++ b/www/wwwoffle/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 2000/02/16 00:24:40 itohy Exp $
+$NetBSD: md5,v 1.7 2000/02/22 00:49:00 itohy Exp $
 
-MD5 (wwwoffle-2.5c.tgz) = 12c9805fdfbf72bc148f5540538c35c8
+MD5 (wwwoffle-2.5d.tgz) = 3f5670af7e02a14bd9ac274132b462b9
diff --git a/www/wwwoffle/files/patch-sum b/www/wwwoffle/files/patch-sum
index 5637c2e87e9..59222a00b4b 100644
--- a/www/wwwoffle/files/patch-sum
+++ b/www/wwwoffle/files/patch-sum
@@ -1,3 +1,11 @@
-$NetBSD: patch-sum,v 1.8 2000/02/21 03:10:35 fredb Exp $
+$NetBSD: patch-sum,v 1.9 2000/02/22 00:49:00 itohy Exp $
 
-MD5 (patch-aa) = af16dd909f44b6e741e566dcbc2b5616
+MD5 (patch-aa) = ad036eb618c0980b5d5350ccadbf563a
+MD5 (patch-ba) = 697b7cad9f1cd82c4b74da1317f4f987
+MD5 (patch-bb) = 06fd1d3b05e51f2594d97c4213b897ae
+MD5 (patch-bc) = 6bb173924ac901827f282fcdef72b71a
+MD5 (patch-bd) = 526ecc28c80aaaf26fd5fc34893a97fa
+MD5 (patch-be) = 0a1d40853dc4b1efaff7d96981efad2d
+MD5 (patch-bf) = 757112e555a41d0365eaaf85d177dadd
+MD5 (patch-bg) = 041ca5bbe12ab11e3fecce0d239c4528
+MD5 (patch-bh) = 1241dca0eb0e06a56ad2bee04c4b0591
diff --git a/www/wwwoffle/patches.v6/patch-bg b/www/wwwoffle/patches.v6/patch-bg
index 9255f67c570..d2ddf90633d 100644
--- a/www/wwwoffle/patches.v6/patch-bg
+++ b/www/wwwoffle/patches.v6/patch-bg
@@ -1,7 +1,7 @@
-$NetBSD: patch-bg,v 1.4 2000/02/16 00:24:41 itohy Exp $
+$NetBSD: patch-bg,v 1.5 2000/02/22 00:49:01 itohy Exp $
 
---- wwwoffled.c.orig	Sun Nov 28 01:16:39 1999
-+++ wwwoffled.c	Wed Feb 16 07:49:27 2000
+--- wwwoffled.c.orig	Wed Dec 29 05:05:15 1999
++++ wwwoffled.c	Tue Feb 22 08:34:12 2000
 @@ -50,8 +50,8 @@
  
  
@@ -13,7 +13,7 @@ $NetBSD: patch-bg,v 1.4 2000/02/16 00:24:41 itohy Exp $
  
  /*+ The online / offline /autodial status. +*/
  int online=0;
-@@ -172,12 +172,12 @@
+@@ -173,12 +173,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.4 2000/02/16 00:24:41 itohy Exp $
      PrintMessage(Fatal,"Cannot create WWWOFFLE server socket.");
  
   umask(0);
-@@ -212,20 +212,29 @@
+@@ -213,20 +213,29 @@
     {
      struct timeval tv;
      fd_set readfd;
@@ -66,7 +66,7 @@ $NetBSD: patch-bg,v 1.4 2000/02/16 00:24:41 itohy Exp $
  
      tv.tv_sec=10;
      tv.tv_usec=0;
-@@ -234,56 +243,62 @@
+@@ -235,56 +244,62 @@
  
      if(retval!=-1)
        {
@@ -178,7 +178,7 @@ $NetBSD: patch-bg,v 1.4 2000/02/16 00:24:41 itohy Exp $
      if(readconfig)
        {
         readconfig=0;
-@@ -372,9 +387,11 @@
+@@ -373,9 +388,11 @@
   while(!closedown);
  
   /* Close down and exit. */
diff --git a/www/wwwoffle/patches/patch-aa b/www/wwwoffle/patches/patch-aa
index fa79b7f7851..3b0da583239 100644
--- a/www/wwwoffle/patches/patch-aa
+++ b/www/wwwoffle/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2000/02/21 03:10:35 fredb Exp $
+$NetBSD: patch-aa,v 1.9 2000/02/22 00:49:00 itohy Exp $
 
---- Makefile.orig	Sat Dec 18 21:27:03 1999
-+++ Makefile	Wed Feb 16 07:46:20 2000
+--- Makefile.orig	Sat Jan 22 23:18:21 2000
++++ Makefile	Tue Feb 22 08:28:26 2000
 @@ -16,9 +16,9 @@
  
  LOCALHOST=localhost:8080
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.8 2000/02/21 03:10:35 fredb Exp $
  
  # For Cygwin (win32)
  #INSTDIR=/wwwoffle
-@@ -37,13 +37,13 @@
+@@ -43,13 +43,13 @@
  ########
  
  CC=gcc
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.8 2000/02/21 03:10:35 fredb Exp $
  
  # For HP/UX this is a good idea.
  #LDFLAGS=
-@@ -55,8 +55,8 @@
+@@ -61,8 +61,8 @@
  
  ########
  
@@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.8 2000/02/21 03:10:35 fredb Exp $
  
  # For Solaris you need the following instead.
  #LIBRARY=-lnsl -lsocket
-@@ -273,13 +273,13 @@
+@@ -279,13 +279,13 @@
  	$(INSTALL) -c -m 644 wwwoffle.conf.man.install $(INSTDIR)/man/man5/wwwoffle.conf.5
  	[ -x $(INSTDIR)/man/man8 ] || $(INSTALL) -d -m 755 $(INSTDIR)/man/man8
  	$(INSTALL) -c -m 644 wwwoffled.man $(INSTDIR)/man/man8/wwwoffled.8
@@ -59,16 +59,7 @@ $NetBSD: patch-aa,v 1.8 2000/02/21 03:10:35 fredb Exp $
  	  done )
  
  
-@@ -340,7 +340,7 @@
- # These two will fail unless you are root, that is OK because the owner is already you.
- 	-chown -R 0 $(SPOOLDIR)/html > /dev/null 2>&1
- 	-chgrp -R 0 $(SPOOLDIR)/html > /dev/null 2>&1
--	chmod -R o-rwx $(SPOOLDIR)/html
-+#	chmod -R o-rwx $(SPOOLDIR)/html
- 
- install_config :
- 	sed -e 's%SPOOLDIR%$(SPOOLDIR)%' -e 's%CONFDIR%$(CONFDIR)%' < wwwoffle.conf > wwwoffle.conf.install
-@@ -354,7 +354,7 @@
+@@ -359,7 +359,7 @@
  	[    -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf
  
  install_fixup-win32: