Update apache to 1.3.19. The pkgsrc-related changes include adding a

config.layout file instead of specifying every directory as on option to
the Apache configure script.  This layout file might be useful later when
we package Apache 2.x.  I also reordered a few lines so that it's easier
to diff apache/Makefile and apache6/Makefile (hi itojun!).  Also build
the mod_define shared module from the mod_ssl sources.

Relevant changes from version 1.3.17.1 include:

  *) Rewrite ap_unparse_uri_components() to make it safer and more readable
  *) Under certain circumstances, Apache did not supply the
     right response headers when requiring authentication.
  *) Clean up some end-of-loop not reached warnings
  *) Add the correct language tag for interoperation with the Taiwanese
     versions of MSIE and Netscape.
  *) Workaround enabled for a core dump which appeared in broken
     NameVirtualHost configurations.
  *) Sporadic core dump in ap_default_port_for_scheme() with
     internal requests
  *) SECURITY: The default installation could lead to mod_negotiation
     and mod_dir/mod_autoindex displaying a directory listing instead of
     the index.html.* files, if a very long path was created artificially
     by using many slashes. Now a 403 FORBIDDEN is returned.
  *) Trailing slashes (if they exist) are now removed from ServerRoot,
     because there were known problems with them.
  *) TPF startup/shutdown fixes.
  *) Correct a typo in httpd.conf.
  *) Get the correct IP address if ServerName isn't set and we can't
     find a fully-qualified domain name at startup.
  *) Fix pointer arithmetic in mod_rewrite map expansion.
  *) Fixed a problem with file extensions being truncated during
     the call to ap_os_canonical_filename().

3 files changed, 33 insertions, 14 deletions

diff --git a/www/apache/files/config.layout b/www/apache/files/config.layout
new file mode 100644
index 00000000000..e74da5a03dd
--- /dev/null
+++ b/www/apache/files/config.layout
@@ -0,0 +1,20 @@
+# $NetBSD: config.layout,v 1.1 2001/03/13 20:52:27 jlam Exp $
+
+<Layout pkgsrc>
+prefix: @PREFIX@
+exec_prefix: @PREFIX@
+bindir: ${exec_prefix}/bin
+sbindir: ${exec_prefix}/sbin
+libexecdir: ${exec_prefix}/lib/httpd
+mandir: ${prefix}/man
+sysconfdir: ${prefix}/etc/httpd
+datadir: ${prefix}/share/httpd
+iconsdir: ${prefix}/share/httpd/icons
+htdocsdir: ${prefix}/share/httpd/htdocs
+cgidir: ${exec_prefix}/libexec/cgi-bin
+includedir: ${prefix}/include/httpd
+localstatedir: /var/run
+runtimedir: /var/run
+logfiledir: /var/log/httpd
+proxycachedir: /var/spool/httpd/proxy
+</Layout>
diff --git a/www/apache/files/md5 b/www/apache/files/md5
index 50af18ccc82..15567848f92 100644
--- a/www/apache/files/md5
+++ b/www/apache/files/md5
@@ -1,6 +1,5 @@
-$NetBSD: md5,v 1.19 2001/02/06 12:39:00 itojun Exp $
+$NetBSD: md5,v 1.20 2001/03/13 20:52:28 jlam Exp $
 
-MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
-MD5 (mod_ssl-2.8.0-1.3.17.tar.gz) = 3a158f3b5442cb8b7bee4a55851c3794
+MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
+MD5 (mod_ssl-2.8.1-1.3.19.tar.gz) = 7d7cd5db29e1081f5c2fb97fc86c8213
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
-MD5 (apache_1.3.17-fix.diff) = 92ad88730918bcd04763b99fe4493a41
diff --git a/www/apache/files/patch-sum b/www/apache/files/patch-sum
index c11dc5d5936..f148ad6ba8a 100644
--- a/www/apache/files/patch-sum
+++ b/www/apache/files/patch-sum
@@ -1,11 +1,11 @@
-$NetBSD: patch-sum,v 1.15 2001/03/01 13:40:01 wiz Exp $
+$NetBSD: patch-sum,v 1.16 2001/03/13 20:52:28 jlam Exp $
 
-MD5 (patch-aa) = 1f5ddd83cedeaff72df8c6428a8878ba
-MD5 (patch-ab) = 86886e1e816bcc5527072c4027586cd3
-MD5 (patch-ac) = afd85e3188013fa46392ccaa3727d09d
-MD5 (patch-ad) = 40f2b9c12d7ef36bbc842480af61b833
-MD5 (patch-ae) = c260133920eebada06030552c3306c3d
-MD5 (patch-af) = 197a9b91da502834ec5d4cab2c99b2c1
-MD5 (patch-ag) = 8c3021892d56ea8fd6023d7fecfe0f61
-MD5 (patch-ah) = e27e529142e5ee6fc1be0f965e5510e0
-MD5 (patch-ai) = 57b95d04f0ed35252b8ead041017feac
+SHA1 (patch-aa) = aed136dfee27b1fe98892d669d218c1070782b5e
+SHA1 (patch-ab) = ef7300383b4946ba78ffb592c174b5ea683b60f8
+SHA1 (patch-ac) = 4c18bb80f3fbe8d44c941e403ff10fd92b820785
+SHA1 (patch-ad) = 79e9b2adb23e412195f0382b30b56496af735297
+SHA1 (patch-ae) = 29e1da736d6948d550039cc4ddd1e7743e7e0feb
+SHA1 (patch-af) = 3396cbc389cdaad64573e8d99d1a2613a1e5915e
+SHA1 (patch-ag) = 5586719f7fa7b5d670d2735e487943c046533ea6
+SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3
+SHA1 (patch-ai) = 6bf9f59849803e2594ef9eaff161b377c6d1071a