Update apache to 1.3.26.

Custom mod_ssl eapi patch used for now, since update of mod_ssl for 1.3.26
isn't available yet.

This fixes the CAN-2002-0392 (mitre.org) [CERT VU#944335] security
issue. For full list of changes, see
	http://www.apache.org/dist/httpd/CHANGES_1.3

1 files changed, 74 insertions, 36 deletions

diff --git a/www/apache/PLIST b/www/apache/PLIST
index 1e5a0fb9adb..d9531ef8431 100644
--- a/www/apache/PLIST
+++ b/www/apache/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/04/02 14:13:02 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/06/19 10:17:59 jdolecek Exp $
 bin/checkgid
 bin/dbmmanage
 bin/htdigest
@@ -87,7 +87,6 @@ share/httpd/htdocs/index.html.he.iso8859-8
 share/httpd/htdocs/index.html.it
 share/httpd/htdocs/index.html.ja.jis
 share/httpd/htdocs/index.html.kr.iso-kr
-share/httpd/htdocs/index.html.lu
 share/httpd/htdocs/index.html.nl
 share/httpd/htdocs/index.html.nn
 share/httpd/htdocs/index.html.no
@@ -102,14 +101,16 @@ share/httpd/htdocs/index.html.ru.ucs2
 share/httpd/htdocs/index.html.ru.ucs4
 share/httpd/htdocs/index.html.ru.utf8
 share/httpd/htdocs/index.html.se
-share/httpd/htdocs/index.html.zh.Big5
+share/httpd/htdocs/index.html.zh
 share/httpd/htdocs/manual/LICENSE
 share/httpd/htdocs/manual/bind.html.en
 share/httpd/htdocs/manual/bind.html.fr
 share/httpd/htdocs/manual/bind.html.html
+share/httpd/htdocs/manual/bind.html.ja.jis
 share/httpd/htdocs/manual/cgi_path.html.en
 share/httpd/htdocs/manual/cgi_path.html.fr
 share/httpd/htdocs/manual/cgi_path.html.html
+share/httpd/htdocs/manual/cgi_path.html.ja.jis
 share/httpd/htdocs/manual/configuring.html.en
 share/httpd/htdocs/manual/configuring.html.fr
 share/httpd/htdocs/manual/configuring.html.html
@@ -133,14 +134,14 @@ 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.html
 share/httpd/htdocs/manual/howto/auth.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/ssi.html.html
 share/httpd/htdocs/manual/howto/footer.html
 share/httpd/htdocs/manual/howto/header.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
@@ -171,24 +172,24 @@ share/httpd/htdocs/manual/keepalive.html.ja.jis
 share/httpd/htdocs/manual/location.html
 share/httpd/htdocs/manual/logs.html
 share/httpd/htdocs/manual/man-template.html
+share/httpd/htdocs/manual/misc/fin_wait_2.html
 share/httpd/htdocs/manual/misc/API.html
 share/httpd/htdocs/manual/misc/FAQ.html
-share/httpd/htdocs/manual/misc/HTTP_Features.tsv
+share/httpd/htdocs/manual/misc/known_client_problems.html
 share/httpd/htdocs/manual/misc/client_block_api.html
 share/httpd/htdocs/manual/misc/compat_notes.html
 share/httpd/htdocs/manual/misc/custom_errordocs.html
 share/httpd/htdocs/manual/misc/descriptors.html
-share/httpd/htdocs/manual/misc/fin_wait_2.html
 share/httpd/htdocs/manual/misc/footer.html
+share/httpd/htdocs/manual/misc/HTTP_Features.tsv
 share/httpd/htdocs/manual/misc/header.html
 share/httpd/htdocs/manual/misc/howto.html
 share/httpd/htdocs/manual/misc/index.html
-share/httpd/htdocs/manual/misc/known_client_problems.html
-share/httpd/htdocs/manual/misc/nopgp.html
 share/httpd/htdocs/manual/misc/perf-bsd44.html
+share/httpd/htdocs/manual/misc/nopgp.html
+share/httpd/htdocs/manual/misc/perf-tuning.html
 share/httpd/htdocs/manual/misc/perf-dec.html
 share/httpd/htdocs/manual/misc/perf-hp.html
-share/httpd/htdocs/manual/misc/perf-tuning.html
 share/httpd/htdocs/manual/misc/perf.html
 share/httpd/htdocs/manual/misc/rewriteguide.html
 share/httpd/htdocs/manual/misc/security_tips.html
@@ -207,21 +208,27 @@ share/httpd/htdocs/manual/mod/directives.html.en
 share/httpd/htdocs/manual/mod/directives.html.fr
 share/httpd/htdocs/manual/mod/directives.html.html
 share/httpd/htdocs/manual/mod/directives.html.ja.jis
-share/httpd/htdocs/manual/mod/footer.html
 share/httpd/htdocs/manual/mod/header.html
 share/httpd/htdocs/manual/mod/index-bytype.html.en
 share/httpd/htdocs/manual/mod/index-bytype.html.fr
 share/httpd/htdocs/manual/mod/index-bytype.html.html
+share/httpd/htdocs/manual/mod/index-bytype.html.ja.jis
 share/httpd/htdocs/manual/mod/index.html.en
 share/httpd/htdocs/manual/mod/index.html.fr
 share/httpd/htdocs/manual/mod/index.html.html
 share/httpd/htdocs/manual/mod/index.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_access.html
+share/httpd/htdocs/manual/mod/mod_access.html.en
+share/httpd/htdocs/manual/mod/mod_access.html.html
 share/httpd/htdocs/manual/mod/mod_access.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_actions.html
+share/httpd/htdocs/manual/mod/mod_actions.html.en
+share/httpd/htdocs/manual/mod/mod_actions.html.html
+share/httpd/htdocs/manual/mod/mod_actions.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_alias.html
-share/httpd/htdocs/manual/mod/mod_asis.html
+share/httpd/htdocs/manual/mod/mod_asis.html.en
+share/httpd/htdocs/manual/mod/mod_asis.html.html
+share/httpd/htdocs/manual/mod/mod_asis.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_auth.html
+share/httpd/htdocs/manual/mod/mod_cgi.html.en
 share/httpd/htdocs/manual/mod/mod_auth_anon.html
 share/httpd/htdocs/manual/mod/mod_auth_db.html
 share/httpd/htdocs/manual/mod/mod_auth_dbm.html
@@ -229,9 +236,9 @@ share/httpd/htdocs/manual/mod/mod_auth_digest.html
 share/httpd/htdocs/manual/mod/mod_autoindex.html
 share/httpd/htdocs/manual/mod/mod_browser.html
 share/httpd/htdocs/manual/mod/mod_cern_meta.html
-share/httpd/htdocs/manual/mod/mod_cgi.html
+share/httpd/htdocs/manual/mod/mod_cgi.html.html
+share/httpd/htdocs/manual/mod/mod_cgi.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_cookies.html
-share/httpd/htdocs/manual/mod/mod_define.html
 share/httpd/htdocs/manual/mod/mod_digest.html
 share/httpd/htdocs/manual/mod/mod_dir.html.en
 share/httpd/htdocs/manual/mod/mod_dir.html.html
@@ -240,12 +247,15 @@ share/httpd/htdocs/manual/mod/mod_dld.html
 share/httpd/htdocs/manual/mod/mod_env.html.en
 share/httpd/htdocs/manual/mod/mod_env.html.html
 share/httpd/htdocs/manual/mod/mod_env.html.ja.jis
+share/httpd/htdocs/manual/mod/footer.html
 share/httpd/htdocs/manual/mod/mod_example.html
 share/httpd/htdocs/manual/mod/mod_expires.html
 share/httpd/htdocs/manual/mod/mod_headers.html
 share/httpd/htdocs/manual/mod/mod_imap.html
 share/httpd/htdocs/manual/mod/mod_include.html
-share/httpd/htdocs/manual/mod/mod_info.html
+share/httpd/htdocs/manual/mod/mod_info.html.en
+share/httpd/htdocs/manual/mod/mod_info.html.html
+share/httpd/htdocs/manual/mod/mod_info.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_isapi.html
 share/httpd/htdocs/manual/mod/mod_log_agent.html
 share/httpd/htdocs/manual/mod/mod_log_common.html
@@ -256,19 +266,28 @@ share/httpd/htdocs/manual/mod/mod_mime.html.html
 share/httpd/htdocs/manual/mod/mod_mime.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_mime_magic.html
 share/httpd/htdocs/manual/mod/mod_mmap_static.html
+share/httpd/htdocs/manual/mod/mod_proxy.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
 share/httpd/htdocs/manual/mod/mod_setenvif.html.en
 share/httpd/htdocs/manual/mod/mod_setenvif.html.html
 share/httpd/htdocs/manual/mod/mod_setenvif.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_so.html
-share/httpd/htdocs/manual/mod/mod_speling.html
+share/httpd/htdocs/manual/mod/mod_so.html.en
+share/httpd/htdocs/manual/mod/mod_so.html.html
+share/httpd/htdocs/manual/mod/mod_so.html.ja.jis
+share/httpd/htdocs/manual/mod/mod_speling.html.en
+share/httpd/htdocs/manual/mod/mod_speling.html.html
+share/httpd/htdocs/manual/mod/mod_speling.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_status.html
-share/httpd/htdocs/manual/mod/mod_unique_id.html
-share/httpd/htdocs/manual/mod/mod_userdir.html
+share/httpd/htdocs/manual/mod/mod_unique_id.html.en
+share/httpd/htdocs/manual/mod/mod_userdir.html.en
+share/httpd/htdocs/manual/mod/mod_define.html
+share/httpd/htdocs/manual/mod/mod_unique_id.html.html
+share/httpd/htdocs/manual/mod/mod_unique_id.html.ja.jis
+share/httpd/htdocs/manual/mod/mod_userdir.html.html
+share/httpd/htdocs/manual/mod/mod_userdir.html.ja.jis
 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
@@ -277,6 +296,7 @@ share/httpd/htdocs/manual/mod/module-dict.html.ja.jis
 share/httpd/htdocs/manual/mpeix.html
 share/httpd/htdocs/manual/multilogs.html
 share/httpd/htdocs/manual/netware.html
+share/httpd/htdocs/manual/search/manual-index.cgi
 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
@@ -284,26 +304,37 @@ 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
-share/httpd/htdocs/manual/programs/ab.html
-share/httpd/htdocs/manual/programs/apachectl.html
+share/httpd/htdocs/manual/process-model.html.en
+share/httpd/htdocs/manual/process-model.html.html
+share/httpd/htdocs/manual/process-model.html.ja.jis
 share/httpd/htdocs/manual/programs/apxs.html
+share/httpd/htdocs/manual/programs/ab.html
+share/httpd/htdocs/manual/programs/apachectl.html.en
+share/httpd/htdocs/manual/programs/apachectl.html.html
+share/httpd/htdocs/manual/programs/apachectl.html.ja.jis
 share/httpd/htdocs/manual/programs/dbmmanage.html
+share/httpd/htdocs/manual/programs/htdigest.html
 share/httpd/htdocs/manual/programs/footer.html
 share/httpd/htdocs/manual/programs/header.html
-share/httpd/htdocs/manual/programs/htdigest.html
-share/httpd/htdocs/manual/programs/htpasswd.html
-share/httpd/htdocs/manual/programs/httpd.html
+share/httpd/htdocs/manual/programs/htpasswd.html.en
+share/httpd/htdocs/manual/programs/htpasswd.html.html
+share/httpd/htdocs/manual/programs/htpasswd.html.ja.jis
+share/httpd/htdocs/manual/programs/httpd.html.en
+share/httpd/htdocs/manual/programs/httpd.html.html
+share/httpd/htdocs/manual/programs/httpd.html.ja.jis
 share/httpd/htdocs/manual/programs/index.html.en
 share/httpd/htdocs/manual/programs/index.html.html
 share/httpd/htdocs/manual/programs/index.html.ja.jis
 share/httpd/htdocs/manual/programs/logresolve.html
 share/httpd/htdocs/manual/programs/other.html
 share/httpd/htdocs/manual/programs/rotatelogs.html
-share/httpd/htdocs/manual/programs/suexec.html
+share/httpd/htdocs/manual/programs/suexec.html.en
+share/httpd/htdocs/manual/programs/suexec.html.html
+share/httpd/htdocs/manual/programs/suexec.html.ja.jis
 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/sections.html.en
+share/httpd/htdocs/manual/sections.html.html
+share/httpd/htdocs/manual/sections.html.ja.jis
 share/httpd/htdocs/manual/server-wide.html.en
 share/httpd/htdocs/manual/server-wide.html.fr
 share/httpd/htdocs/manual/server-wide.html.html
@@ -323,11 +354,13 @@ 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
-share/httpd/htdocs/manual/vhosts/fd-limits.html
+share/httpd/htdocs/manual/vhosts/fd-limits.html.en
+share/httpd/htdocs/manual/vhosts/fd-limits.html.html
+share/httpd/htdocs/manual/vhosts/fd-limits.html.ja.jis
+share/httpd/htdocs/manual/vhosts/index.html.en
 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
@@ -335,13 +368,16 @@ share/httpd/htdocs/manual/vhosts/mass.html
 share/httpd/htdocs/manual/vhosts/name-based.html.en
 share/httpd/htdocs/manual/vhosts/name-based.html.html
 share/httpd/htdocs/manual/vhosts/name-based.html.ja.jis
-share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html
 share/httpd/htdocs/manual/vhosts/virtual-host.html
-share/httpd/htdocs/manual/win_compiling.html
+share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html
+share/httpd/htdocs/manual/win_compiling.html.en
+share/httpd/htdocs/manual/win_compiling.html.html
+share/httpd/htdocs/manual/win_compiling.html.ja.jis
 share/httpd/htdocs/manual/win_service.html.en
 share/httpd/htdocs/manual/win_service.html.html
 share/httpd/htdocs/manual/win_service.html.ja.jis
-share/httpd/htdocs/manual/windows.html
+share/httpd/htdocs/manual/windows.html.en
+share/httpd/htdocs/manual/windows.html.ja.jis
 share/httpd/htdocs/sitedrivenby.gif
 share/httpd/icons/README
 share/httpd/icons/a.gif
@@ -386,6 +422,8 @@ share/httpd/icons/continued.gif
 share/httpd/icons/continued.png
 share/httpd/icons/dir.gif
 share/httpd/icons/dir.png
+share/httpd/icons/diskimg.gif
+share/httpd/icons/diskimg.png
 share/httpd/icons/down.gif
 share/httpd/icons/down.png
 share/httpd/icons/dvi.gif