update to 1.3.19 with IPv6 patch.

--- from apache/Announcements
                         Apache 1.3.19  Major changes

   The primary security fix is:
     * The default installation could lead mod_negotiation and mod_dir or
       mod_autoindex to display a directory listing instead of the
       multiview'ed index.html.* files, if a very long path was created
       artificially by using many slashes.  Now 403 FORBIDDEN is returned.

   The bug fixes are:
     * The ServerRoot directive now removes trailing slashes.
     * Restore functionality broken by the mod_rewrite security fix:
       The mod_rewrite string arithmetic is corrected for rewrite map.
     * Some possible segfault conditions have been fixed.
     * Under certain circumstances, Apache did not supply the
       right response headers when requiring authentication.

   The main new features include:
     * New configuration error reporting if the UserDir argument is set
       to a relative path on Win32 or Netware [which do not support home
       directories], or a relative path on any platform if that path
       includes the '*' username substitution.

   Selected new features that relate to Windows platforms:
     * Apache on Win9x now ensures the service is stopped before removal.
     * Test httpd.conf (-t) now holds the console open on "SYNTAX OK".
     * Apache/Win32 no longer holds open the console on error unless
       it was invoked from a shortcut with the -w option.
     * mod_user was significantly refactored to assure that the UserDir
       directive is parsed effectively the same across platforms, fixing
       a UserDir bug introduced in 1.3.17 on the Win32 platform.

   Selected new features relating to other platforms:
     * Netware problems with file extension truncatation are resolved.
     * Netware recognizes the SERVER/VOLUME:/PATH/FILE filename pattern.
     * Netware mod_tls properly disables nagle for SSL connections,
       and properly negotiates SSL based on the port.
     * Startup and Shutdown issues were addressed on TPF.

3 files changed, 29 insertions, 14 deletions

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 7ec04d10249..2e2f07f981f 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/02/17 17:21:54 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2001/03/01 04:03:08 itojun Exp $
 #
 # The fourth number in the PKGNAME version indicates a NetBSD pkg revision
 # (to indicate changes in the shipped third party patches such as the mod_ssl
@@ -10,8 +10,8 @@
 # sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
 #
 
-DISTNAME=		apache_1.3.17
-PKGNAME=		apache6-1.3.17.1
+DISTNAME=		apache_1.3.19
+PKGNAME=		apache6-1.3.19
 CATEGORIES=		www
 MASTER_SITES=		http://httpd.apache.org/dist/ \
 			http://www.netbsd.org/images/logos/
@@ -19,10 +19,7 @@ DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			sitedrivenby.gif
 # IPv6 patch, needs -p1
 MASTER_SITES+=		ftp://ftp.kame.net/pub/kame/misc/
