Update wwwoffle to version 2.6d. From the "NEWS" file...

Bug Fixes:
 Fix pagination problem in wwwoffled manual page.  Fix core dump with missing
 DontCompress section.  Fix error with convert-cache and uncompress-cache
 programs not recognising valid configuration items.  Fix harmless buffer
 overrun.  Improve the URL decoded strings displayed in indexes.  Don't complain
 about empty directory when installing.  Canonicalise the pathname in URLs.
 Compile on __bsdi__ systems.  Convert decimal IP addresses to dotted-quad.
 Add support for compilation on Apple OS X.  Enable HTML modifications on URLs
 with error status.  Use a case-insensitive check when censoring headers.  Fix
 up HTML to that it validates with an SGML checker.

New Features:
 Added IPv6 support.
 Added bind-ipv4 and bind-ipv6 options to specify local IP address to bind to.
 Added 'random' sort order option for indexes.
 Made index sorting use alphabetical as a secondary sort.
 Added HTTP/1.1 'Cache-Control: max-age=..' header handling (same as 'Expires').

Translations:
 Updated the Russian translations of the WWWOFFLE messages.

4 files changed, 52 insertions, 26 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 9d7122553c4..b3bd1a10269 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,16 +1,12 @@
-# $NetBSD: Makefile,v 1.30 2001/04/22 06:44:39 fredb Exp $
+# $NetBSD: Makefile,v 1.31 2001/08/14 04:51:46 fredb Exp $
 
-DISTNAME=	wwwoffle-2.6c
+DISTNAME=	wwwoffle-2.6d
 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-26b-v6-20010411.diff.gz
-PATCH_SITES+=	ftp://ftp.kame.net/pub/kame/misc/
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gedanken.demon.co.uk/wwwoffle/
 COMMENT=	WWW proxy with support for offline browsing
@@ -24,6 +20,12 @@ BUILD_DEFS+=	USE_INET6
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${USE_INET6} == "YES"
+MAKE_ENV+=	USE_IPV6=1
+.else
+MAKE_ENV+=	USE_IPV6=0
+.endif
+
 .if ${OPSYS} == "SunOS"
 MAKE_ENV+=	LIBRARY="-lnsl -lsocket"
 .endif
diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo
index b958d0a328d..3cb011679be 100644
--- a/www/wwwoffle/distinfo
+++ b/www/wwwoffle/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/22 06:44:39 fredb Exp $
+$NetBSD: distinfo,v 1.3 2001/08/14 04:51:46 fredb Exp $
 
-SHA1 (wwwoffle-2.6c.tgz) = 8b7cc755879a83d51e9638b0b27fa46cd37859e2
-Size (wwwoffle-2.6c.tgz) = 612183 bytes
-SHA1 (wwwoffle-26b-v6-20010411.diff.gz) = f3723cdf6ba9dbb09c8ec783f34ada669d541ba1
-Size (wwwoffle-26b-v6-20010411.diff.gz) = 7970 bytes
-SHA1 (patch-aa) = 7fea88afd536c6e983003799d17aacd8a76471d8
+SHA1 (wwwoffle-2.6d.tgz) = abb7cdfb03dfffb3ae777753938068c25e390c63
+Size (wwwoffle-2.6d.tgz) = 645469 bytes
+SHA1 (patch-aa) = ff6a4f4386a0894a941021340c56aa112c7b7b50
 SHA1 (patch-ab) = eea97a0501c515d9100269ee6da16998905cd694
+SHA1 (patch-ac) = aeb866286d00a3012c2a78967d1c1064a9182da1
diff --git a/www/wwwoffle/patches/patch-aa b/www/wwwoffle/patches/patch-aa
index 76e29de9785..33bd0bcb5b5 100644
--- a/www/wwwoffle/patches/patch-aa
+++ b/www/wwwoffle/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.13 2001/04/22 06:37:38 fredb Exp $
+$NetBSD: patch-aa,v 1.14 2001/08/14 04:51:46 fredb Exp $
 
