Update to V3.1.5 because of security problems in 3.1.4.

Changes:
   * Fixed a nasty security hole in htsearch, which would allow users to
     view any file on your site that had read permission.
   * Fixed a bug that could cause problems with 8-bit characters on some
     systems.
   * Made some attempts to get htsearch's output to be more HTML 4.0
     compliant. It quotes all HTML tag parameters, and uses ";" instead of
     "&" as parameter separator in URLs for next pages. Reserved characters
     in parameters are now encoded.
   * Fixed handling of SGML entities: htdig will still decode them to store
     as single characters in the database, but htsearch now encodes some of
     them back for compliant results.
   * Added two new formats for variables in htsearch templates, $%(var),
     which escapes the variable for a URL, and $&(var), which HTML-escapes
     the variable as necessary.
   * Fixed htdig's handling of robots.txt, such that only the first
     applicable User-agent field bearing its name will be used, rather than
     only the last.
   * Fixed htdig's handling of servers that return 2-digit years.
   * Fixed handling of embedded quotes in quoted string lists.
   * Fixed handling of relative URLs with trailing ".." or leading "//".
   * Fixed handling of the valid_extensions attribute, which sometimes
     failed in the previous version.
   * Enhanced the handling of local filesystem indexing with the local_urls,
     local_user_urls or local_default_doc attributes, which now allow
     multiple directory or file names to be tried.
   * Added the build_select_lists attribute to allow the config file to
     specify <select> form elements in htsearch output as a template
     variable, much like $(SORT) and $(METHOD).
   * Added support for two additional configuration attributes:
     max_keywords, and nph.
   * A variety of other bug fixes, and many documentation updates. See the
     ChangeLog for details.

4 files changed, 23 insertions, 23 deletions

diff --git a/www/htdig/Makefile b/www/htdig/Makefile
index fb4575c15ef..e6f63bc2e5d 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2000/01/26 02:32:35 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2000/02/29 23:31:32 hubertf Exp $
 #
 
-DISTNAME=	htdig-3.1.4
+DISTNAME=	htdig-3.1.5
 CATEGORIES=	www databases
-MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/www/indexing/} \
-		http://www.htdig.org/files/
+MASTER_SITES=	http://www.htdig.org/files/ \
+		ftp://ftp.htdig.org/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.htdig.org/
diff --git a/www/htdig/files/md5 b/www/htdig/files/md5
index c97d6ae9b12..c8b6523706b 100644
--- a/www/htdig/files/md5
+++ b/www/htdig/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/01/26 02:32:35 fredb Exp $
+$NetBSD: md5,v 1.4 2000/02/29 23:31:33 hubertf Exp $
 
-MD5 (htdig-3.1.4.tar.gz) = 232d94f611545db64dbb747d84fd2a8b
+MD5 (htdig-3.1.5.tar.gz) = cbf4a0f2b703d9822db555a14dc96ed3
diff --git a/www/htdig/pkg/MESSAGE b/www/htdig/pkg/MESSAGE
index 62c1f70a511..9503eb70e0d 100644
--- a/www/htdig/pkg/MESSAGE
+++ b/www/htdig/pkg/MESSAGE
@@ -1,9 +1,10 @@
-A sample ht://Dig config file has been installed to @PREFIX@/etc/htdig/htdig.conf, 
-unless that file existed already. The sample @PREFIX@/bin/rundig script may be run 
-to create a database in the newly created empty directory, /var/db/htdig. 
-A sample search form, which may be used to search that database, has been 
-installed to @PREFIX@/share/examples/htdig/search.html.
+A sample ht://Dig config file has been installed to
+@PREFIX@/etc/htdig/htdig.conf, unless that file existed already.
+The sample @PREFIX@/bin/rundig script may be run to create a database
+in the newly created empty directory, /var/db/htdig. A sample search
+form, which may be used to search that database, has been installed to
+@PREFIX@/share/examples/htdig/search.html.
 
 For an example of how to set up ht://Dig and integrate it with your web site, 
-you may wish to examine the scripts installed into /var/wwwoffle/html/htdig/scripts 
-by the www/wwwoffle package.
+you may wish to examine the scripts installed into
+/var/wwwoffle/html/htdig/scripts by the www/wwwoffle package.
diff --git a/www/htdig/pkg/PLIST b/www/htdig/pkg/PLIST
index fe953248ae6..6e3927704ee 100644
--- a/www/htdig/pkg/PLIST
+++ b/www/htdig/pkg/PLIST
@@ -1,13 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 1999/10/05 19:25:55 fredb Exp $
-bin/htdig
+@comment $NetBSD: PLIST,v 1.4 2000/02/29 23:31:34 hubertf Exp $
 bin/htfuzzy
+bin/htdig
 bin/htmerge
 bin/htnotify
 bin/rundig
-libexec/cgi-bin/htsearch
-@unexec (rmdir libexec/cgi-bin 2>/dev/null >/dev/null) || true
-share/examples/htdig/search.html
 share/examples/htdig/htdig.conf
+share/examples/htdig/search.html
 share/examples/htdig/button1.gif
 share/examples/htdig/button2.gif
 share/examples/htdig/button3.gif
@@ -38,8 +36,6 @@ share/examples/htdig/button10.png
 share/examples/htdig/htdig.png
 share/examples/htdig/star.png
 share/examples/htdig/star_blank.png
-@dirrm share/examples/htdig
-@exec mkdir -p %D/etc/htdig; if [ ! -f %D/etc/htdig/htdig.conf ]; then cp %D/%F %D/etc/htdig/; fi
 share/htdig/common/header.html
 share/htdig/common/footer.html
 share/htdig/common/wrapper.html
@@ -52,9 +48,12 @@ share/htdig/common/english.0
 share/htdig/common/english.aff
 share/htdig/common/synonyms
 share/htdig/common/synonyms.db
-share/htdig/common/word2root.db
 share/htdig/common/root2word.db
+share/htdig/common/word2root.db
+etc/htdig/htdig.conf
+libexec/cgi-bin/htsearch
 @dirrm share/htdig/common
 @dirrm share/htdig
-@exec mkdir -p /var/db/htdig
-@unexec (rm -rf /var/db/htdig) || true
+@dirrm share/examples/htdig
+@dirrm libexec/cgi-bin
+@dirrm etc/htdig