upgrade to 2.6. pull IPv6 patch from ftp.kame.net (maintenance reason)

Version 2.6 of WWWOFFLE released : Sat Nov 18 19:15:00 2000
-----------------------------------------------------------

Bug Fixes:
 Improve HTML modification for unterminated tags.  Allow passworded pages to be
 fetched.  Improve compilation on non-Linux systems.  Fix bug with proxy config
 file entry.  Fix an error with not truncating files.  Fix an error with
 dir-perm and file-perm.  Fix problem when getting pages with passwords.  Fix
 problem deleting pages with passwords.

Documentation
 Added a note to the FAQ about DoS attacks and ipchains.


*NOTE* If upgrading from version 2.[2345] then you will need to convert your
       cache to the new format, see the file CONVERT for details.

*NOTE* If upgrading from version 2.4[abc] the max-size option in the Purge
       section of the configuration file has changed.  See CHANGES.CONF.

*NOTE* If upgrading from version 2.[123] the setting of the times of monitoring
       URLs has changed, check the monitor index and correct where needed.

*NOTE* If upgrading from version 1.x or 2.[01] then you will need to delete
       your cache since conversion from those formats is no longer provided.


Version 2.6-beta of WWWOFFLE released : Sun Oct 22 10:30:00 2000
----------------------------------------------------------------

Bug Fixes:
 Handle usernames specified in URLs including the '@' character.  Fix problems
 deleting URLs with arguments.  Fix bug with recursive fetching in same dir.
 Retry the select system call if it is interrupted.

Win32 Bug Fixes:
 Fix for local web-pages not being opened in binary mode.  Compilation fixes.

Internal Changes:
 Re-examined all URL-encoding and URL-decoding issues (small cache change).
 Ensure that the canonical form of the URL is used throughout.
 Changed the URLs in the indexes for monitor, delete & refresh.

Documentation
 Re-written the README.CONF file with new layout and more information.
 Added three more questions to the FAQ and updated several others.

Configuration File
 Allow many of the configuration file options be selectable on a URL by URL basis.
 Move some configuration file options around and create some new sections.
 Allow purge ages to be specified in larger units (weeks, months, years).
 Allow re-request times to be specified in larger units (minutes, hours, days).

New Configuration Options
 Add the ability to demoronise HTML (replace bogus characters with real ones).
 Add the ability to remove meta refresh tags that redirect browsers.
 Added the option to convert redirections to DontGet pages to errors.
 Allow the HTML modifications to happen to pages viewed when online.
 Add timeouts to DNS lookups to stop WWWOFFLE servers hanging up.
 Add the option to enable the use of lock files (defaults to disabled).

New Features
 Remove the index of the latest pages (was slow on big caches).
 Add an index of the pages that were in the outgoing directory last time.
 Change the don't cache option so that pages are not requested when offline.
 Allow password protected URLs to be deleted.
 Aliased pages now use a redirect rather than re-writing the URL.
 Make it safe to have symlinks in the cache.

Searching
 Changed the ht://Dig search URLs in WWWOFFLE from /htdig/* to /search/htdig/*.
 Allow the use of UdmSearch instead of ht://Dig.

Contrib
 Improved the audit-usage.pl script to show cache hit/miss status for requests.

1 files changed, 8 insertions, 16 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 50b0767506d..216d5cd3c8b 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,11 +1,16 @@
-# $NetBSD: Makefile,v 1.19 2000/08/07 08:27:37 fredb Exp $
+# $NetBSD: Makefile,v 1.20 2000/11/20 05:12:38 itojun Exp $
 
-DISTNAME=	wwwoffle-2.5e
+DISTNAME=	wwwoffle-2.6
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.demon.co.uk/pub/unix/httpd/ \
+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-26-v6-20001120.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/
 
@@ -17,25 +22,12 @@ PLIST_SRC=	${WRKDIR}/PLIST
 
 BUILD_DEFS+=	USE_INET6
 
-# to get USE_INET6
 .include "../../mk/bsd.prefs.mk"
 
-# IPv6 support
-.if defined(USE_INET6) && ${USE_INET6} == YES
-PATCHDIR=       ${WRKDIR}/.patches
-.endif
-
 .if ${OPSYS} == "SunOS"
 MAKE_ENV+=	LIBRARY="-lnsl -lsocket"
 .endif
 
-pre-patch:
-.if defined(USE_INET6) && ${USE_INET6} == YES
-	${MKDIR} ${WRKDIR}/.patches
-	${CP} ${.CURDIR}/patches/patch-* ${WRKDIR}/.patches
-	${CP} ${.CURDIR}/patches.v6/patch-* ${WRKDIR}/.patches
-.endif
-
 post-build:
 	cd ${WRKSRC}/html/htdig/scripts; \
 	for f in wwwoffle-ht*; do \