Update apache to 1.3.20. Relevant changes from version 1.3.19 include:

   NetBSD Packages Collection (pkgsrc) changes:
     * Modify French page in same way as the English page.  Translation
       provided by Remi Zara <remi_zara@mac.com> in private e-mail.
     * Use EAPI patches from mod_ssl-2.8.4-1.3.20.
     * Unify repeated SED replacement info for config.layout, apache.sh,
       DEINSTALL, and INSTALL into one location, FILES_SUBST.
     * Modify patch to apxs to use 0:0 instead of root:wheel, as some
       non-NetBSD systems don't have a wheel group.

   The general bug fixes:
     * Eliminate a potential segfault if an invalid floating point value
       is passed to the ap_snprintf() function, on platforms supporting
       isnan() and isinf().
     * Fix a possible segfault at startup in the detection of a default
       ServerName or IP string when no ServerName was specified.
     * Fixed mod_proxy to retain empty headers, as allowed by RFC2068.
     * Properly resolve the location of ndbm on Linux and some glibc2
       builds, where ndbm.h is in the nonstandard db1/ subdir.

   The main new features include:
     * Enhanced rotatelogs to allow a UTC offset to be specified, and
       the format logfile names with human-readable date/time stamps.
     * Added the NOESCAPE (NS) flag to RewriteRule, to disable *all*
       normal URI escaping.  Note incautious use can give unexpected
       results or introduce security risks.
     * Added the '\' character to RewriteRule to allow escaping of
       special characters.  Allows embedding of both the '$' and '%'
       characters in the results, so 'foo\$1' translates to 'foo$1'
       rather than 'foo\<value of $1>'.
     * Added the -V flag to suexec, to display the compile-time settings
       with which it was built.  (Only valid for root or the HTTPD_USER
       username.)
     * Introduced EBCDIC conversion configuration options, controlling the
       conversion based on MIME type or file suffix.

3 files changed, 73 insertions, 37 deletions

diff --git a/www/apache/patches/patch-ac b/www/apache/patches/patch-ac
index b3619f07c12..70ec8d23429 100644
--- a/www/apache/patches/patch-ac
+++ b/www/apache/patches/patch-ac
@@ -1,35 +1,35 @@
-$NetBSD: patch-ac,v 1.6 2001/02/03 20:53:10 jlam Exp $
+$NetBSD: patch-ac,v 1.7 2001/06/09 06:36:43 jlam Exp $
 
---- htdocs/index.html.en.orig	Fri Jan 19 14:39:47 2001
-+++ htdocs/index.html.en
-@@ -33,12 +33,26 @@
- <HR WIDTH="50%" SIZE="8">
+--- htdocs/index.html.en.orig	Thu May  3 20:00:38 2001
++++ htdocs/index.html.en	Sat Jun  9 01:44:14 2001
+@@ -27,12 +27,26 @@
  
- <p>The Apache <A HREF="manual/">documentation</A> has been included with
--this distribution.</p>
-+this distribution.  If the <STRONG>mod_ssl</STRONG> SSL extension has
+ <hr width="50%" size="8" />
+ <p>The Apache <a href="manual/">documentation</a> has been included
+-with this distribution.</p>
++with this distribution.  If the <strong>mod_ssl</strong> SSL extension has
 +been installed, then please carefully read the
-+<A HREF="manual/mod/mod_ssl/index.html">SSL documentation</A>.</p>
++<a href="manual/mod/mod_ssl/index.html">SSL documentation</a>.</p>
  
--<p>You are free to use the image below on an Apache-powered web server. 
--Thanks for using Apache!</p>
+-<p>You are free to use the image below on an Apache-powered web
+-server. Thanks for using Apache!</p>
 +<p>Information on the NetBSD multi-platform operating system can be found at
-+<A HREF="http://www.netbsd.org/">The NetBSD Project homepage</A></p>
++<a href="http://www.netbsd.org/">The NetBSD Project homepage</a></p>
  
--<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
+-<div align="center"><img src="apache_pb.gif" alt="" /></div>
 +<p>Please feel 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>
++<a href="http://www.apache.org/">Apache</a> on
++<a href="http://www.netbsd.org/">NetBSD</a>!</p>
 +
-+<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>
++<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>
  
- </BODY>
- </HTML>
diff --git a/www/apache/patches/patch-ai b/www/apache/patches/patch-ai
index 1789c5a0751..c4a2f26909e 100644
--- a/www/apache/patches/patch-ai
+++ b/www/apache/patches/patch-ai
@@ -1,14 +1,14 @@
-$NetBSD: patch-ai,v 1.4 2001/02/02 16:39:58 jlam Exp $
+$NetBSD: patch-ai,v 1.5 2001/06/09 06:36:43 jlam Exp $
 
---- src/support/apxs.pl.orig	Fri Feb  2 00:42:14 2001
-+++ src/support/apxs.pl
-@@ -427,8 +427,7 @@
-         my $t = $f;
-         $t =~ s|^.+/([^/]+)$|$1|;
-         if ($opt_i) {
--            push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
--            push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-+            push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t");
+--- src/support/apxs.pl.orig	Sat Jun  9 01:06:57 2001
++++ src/support/apxs.pl	Sat Jun  9 01:11:28 2001
+@@ -459,8 +459,7 @@
+         if ($^O ne "MSWin32") {
+             $t =~ s|^.+/([^/]+)$|$1|;
+             if ($opt_i) {
+-                push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
+-                push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
++                push(@cmds, "install -c -m 555 -o 0 -g 0 $f $CFG_LIBEXECDIR/$t");
+             }
          }
- 
-         #   determine module symbolname and filename
+ 	else {
diff --git a/www/apache/patches/patch-aj b/www/apache/patches/patch-aj
new file mode 100644
index 00000000000..81470ce5d35
--- /dev/null
+++ b/www/apache/patches/patch-aj
@@ -0,0 +1,36 @@
+$NetBSD: patch-aj,v 1.6 2001/06/09 06:36:44 jlam Exp $
+
+--- htdocs/index.html.fr.orig	Tue May  1 06:31:10 2001
++++ htdocs/index.html.fr	Sat Jun  9 01:48:28 2001
+@@ -36,12 +36,27 @@
+ <HR WIDTH="50%" SIZE="8">
+ 
+ <p>La <A HREF="manual/">documentation</A> Apache est incluse dans cette
+-distribution.</p>
++distribution. Si l'extension SSL <STRONG>mod_ssl</STRONG> a \xe9t\xe9
++install\xe9e, lisez alors attentivement la 
++<A HREF="manual/mod/mod_ssl/index.html">documentation SSL</A>.</p>
+ 
+-<p>Le webmaster de ce site peut librement utiliser l'image ci-dessous sur un
+-site web utilisant le logiciel Apache. Merci d'avoir choisi Apache&nbsp;!</p>
++<p>Des informations sur le syst\xe8me d'exploitation multi-plateforme NetBSD
++peuvent &ecirc;tre trouv\xe9es sur
++<A HREF="http://www.netbsd.org/">la homepage du projet NetBSD</A>.</p> 
+ 
+-<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
++<p>Le webmaster de ce site peut librement utiliser les images ci-dessous sur un
++site web utilisant les logiciels Apache et NetBSD. Merci d'avoir choisi
++<A HREF="http://www.apache.org/">Apache</A> sur
++<A HREF="http://www.netbsd.org/">NetBSD</A>&nbsp;!</p>
++
++<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>