---- Makefile.orig	Mon Apr  2 16:48:09 2001
-+++ Makefile	Mon Apr  2 16:50:24 2001
+--- Makefile.orig	Tue May 29 13:29:03 2001
++++ Makefile
 @@ -18,11 +18,11 @@
  LOCALHOST=localhost:8080
  
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.13 2001/04/22 06:37:38 fredb Exp $
  
  # For Cygwin (win32).
  #INSTDIR=/wwwoffle
-@@ -51,13 +51,13 @@
+@@ -54,13 +54,13 @@
  ########
  
  CC=gcc
@@ -34,9 +34,14 @@ $NetBSD: patch-aa,v 1.13 2001/04/22 06:37:38 fredb Exp $
  
  # For HP/UX this is a good idea.
  #LDFLAGS=
-@@ -82,8 +82,8 @@
- # The option to not use zlib for compression.
- #USE_ZLIB=0
+@@ -89,12 +89,12 @@
+ #USE_IPV6=1
+ 
+ # The option to use IPv6 sockets if required.
+-USE_IPV6=0
++#USE_IPV6=0
+ 
+ ########
  
 -INCLUDE=
 -LIBRARY=-lz
@@ -45,7 +50,7 @@ $NetBSD: patch-aa,v 1.13 2001/04/22 06:37:38 fredb Exp $
  
  # To compile without zlib
  #LIBRARY=
-@@ -153,7 +153,7 @@
+@@ -167,7 +167,7 @@
  	     configfile.o config.o errors.o io.o misc.o proto.o sockets.o md5.o
  
  wwwoffle : $(WWWOFFLE_OBJ)
@@ -54,7 +59,7 @@ $NetBSD: patch-aa,v 1.13 2001/04/22 06:37:38 fredb Exp $
  
  ####
  
-@@ -165,7 +165,7 @@
+@@ -179,7 +179,7 @@
  	      configfile.o config.o errors.o io.o misc.o proto.o sockets.o md5.o
  
  wwwoffled : $(WWWOFFLED_OBJ)
@@ -63,7 +68,7 @@ $NetBSD: patch-aa,v 1.13 2001/04/22 06:37:38 fredb Exp $
  
  ####
  
-@@ -176,7 +176,7 @@
+@@ -190,7 +190,7 @@
  	           configfile.o config.o errors.o io.o misc.o proto.o sockets.o md5.o
  
  wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ)
@@ -72,8 +77,8 @@ $NetBSD: patch-aa,v 1.13 2001/04/22 06:37:38 fredb Exp $
  
  ####
  
-@@ -184,7 +184,7 @@
- 	    configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o spool.o md5.o
+@@ -200,7 +200,7 @@
+ 	    configfile.o config.o errors.o io.o misc.o proto.o sockets.o spool.o md5.o
  
  convert-cache : $(CONVERT_OBJ)
 -	$(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY)
@@ -81,8 +86,8 @@ $NetBSD: patch-aa,v 1.13 2001/04/22 06:37:38 fredb Exp $
  
  ####
  
-@@ -193,7 +193,7 @@
- 	       configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o spool.o md5.o
+@@ -210,7 +210,7 @@
+ 	       configfile.o config.o errors.o io.o misc.o proto.o sockets.o spool.o md5.o
  
  uncompress-cache : $(UNCOMPRESS_OBJ)
 -	$(LINK) $(UNCOMPRESS_OBJ) -o $@ $(LIBRARY)
diff --git a/www/wwwoffle/patches/patch-ac b/www/wwwoffle/patches/patch-ac
new file mode 100644
index 00000000000..cd047462075
--- /dev/null
+++ b/www/wwwoffle/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1 2001/08/14 04:51:46 fredb Exp $
+
+--- sockets6.c.orig	Mon Aug 13 23:16:47 2001
++++ sockets6.c
+@@ -507,9 +507,12 @@
+  struct sigaction action;
+  static char _host[NI_MAXHOST],_ip[46],_port[12];
+ 
+- *host="(unknown)";
+- *ip="(unknown)";
+- *port="0";
++ if(host)
++   *host="(unknown)";
++ if(ip)
++   *ip="(unknown)";
++ if(port)
++   *port="0";
+ 
+ start:
+