Update wwwoffle to 2.6a:

Bug Fixes:
 Fix crash with invalid entries in config file.  Handle some invalid URL
 encodings that servers/clients use.  Stop crashes when monitoring illegal
 refresh URLs.  Handle malformed headers better.  Check the DontGet section of
 the configuration file when doing SSL.  Print error messages when starting on
 stderr.  Read the configuration file if using wwwoffle-write.  Fix bug with
 form argument parsing.  Set fetch-stylesheets to true in the default config
 file.  Bug fixes for modifying HTML with meta refresh tags.  Stop duplicated
 items in the configuration file.

Win32 Bug Fixes:
 Fixed logfile opening problem. Added a fchdir() function for cygwin.
 Workaround cygwin socket closing problem. Change the makefile for cygwin
 installation (don't auto install .dll or .bat).

Documentation
 Updated the Welcome.html page to include more links to useful information.
 Include an HTML version of README.CONF in the html directory.
 Updated several README files and INSTALL file.


*NOTE* The default location of the replacement .gif file for the DontGet section
       has changed, upgrade-config.pl should fix wwwoffle.conf automatically.

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

NetBSD package changes:

- - Install upgrade-config-2.x-2.5.pl (as wwwoffle-upgrade-config-2.x-2.5.pl).
- - Protect convert-cache the same way as upgrade-config -- prefix with wwwoffle-.
- - Update MESSAGE file accordingly.

4 files changed, 23 insertions, 16 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index c5b2437b5ec..593b45ddcb2 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.27 2001/03/12 18:05:24 fredb Exp $
+# $NetBSD: Makefile,v 1.28 2001/03/12 19:08:37 fredb Exp $
 
-DISTNAME=	wwwoffle-2.6
+DISTNAME=	wwwoffle-2.6a
 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-26-v6-20001121b.diff.gz
+PATCHFILES+=	wwwoffle-26a-v6-20010312.diff.gz
 PATCH_SITES+=	ftp://ftp.kame.net/pub/kame/misc/
 PATCH_DIST_STRIP=	-p1
 
@@ -56,8 +56,12 @@ post-install:
 	  ${CP} -p ${PREFIX}/etc/wwwoffle/wwwoffle.conf \
 	    ${PREFIX}/etc/wwwoffle/wwwoffle.conf.default; \
 	fi
-	${INSTALL_PROGRAM} ${WRKSRC}/convert-cache ${PREFIX}/sbin/convert-cache
-	${INSTALL_SCRIPT} ${WRKSRC}/upgrade-config.pl ${PREFIX}/sbin/wwwoffle-upgrade-config.pl
+	${INSTALL_PROGRAM} ${WRKSRC}/convert-cache \
+	  ${PREFIX}/sbin/wwwoffle-convert-cache
+	${INSTALL_SCRIPT} ${WRKSRC}/upgrade-config.pl \
+	  ${PREFIX}/sbin/wwwoffle-upgrade-config.pl
+	${INSTALL_SCRIPT} ${WRKSRC}/upgrade-config-2.x-2.5.pl \
+	  ${PREFIX}/sbin/wwwoffle-upgrade-config-2.x-2.5.pl
 	${INSTALL_SCRIPT} ${WRKDIR}/wwwoffle.sh ${PREFIX}/etc/rc.d/wwwoffle
 	${INSTALL_SCRIPT} ${WRKDIR}/wwwoffled ${PREFIX}/etc/rc.d
 	# directories other than html are automatically created at run time
@@ -70,7 +74,7 @@ post-install:
 	@${ECHO} If your are upgrading from an older version of wwwoffle,
 	@${ECHO} your cache will not be converted automatically. Please do
 	@${ECHO} so by executing the command
-	@${ECHO} \"${PREFIX}/libexec/convert-cache /var/wwwoffle\".
+	@${ECHO} \"${PREFIX}/libexec/wwwoffle-convert-cache /var/wwwoffle\".
 	@${ECHO}
 	@${ECHO} ==+===+===+===+===+===+===+===+===+===+===+===+===+===+===+=
 	@${ECHO}
diff --git a/www/wwwoffle/files/md5 b/www/wwwoffle/files/md5
index 91ef1f4df66..1ac6898d2d7 100644
--- a/www/wwwoffle/files/md5
+++ b/www/wwwoffle/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.10 2000/11/21 01:11:19 itojun Exp $
+$NetBSD: md5,v 1.11 2001/03/12 19:08:37 fredb Exp $
 
-MD5 (wwwoffle-2.6.tgz) = 40360860c6f57c27316f1a6efcc90457
-MD5 (wwwoffle-26-v6-20001121b.diff.gz) = fe85131408f2c41eed4f3734fed61a88
+SHA1 (wwwoffle-2.6a.tgz) = 93e8a9d0e713cfef8e0eadddd49d1bbf13f0e4f6
+SHA1 (wwwoffle-26a-v6-20010312.diff.gz) = e2ccf0002ad08f358c3ee9086a868656af7c1e03
diff --git a/www/wwwoffle/pkg/MESSAGE b/www/wwwoffle/pkg/MESSAGE
index 2b6a20c525a..dd37b6a26b2 100644
--- a/www/wwwoffle/pkg/MESSAGE
+++ b/www/wwwoffle/pkg/MESSAGE
@@ -1,5 +1,5 @@
 ======================================================================
-$NetBSD: MESSAGE,v 1.7 2001/03/12 18:08:32 fredb Exp $
+$NetBSD: MESSAGE,v 1.8 2001/03/12 19:08:37 fredb Exp $
 
 1) To enable "wwwwoffled" to start on boot on NetBSD-1.5 or newer,
 please copy "${PREFIX}/etc/rc.d/wwwoffled" to "/etc/rc.d/" and add
