upgrade to 2.6b + IPv6 patch.

Version 2.6b of WWWOFFLE released : Sat Mar 24 14:30:00 2001
------------------------------------------------------------

Bug Fixes:
 HTML parsing optimisations.  HTML parser memory leak fixed.  Fix stylesheet
 link parser.  Stop cached pages containing trailing junk.  Fixed wwwoffle
 manual page quote character bug.  Fix problems parsing parameter strings in
 URLs.  Fix ssl-allow-port config file parsing.

Win32 Bug Fixes:
 Fixed the socket closing code.

Documentation:
 Updated the README.win32 file.
 Updated FAQ to version 2.6.
 Updated French translated pages.
 Added a README.compress that describes the compression problems and solutions.

New Features:
 Request data from servers is sent compressed, config option (see zlib note).
 Reply to client with compressed data if asked, config option (see zlib note).
 Compress the files in the cache when purging, based on age (see zlib note).
 Allow fetching in autodial mode as well as online mode.


*NOTE* The use of zlib to enable compression should be considered a beta quality
       feature in this version.  It requires the zlib library to compile it.

*NOTE* If upgrading from a version < 2.6a then see the notes for version 2.6a.

5 files changed, 71 insertions, 51 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 593b45ddcb2..5474bc35dce 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.28 2001/03/12 19:08:37 fredb Exp $
+# $NetBSD: Makefile,v 1.29 2001/04/13 13:46:34 itojun Exp $
 
-DISTNAME=	wwwoffle-2.6a
+DISTNAME=	wwwoffle-2.6b
 CATEGORIES=	www
 MASTER_SITES=	http://www.gedanken.demon.co.uk/download-wwwoffle/ \
 		ftp://ftp.demon.co.uk/pub/unix/httpd/ \
 		${MASTER_SITE_SUNSITE:=apps/www/servers/}
 EXTRACT_SUFX=	.tgz
 
-PATCHFILES+=	wwwoffle-26a-v6-20010312.diff.gz
+PATCHFILES+=	wwwoffle-26b-v6-20010411.diff.gz
 PATCH_SITES+=	ftp://ftp.kame.net/pub/kame/misc/
 PATCH_DIST_STRIP=	-p1
 
diff --git a/www/wwwoffle/files/md5 b/www/wwwoffle/files/md5
index 1ac6898d2d7..6ac2c90db31 100644
--- a/www/wwwoffle/files/md5
+++ b/www/wwwoffle/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.11 2001/03/12 19:08:37 fredb Exp $
+$NetBSD: md5,v 1.12 2001/04/13 13:46:35 itojun Exp $
 
-SHA1 (wwwoffle-2.6a.tgz) = 93e8a9d0e713cfef8e0eadddd49d1bbf13f0e4f6
-SHA1 (wwwoffle-26a-v6-20010312.diff.gz) = e2ccf0002ad08f358c3ee9086a868656af7c1e03
+SHA1 (wwwoffle-2.6b.tgz) = 317af0392777ce5aaac2d4c0f1a83130e62af6b5
+SHA1 (wwwoffle-26b-v6-20010411.diff.gz) = f3723cdf6ba9dbb09c8ec783f34ada669d541ba1
diff --git a/www/wwwoffle/files/patch-sum b/www/wwwoffle/files/patch-sum
index c3dd5b159dd..d68dfef8b44 100644
--- a/www/wwwoffle/files/patch-sum
+++ b/www/wwwoffle/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.12 2001/03/12 18:05:25 fredb Exp $
+$NetBSD: patch-sum,v 1.13 2001/04/13 13:46:35 itojun Exp $
 
-SHA1 (patch-aa) = fa1002e65a41690cd1df1e488014470e94097f7f
+SHA1 (patch-aa) = eabce7af920ab141c9cbb7699bd278d0fc10bf56
diff --git a/www/wwwoffle/patches/patch-aa b/www/wwwoffle/patches/patch-aa
index 5e84d3a0189..307a07eb01a 100644
--- a/www/wwwoffle/patches/patch-aa
+++ b/www/wwwoffle/patches/patch-aa
@@ -1,21 +1,22 @@
-$NetBSD: patch-aa,v 1.11 2000/11/20 05:12:38 itojun Exp $
-
---- Makefile.orig	Sun Oct 22 03:32:41 2000
-+++ Makefile	Mon Nov 20 13:03:42 2000
-@@ -16,9 +16,9 @@
- 
+--- Makefile.orig	Mon Apr  2 16:48:09 2001
++++ Makefile	Mon Apr  2 16:50:24 2001
+@@ -18,11 +18,11 @@
  LOCALHOST=localhost:8080
  
+ # For UNIX.
 -INSTDIR=/usr/local
 -SPOOLDIR=/var/spool/wwwoffle
 -CONFDIR=/var/spool/wwwoffle
 +INSTDIR=${PREFIX}
 +SPOOLDIR=/var/wwwoffle
 +CONFDIR=${PREFIX}/etc/wwwoffle
