Update apache to 1.3.14. Changes from version 1.3.12 are listed below.

   The security fixes are:
     * A problem with the Rewrite module, mod_rewrite, allowed access to
       any file on the web server under certain circumstances
     * The handling of Host: headers in mass virtual hosting
       configurations, mod_vhost_alias, could allow access to any file on
       the server
     * If a cgi-bin directory is under the document root, the source to
       the scripts inside it could be sent if using mass virtual hosting

   The main new features include:
     * Support for a directory-based configuration system. If any of the
       configuration directives point to directories instead of files,
       all files in that directory (and in subdirectories) will be also
       parsed as configuration files
     * Support name-based virtual hosting without needing to specify an
       IP address in the Apache configuration file. This enables sites
       that use dynamic IP addresses to support name-based virtual
       hosting as well as allowing identical machines to share a
       configuration file, say in a load-balanced cluster
     * The SetEnvIf and BrowserMatch range of directives are now able to
       be used in .htaccess files.
     * Administrators who are nervous about their full server version
       details being public can use the new keyword 'ProductOnly' in the
       ServerTokens directive. This keyword forces the server to only
       return the string "Apache" as the server version.
     * The new digest authentication module, mod_auth_digest has had a
       number of fixes and upgrades applied

3 files changed, 29 insertions, 32 deletions

diff --git a/www/apache/patches/patch-ab b/www/apache/patches/patch-ab
index baba26c38fc..7b6b423e85f 100644
--- a/www/apache/patches/patch-ab
+++ b/www/apache/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2000/09/12 14:17:32 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2000/10/13 21:46:45 jlam Exp $
 
---- conf/httpd.conf-dist.orig	Thu Sep  7 01:19:50 2000
+--- conf/httpd.conf-dist.orig	Fri Oct 13 15:58:57 2000
 +++ conf/httpd.conf-dist
-@@ -199,7 +199,16 @@
+@@ -199,7 +199,14 @@
  # the order below without expert advice.
  #
  # Example:
@@ -10,8 +10,6 @@ $NetBSD: patch-ab,v 1.7 2000/09/12 14:17:32 jlam Exp $
 +# LoadModule foo_module lib/httpd/mod_foo.so
 +
 +<IfDefine SSL>
-+### Uncomment the following if you wish to use SSL and you need RSAREF: ###
-+#LoadFile !librsaref.so
 +LoadFile !libcrypto.so
 +LoadFile !libssl.so
 +LoadModule ssl_module lib/httpd/mod_ssl.so
diff --git a/www/apache/patches/patch-ac b/www/apache/patches/patch-ac
index 03a4f9c92ec..f5fb2124ff4 100644
--- a/www/apache/patches/patch-ac
+++ b/www/apache/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2000/09/12 14:17:32 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2000/10/13 21:46:46 jlam Exp $
 
 --- htdocs/index.html.en.orig	Sat Nov 20 16:29:40 1999
 +++ htdocs/index.html.en
@@ -7,32 +7,31 @@ $NetBSD: patch-ac,v 1.3 2000/09/12 14:17:32 jlam Exp $
  
  <P>
 -The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.
--
-+The Apache <A HREF="manual/index.html">documentation</A>
-+has been included with this distribution.<BR>
++The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.<BR>
 +If the <STRONG>mod_ssl</STRONG> SSL extension has been installed, read the
-+<A
-+ HREF="manual/mod/mod_ssl/index.html"
-+>SSL documentation</A>
-+carefully.
++<A HREF="manual/mod/mod_ssl/index.html">SSL documentation</A> carefully.
 +</P>
 +<P>
-+Information on the NetBSD multiplatform operating system can be found
-+at <A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
++Information on the NetBSD multiplatform operating system can be found at
++<A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
 +</P>
+ 
  <P>
 -You are free to use the image below on an Apache-powered web server.  Thanks for using Apache!
-+The Webmaster of this site is free to use the images below on
-+an Apache/NetBSD-powered Web server.  Thanks for using
++The Webmaster of this site is free to use the images below on an
++Apache/NetBSD-powered Web server.  Thanks for using
 +<A HREF="http://www.apache.org/">Apache</A> on
 +<A HREF="http://www.netbsd.org/">NetBSD</A>!
 +</P>
  
 -<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
-+<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT="">
-+<A HREF="http://www.netbsd.org/">
-+<IMG SRC="sitedrivenby.gif" border=0 
-+ ALT="Site driven by NetBSD - NetBSD rocks!"></A>
++<DIV ALIGN="CENTER">
++ <A HREF="http://www.apache.org/">
++  <IMG SRC="apache_pb.gif" BORDER=0 ALT="Powered by Apache">
++ </A>
++ <A HREF="http://www.netbsd.org/">
++  <IMG SRC="sitedrivenby.gif" BORDER=0 ALT="Site driven by NetBSD">
++ </A>
 +</DIV>
  </BODY>
  </HTML>
diff --git a/www/apache/patches/patch-ae b/www/apache/patches/patch-ae
index eed25315c3a..2d934d81f95 100644
--- a/www/apache/patches/patch-ae
+++ b/www/apache/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2000/09/12 14:17:32 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
 
---- src/modules/standard/mod_include.c.orig	Wed Feb  2 15:44:03 2000
+--- src/modules/standard/mod_include.c.orig	Fri Sep 22 14:26:32 2000
 +++ src/modules/standard/mod_include.c
 @@ -92,7 +92,11 @@
  #include "http_log.h"
@@ -24,16 +24,17 @@ $NetBSD: patch-ae,v 1.2 2000/09/12 14:17:32 jlam Exp $
  {
      char *t = tag, *tag_val, c, term;
  
-@@ -470,7 +475,7 @@
+@@ -470,7 +475,8 @@
  /*
   * Do variable substitution on strings
   */
 -static void parse_string(request_rec *r, const char *in, char *out,
-+API_EXPORT(void) ap_include_parse_string(request_rec *r, const char *in, char *out,
++API_EXPORT(void)
++ap_include_parse_string(request_rec *r, const char *in, char *out,
  			size_t length, int leave_name)
  {
      char ch;
-@@ -663,7 +668,8 @@
+@@ -668,7 +674,8 @@
              parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
              if (tag[0] == 'f') {
                  /* be safe; only files in this directory or below allowed */
@@ -43,18 +44,17 @@ $NetBSD: patch-ae,v 1.2 2000/09/12 14:17:32 jlam Exp $
                      error_fmt = "unable to include file \"%s\" "
                          "in parsed file %s";
                  }
-@@ -1075,7 +1081,9 @@
+@@ -1080,7 +1087,8 @@
                          "in parsed file %s";
          }
          else {
 -            ap_getparents(tag_val);    /* get rid of any nasties */
-+            if (ap_allow_options(r) & OPT_INCNOEXEC)
-+               	ap_getparents(tag_val);    /* get rid of any nasties */
-+
++	    if (ap_allow_options(r) & OPT_INCNOEXEC)
++                ap_getparents(tag_val);    /* get rid of any nasties */
              rr = ap_sub_req_lookup_file(tag_val, r);
  
              if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
-@@ -2154,6 +2162,16 @@
+@@ -2159,6 +2167,16 @@
      }
  }
  
@@ -71,7 +71,7 @@ $NetBSD: patch-ae,v 1.2 2000/09/12 14:17:32 jlam Exp $
  
  
  /* -------------------------- The main function --------------------------- */
-@@ -2278,6 +2296,13 @@
+@@ -2283,6 +2301,13 @@
              }
  #endif
              else {