@@ -12,9 +12,10 @@ fi
 
 2) If this was an upgrade, your cache may have been converted and
 re-indexed automatically. If not, you may do so by executing the
-command "${PREFIX}/sbin/convert-cache /var/wwwoffle". To upgrade
-your wwwoffle.conf file, try the perl script
-"${PREFIX}/sbin/wwwoffle-upgrade-config.pl".
+command "${PREFIX}/sbin/wwwoffle-convert-cache /var/wwwoffle". To
+upgrade your wwwoffle.conf file, try the perl script
+"${PREFIX}/sbin/wwwoffle-upgrade-config.pl", and also 
+"${PREFIX}/sbin/wwwoffle-upgrade-config-2.x-2.5.pl", if required.
 
 3) The hooks are present to to use the package version of "htdig",
 if installed, to serve a searchable index of your cached pages.
diff --git a/www/wwwoffle/pkg/PLIST b/www/wwwoffle/pkg/PLIST
index 1349bbff01e..5314602a45a 100644
--- a/www/wwwoffle/pkg/PLIST
+++ b/www/wwwoffle/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2001/03/12 18:05:25 fredb Exp $
+@comment $NetBSD: PLIST,v 1.11 2001/03/12 19:08:37 fredb Exp $
 bin/wwwoffle
 bin/wwwoffle-ls
 bin/wwwoffle-mv
@@ -14,8 +14,9 @@ libdata/wwwoffle-spool.tar.gz
 man/man1/wwwoffle.1
 man/man5/wwwoffle.conf.5
 man/man8/wwwoffled.8
-sbin/convert-cache
+sbin/wwwoffle-convert-cache
 sbin/wwwoffle-upgrade-config.pl
+sbin/wwwoffle-upgrade-config-2.x-2.5.pl
 sbin/wwwoffled
 share/doc/wwwoffle/CHANGES.CONF
 share/doc/wwwoffle/CONVERT
@@ -32,6 +33,7 @@ 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
@@ -39,7 +41,7 @@ share/doc/wwwoffle/README.win32
 @exec ${MKDIR} /var/wwwoffle/monitor
 @exec ${MKDIR} /var/wwwoffle/lastime
 @exec ${MKDIR} /var/wwwoffle/prevtime1
-@exec ${PREFIX}/sbin/convert-cache /var/wwwoffle
+@exec ${PREFIX}/sbin/wwwoffle-convert-cache /var/wwwoffle
 @unexec cd /var/wwwoffle && rm -rf html*
 @unexec rmdir /var/wwwoffle/* 2>/dev/null && rmdir /var/wwwoffle 2>/dev/null || true
 @unexec if [ -d /var/wwwoffle ]; then echo "If you won't use the WWWOFFLE package anymore, remove the cache manually by"; echo '	rm -rf /var/wwwoffle'; fi