+ MANDIR=$(INSTDIR)/man
+-DOCDIR=$(INSTDIR)/doc/wwwoffle
++DOCDIR=$(INSTDIR)/share/doc/wwwoffle
  
  # For Cygwin (win32).
  #INSTDIR=/wwwoffle
-@@ -46,13 +46,13 @@
+@@ -51,13 +51,13 @@
  ########
  
  CC=gcc
@@ -31,40 +32,59 @@ $NetBSD: patch-aa,v 1.11 2000/11/20 05:12:38 itojun Exp $
  
  # For HP/UX this is a good idea.
  #LDFLAGS=
-@@ -71,8 +71,8 @@
- 
- ########
+@@ -82,8 +82,8 @@
+ # The option to not use zlib for compression.
+ #USE_ZLIB=0
  
 -INCLUDE=
--LIBRARY=
+-LIBRARY=-lz
 +#INCLUDE=
-+#LIBRARY=
- 
- # For Solaris you need the following instead.
- #LIBRARY=-lnsl -lsocket
-@@ -280,13 +280,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
--	[ -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* ; do \
--	  $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file ;\
-+	  $(INSTALL) -c -m 644 $$file $(INSTDIR)/share/doc/wwwoffle/$$file ;\
- 	done
- 	[ "x$(LANG)" = "x" ] || [ ! -d lang-$(LANG) ] || ( cd lang-$(LANG) && \
- 	  for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* ; do \
--	    [ ! -f $$file ] || $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file-$(LANG) ;\
-+	    [ ! -f $$file ] || $(INSTALL) -c -m 644 $$file $(INSTDIR)/share/doc/wwwoffle/$$file-$(LANG) ;\
- 	  done )
- 
- 
-@@ -360,7 +360,7 @@
- 	[    -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf
- 
- install_fixup-win32:
--	for file in $(INSTDIR)/doc/* $(CONFDIR)/README.win32 ; do \
-+	for file in $(INSTDIR)/share/doc/* $(CONFDIR)/README.win32 ; do \
- 	  [ -f $$file ] && awk '{print $$0 "\r";}' < $$file > $$file.txt && rm -f $$file ;\
- 	done
- 	rm -f $(SPOOLDIR)/html/index.html && ln $(SPOOLDIR)/html/Welcome.html $(SPOOLDIR)/html/index.html
++#LIBRARY=-lz
+ 
+ # To compile without zlib
+ #LIBRARY=
+@@ -153,7 +153,7 @@
+ 	     configfile.o config.o errors.o io.o misc.o proto.o sockets.o md5.o
+ 
+ wwwoffle : $(WWWOFFLE_OBJ)
+-	$(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY)
++	$(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY) -lz
+ 
+ ####
+ 
+@@ -165,7 +165,7 @@
+ 	      configfile.o config.o errors.o io.o misc.o proto.o sockets.o md5.o
+ 
+ wwwoffled : $(WWWOFFLED_OBJ)
+-	$(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY)
++	$(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY) -lz
+ 
+ ####
+ 
+@@ -176,7 +176,7 @@
+ 	           configfile.o config.o errors.o io.o misc.o proto.o sockets.o md5.o
+ 
+ wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ)
+-	$(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY)
++	$(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY) -lz
+ 
+ ####
+ 
+@@ -184,7 +184,7 @@
+ 	    configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o spool.o md5.o
+ 
+ convert-cache : $(CONVERT_OBJ)
+-	$(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY)
++	$(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY) -lz
+ 
+ ####
+ 
+@@ -193,7 +193,7 @@
+ 	       configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o spool.o md5.o
+ 
+ uncompress-cache : $(UNCOMPRESS_OBJ)
+-	$(LINK) $(UNCOMPRESS_OBJ) -o $@ $(LIBRARY)
++	$(LINK) $(UNCOMPRESS_OBJ) -o $@ $(LIBRARY) -lz
+ 
+ ####
+ 
diff --git a/www/wwwoffle/pkg/PLIST b/www/wwwoffle/pkg/PLIST
index 5314602a45a..70dc0dfe274 100644
--- a/www/wwwoffle/pkg/PLIST
+++ b/www/wwwoffle/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2001/03/12 19:08:37 fredb Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/04/13 13:46:35 itojun Exp $
 bin/wwwoffle
 bin/wwwoffle-ls
 bin/wwwoffle-mv
@@ -29,11 +29,11 @@ share/doc/wwwoffle/README.1st
 share/doc/wwwoffle/README.CONF
 share/doc/wwwoffle/README.PWD
 share/doc/wwwoffle/README.URL
+share/doc/wwwoffle/README.compress
 share/doc/wwwoffle/README.htdig
 share/doc/wwwoffle/README.lang
 share/doc/wwwoffle/README.udmsearch
 share/doc/wwwoffle/README.win32
-share/doc/wwwoffle/README-CONF-html.pl
 @dirrm share/doc/wwwoffle
 @exec ${GTAR} xzCf / %D/libdata/wwwoffle-spool.tar.gz
 @exec cd /var/wwwoffle/html && mv wwwoffle.pac wwwoffle.pac.dist && sed /PROXY/s/localhost/`hostname`/ <wwwoffle.pac.dist >wwwoffle.pac