-DISTFILES+=		apache-1.3.17-v6-20010206a.diff.gz
-
-PATCH_SITES=		http://httpd.apache.org/dist/
-PATCHFILES=		apache_1.3.17-fix.diff
+DISTFILES+=		apache-1.3.19-v6-20010301a.diff.gz
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://httpd.apache.org/
@@ -105,7 +102,7 @@ pre-patch:
 	${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
 
 post-patch:
-	for i in apache-1.3.17-v6-20010206a.diff.gz; do \
+	for i in apache-1.3.19-v6-20010301a.diff.gz; do \
 		${GZCAT} ${_DISTDIR}/$$i | \
 		    ${PATCH} ${PATCH_DIST_ARGS:C/-p0/-p1/} \
 		    || ( ${ECHO} Patch $$i failed ; exit 1 ) ; \
diff --git a/www/apache6/files/md5 b/www/apache6/files/md5
index 754f2bbab96..94bc656272e 100644
--- a/www/apache6/files/md5
+++ b/www/apache6/files/md5
@@ -1,6 +1,5 @@
-$NetBSD: md5,v 1.10 2001/02/06 12:50:21 itojun Exp $
+$NetBSD: md5,v 1.11 2001/03/01 04:03:09 itojun Exp $
 
-MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
+MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
-MD5 (apache-1.3.17-v6-20010206a.diff.gz) = ca39f4d1238ff2a499367c9d2e79b524
-MD5 (apache_1.3.17-fix.diff) = 92ad88730918bcd04763b99fe4493a41
+MD5 (apache-1.3.19-v6-20010301a.diff.gz) = 09de643e5e9cd07787832c40996c5f29
diff --git a/www/apache6/pkg/PLIST b/www/apache6/pkg/PLIST
index 545c15653bc..09e7d34280b 100644
--- a/www/apache6/pkg/PLIST
+++ b/www/apache6/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2001/02/28 10:33:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/03/01 04:03:09 itojun Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -103,9 +103,11 @@ share/httpd/htdocs/manual/LICENSE
 share/httpd/htdocs/manual/bind.html
 share/httpd/htdocs/manual/cgi_path.html
 share/httpd/htdocs/manual/configuring.html.en
+share/httpd/htdocs/manual/configuring.html.html
 share/httpd/htdocs/manual/configuring.html.ja.jis
 share/httpd/htdocs/manual/content-negotiation.html
 share/httpd/htdocs/manual/custom-error.html.en
+share/httpd/htdocs/manual/custom-error.html.html
 share/httpd/htdocs/manual/custom-error.html.ja.jis
 share/httpd/htdocs/manual/dns-caveats.html
 share/httpd/htdocs/manual/dso.html
@@ -113,13 +115,17 @@ share/httpd/htdocs/manual/ebcdic.html
 share/httpd/htdocs/manual/env.html
 share/httpd/htdocs/manual/footer.html
 share/httpd/htdocs/manual/handler.html.en
+share/httpd/htdocs/manual/handler.html.html
 share/httpd/htdocs/manual/handler.html.ja.jis
 share/httpd/htdocs/manual/header.html
 share/httpd/htdocs/manual/howto/cgi.html.en
+share/httpd/htdocs/manual/howto/cgi.html.html
 share/httpd/htdocs/manual/howto/cgi.html.ja.jis
 share/httpd/htdocs/manual/howto/footer.html
 share/httpd/htdocs/manual/howto/header.html
-share/httpd/htdocs/manual/howto/ssi.html
+share/httpd/htdocs/manual/howto/ssi.html.en
+share/httpd/htdocs/manual/howto/ssi.html.html
+share/httpd/htdocs/manual/howto/ssi.html.ja.jis
 share/httpd/htdocs/manual/images/apache_header.gif
 share/httpd/htdocs/manual/images/custom_errordocs.gif
 share/httpd/htdocs/manual/images/home.gif
@@ -131,11 +137,16 @@ share/httpd/htdocs/manual/images/mod_rewrite_fig2.gif
 share/httpd/htdocs/manual/images/pixel.gif
 share/httpd/htdocs/manual/images/sub.gif
 share/httpd/htdocs/manual/index.html.en
+share/httpd/htdocs/manual/index.html.fr
+share/httpd/htdocs/manual/index.html.html
 share/httpd/htdocs/manual/index.html.ja.jis
 share/httpd/htdocs/manual/install-tpf.html
 share/httpd/htdocs/manual/install.html.en
+share/httpd/htdocs/manual/install.html.fr
+share/httpd/htdocs/manual/install.html.html
 share/httpd/htdocs/manual/install.html.ja.jis
 share/httpd/htdocs/manual/invoking.html
+share/httpd/htdocs/manual/invoking.html.fr
 share/httpd/htdocs/manual/keepalive.html
 share/httpd/htdocs/manual/location.html
 share/httpd/htdocs/manual/man-template.html
@@ -165,6 +176,7 @@ share/httpd/htdocs/manual/misc/vif-info.html
 share/httpd/htdocs/manual/misc/windoz_keepalive.html
 share/httpd/htdocs/manual/mod/core.html
 share/httpd/htdocs/manual/mod/directive-dict.html.en
+share/httpd/htdocs/manual/mod/directive-dict.html.html
 share/httpd/htdocs/manual/mod/directive-dict.html.ja.jis
 share/httpd/htdocs/manual/mod/directives.html
 share/httpd/htdocs/manual/mod/footer.html
@@ -204,6 +216,7 @@ share/httpd/htdocs/manual/mod/mod_mime.html
 share/httpd/htdocs/manual/mod/mod_mime_magic.html
 share/httpd/htdocs/manual/mod/mod_mmap_static.html
 share/httpd/htdocs/manual/mod/mod_negotiation.html.en
+share/httpd/htdocs/manual/mod/mod_negotiation.html.html
 share/httpd/htdocs/manual/mod/mod_negotiation.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_proxy.html
 share/httpd/htdocs/manual/mod/mod_rewrite.html
@@ -216,6 +229,7 @@ share/httpd/htdocs/manual/mod/mod_userdir.html
 share/httpd/htdocs/manual/mod/mod_usertrack.html
 share/httpd/htdocs/manual/mod/mod_vhost_alias.html
 share/httpd/htdocs/manual/mod/module-dict.html.en
+share/httpd/htdocs/manual/mod/module-dict.html.html
 share/httpd/htdocs/manual/mod/module-dict.html.ja.jis
 share/httpd/htdocs/manual/mpeix.html
 share/httpd/htdocs/manual/multilogs.html
@@ -224,6 +238,7 @@ share/httpd/htdocs/manual/new_features_1_0.html
 share/httpd/htdocs/manual/new_features_1_1.html
 share/httpd/htdocs/manual/new_features_1_2.html
 share/httpd/htdocs/manual/new_features_1_3.html.en
+share/httpd/htdocs/manual/new_features_1_3.html.html
 share/httpd/htdocs/manual/new_features_1_3.html.ja.jis
 share/httpd/htdocs/manual/new_features_2_0.html
 share/httpd/htdocs/manual/process-model.html
@@ -245,6 +260,8 @@ share/httpd/htdocs/manual/readme-tpf.html
 share/httpd/htdocs/manual/search/manual-index.cgi
 share/httpd/htdocs/manual/sections.html
 share/httpd/htdocs/manual/server-wide.html.en
+share/httpd/htdocs/manual/server-wide.html.fr
+share/httpd/htdocs/manual/server-wide.html.html
 share/httpd/htdocs/manual/server-wide.html.ja.jis
 share/httpd/htdocs/manual/sourcereorg.html
 share/httpd/htdocs/manual/stopping.html
@@ -252,6 +269,7 @@ share/httpd/htdocs/manual/suexec.html
 share/httpd/htdocs/manual/suexec_1_2.html
 share/httpd/htdocs/manual/unixware.html
 share/httpd/htdocs/manual/upgrading_to_1_3.html
+share/httpd/htdocs/manual/urlmapping.html
 share/httpd/htdocs/manual/vhosts/details.html
 share/httpd/htdocs/manual/vhosts/details_1_2.html
 share/httpd/htdocs/manual/vhosts/examples.html
@@ -260,6 +278,7 @@ share/httpd/htdocs/manual/vhosts/footer.html
 share/httpd/htdocs/manual/vhosts/header.html
 share/httpd/htdocs/manual/vhosts/host.html
 share/httpd/htdocs/manual/vhosts/index.html.en
+share/httpd/htdocs/manual/vhosts/index.html.html
 share/httpd/htdocs/manual/vhosts/index.html.ja.jis
 share/httpd/htdocs/manual/vhosts/ip-based.html
 share/httpd/htdocs/manual/vhosts/mass.html