Upgrade to Apache 1.3.22, RA 30.9 and mod_ssl 2.8.5.

PR:		31797
Submitted by:	Petr Rehor <petr.dehor@decros.cz>

1 files changed, 459 insertions, 326 deletions

diff --git a/russian/apache13-modssl/pkg-plist b/russian/apache13-modssl/pkg-plist
index 1bd3178d0685..f2bce4d4c764 100644
--- a/russian/apache13-modssl/pkg-plist
+++ b/russian/apache13-modssl/pkg-plist
@@ -16,27 +16,27 @@ etc/apache/mime.types.default
 @unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi
 etc/apache/srm.conf.default
 @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf
-etc/apache/ssl.crt/README.CRT
+etc/apache/ssl.crl/Makefile
+etc/apache/ssl.crl/README.CRL
 etc/apache/ssl.crt/Makefile
+etc/apache/ssl.crt/README.CRT
 etc/apache/ssl.crt/ca-bundle.crt
-etc/apache/ssl.crt/snakeoil-ca-rsa.crt
+etc/apache/ssl.crt/server.crt
 etc/apache/ssl.crt/snakeoil-ca-dsa.crt
-etc/apache/ssl.crt/snakeoil-rsa.crt
+etc/apache/ssl.crt/snakeoil-ca-rsa.crt
 etc/apache/ssl.crt/snakeoil-dsa.crt
-etc/apache/ssl.crt/server.crt
-etc/apache/ssl.crl/README.CRL
-etc/apache/ssl.crl/Makefile
+etc/apache/ssl.crt/snakeoil-rsa.crt
 etc/apache/ssl.csr/README.CSR
 etc/apache/ssl.csr/server.csr
-etc/apache/ssl.prm/README.PRM
-etc/apache/ssl.prm/snakeoil-ca-dsa.prm
-etc/apache/ssl.prm/snakeoil-dsa.prm
 etc/apache/ssl.key/README.KEY
-etc/apache/ssl.key/snakeoil-ca-rsa.key
+etc/apache/ssl.key/server.key
 etc/apache/ssl.key/snakeoil-ca-dsa.key
-etc/apache/ssl.key/snakeoil-rsa.key
+etc/apache/ssl.key/snakeoil-ca-rsa.key
 etc/apache/ssl.key/snakeoil-dsa.key
-etc/apache/ssl.key/server.key
+etc/apache/ssl.key/snakeoil-rsa.key
+etc/apache/ssl.prm/README.PRM
+etc/apache/ssl.prm/snakeoil-ca-dsa.prm
+etc/apache/ssl.prm/snakeoil-dsa.prm
 etc/apache/tables/cyrillic/dos-dos.tab
 etc/apache/tables/cyrillic/dos-iso.tab
 etc/apache/tables/cyrillic/dos-koi.tab
@@ -191,8 +191,8 @@ include/apache/ap_alloc.h
 include/apache/ap_compat.h
 include/apache/ap_config.h
 include/apache/ap_config_auto.h
-include/apache/ap_ctype.h
 include/apache/ap_ctx.h
+include/apache/ap_ctype.h
 include/apache/ap_ebcdic.h
 include/apache/ap_hook.h
 include/apache/ap_md5.h
@@ -242,9 +242,9 @@ libexec/apache/mod_actions.so
 libexec/apache/mod_alias.so
 libexec/apache/mod_asis.so
 libexec/apache/mod_auth.so
-libexec/apache/mod_autoindex.so
 libexec/apache/mod_auth_anon.so
 libexec/apache/mod_auth_db.so
+libexec/apache/mod_autoindex.so
 libexec/apache/mod_cern_meta.so
 libexec/apache/mod_cgi.so
 libexec/apache/mod_define.so
@@ -275,310 +275,335 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-share/doc/apache/apache_pb.gif
-share/doc/apache/ra-powered.gif
-@exec mkdir -p %D/www
-@exec ln -fs %B %D/www/data.default
-@unexec rm -f %D/www/data.default
-@exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
-@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
-share/doc/apache/README.rus
-share/doc/apache/index.html
-share/doc/apache/index.html.ca
-share/doc/apache/index.html.cz
-share/doc/apache/index.html.de
-share/doc/apache/index.html.dk
-share/doc/apache/index.html.ee
-share/doc/apache/index.html.el
+www/data.default/apache_pb.gif
+www/data.default/ra-powered.gif
+@exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data
+www/data.default/index.html
+www/data.default/index.html.ca
+www/data.default/index.html.cz
+www/data.default/index.html.de
+www/data.default/index.html.dk
+www/data.default/index.html.ee
+www/data.default/index.html.el
+www/data.default/index.html.en
+www/data.default/index.html.es
+www/data.default/index.html.fr
+www/data.default/index.html.he.iso8859-8
+www/data.default/index.html.it
+www/data.default/index.html.ja.jis
+www/data.default/index.html.kr.iso-kr
+www/data.default/index.html.lu
+www/data.default/index.html.nl
+www/data.default/index.html.nn
+www/data.default/index.html.no
+www/data.default/index.html.po.iso-pl
+www/data.default/index.html.pt
+www/data.default/index.html.pt-br
+www/data.default/index.html.ru
+www/data.default/index.html.ru.cp-1251
+www/data.default/index.html.ru.cp866
+www/data.default/index.html.ru.iso-ru
+www/data.default/index.html.ru.koi8-r
+www/data.default/index.html.ru.ucs2
+www/data.default/index.html.ru.ucs4
+www/data.default/index.html.ru.utf8
+www/data.default/index.html.se
+www/data.default/index.html.zh.Big5
+share/doc/apache/LICENSE
+@exec [ -e %D/www/data.default/manual ] || ln -fs %B %D/www/data.default/manual
+share/doc/apache/bind.html.en
+share/doc/apache/bind.html.fr
+share/doc/apache/bind.html.html
+share/doc/apache/cgi_path.html.en
+share/doc/apache/cgi_path.html.fr
+share/doc/apache/cgi_path.html.html
+share/doc/apache/configuring.html.fr
+share/doc/apache/configuring.html.en
+share/doc/apache/configuring.html.ja.jis
+share/doc/apache/content-negotiation.html
+share/doc/apache/custom-error.html.en
+share/doc/apache/custom-error.html.ja.jis
+share/doc/apache/cygwin.html
+share/doc/apache/dns-caveats.html.en
+share/doc/apache/dns-caveats.html.fr
+share/doc/apache/dns-caveats.html.html
+share/doc/apache/dso.html
+share/doc/apache/ebcdic.html
+share/doc/apache/env.html.en
+share/doc/apache/env.html.html
+share/doc/apache/env.html.ja.jis
+share/doc/apache/footer.html
+share/doc/apache/handler.html.en
+share/doc/apache/handler.html.ja.jis
+share/doc/apache/header.html
+share/doc/apache/howto/cgi.html.en
+share/doc/apache/howto/cgi.html.ja.jis
+share/doc/apache/howto/footer.html
+share/doc/apache/howto/header.html
+share/doc/apache/images/apache_pb.gif
+share/doc/apache/images/apache_header.gif
+share/doc/apache/images/custom_errordocs.gif
+share/doc/apache/images/feather.jpg
+share/doc/apache/images/home.gif
+share/doc/apache/images/index.gif
+share/doc/apache/images/mod_rewrite_fig1.fig
+share/doc/apache/images/mod_rewrite_fig1.gif
+share/doc/apache/images/mod_rewrite_fig2.fig
+share/doc/apache/images/mod_rewrite_fig2.gif
+share/doc/apache/images/mod_ssl_sb.gif
+share/doc/apache/images/openssl_ics.gif
+share/doc/apache/images/pixel.gif
+share/doc/apache/images/sub.gif
 share/doc/apache/index.html.en
-share/doc/apache/index.html.es
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.he.iso8859-8
-share/doc/apache/index.html.it
 share/doc/apache/index.html.ja.jis
-share/doc/apache/index.html.kr.iso-kr
-share/doc/apache/index.html.lu
-share/doc/apache/index.html.nl
-share/doc/apache/index.html.no
-share/doc/apache/index.html.po.iso-pl
-share/doc/apache/index.html.pt
-share/doc/apache/index.html.pt-br
-share/doc/apache/index.html.ru
-share/doc/apache/index.html.ru.cp-1251
-share/doc/apache/index.html.ru.cp866
-share/doc/apache/index.html.ru.iso-ru
-share/doc/apache/index.html.ru.koi8-r
-share/doc/apache/index.html.ru.ucs2
-share/doc/apache/index.html.ru.ucs4
-share/doc/apache/index.html.ru.utf8
-share/doc/apache/index.html.se
-share/doc/apache/index.html.zh.Big5
-share/doc/apache/manual/LICENSE
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/cgi_path.html
-share/doc/apache/manual/configuring.html.en
-share/doc/apache/manual/configuring.html.fr
-share/doc/apache/manual/configuring.html.html
-share/doc/apache/manual/configuring.html.ja.jis
-share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/custom-error.html.en
-share/doc/apache/manual/custom-error.html.html
-share/doc/apache/manual/custom-error.html.ja.jis
-share/doc/apache/manual/dns-caveats.html
-share/doc/apache/manual/dso.html
-share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/env.html
-share/doc/apache/manual/mpeix.html
-share/doc/apache/manual/footer.html
-share/doc/apache/manual/handler.html.en
-share/doc/apache/manual/handler.html.html
-share/doc/apache/manual/handler.html.ja.jis
-share/doc/apache/manual/header.html
-share/doc/apache/manual/howto/cgi.html.en
-share/doc/apache/manual/howto/cgi.html.html
-share/doc/apache/manual/howto/cgi.html.ja.jis
-share/doc/apache/manual/howto/footer.html
-share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html.en
-share/doc/apache/manual/howto/ssi.html.html
-share/doc/apache/manual/howto/ssi.html.ja.jis
-share/doc/apache/manual/images/apache_pb.gif
-share/doc/apache/manual/images/apache_header.gif
-share/doc/apache/manual/images/custom_errordocs.gif
-share/doc/apache/manual/images/feather.jpg
-share/doc/apache/manual/images/home.gif
-share/doc/apache/manual/images/index.gif
-share/doc/apache/manual/images/mod_rewrite_fig1.fig
-share/doc/apache/manual/images/mod_rewrite_fig1.gif
-share/doc/apache/manual/images/mod_rewrite_fig2.fig
-share/doc/apache/manual/images/mod_rewrite_fig2.gif
-share/doc/apache/manual/images/mod_ssl_sb.gif
-share/doc/apache/manual/images/openssl_ics.gif
-share/doc/apache/manual/images/pixel.gif
-share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/index.html.en
-share/doc/apache/manual/index.html.fr
-share/doc/apache/manual/index.html.html
-share/doc/apache/manual/index.html.ja.jis
-share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/install.html.en
-share/doc/apache/manual/install.html.es
-share/doc/apache/manual/install.html.fr
-share/doc/apache/manual/install.html.html
-share/doc/apache/manual/install.html.ja.jis
-share/doc/apache/manual/invoking.html
-share/doc/apache/manual/invoking.html.fr
-share/doc/apache/manual/invoking.html.html
-share/doc/apache/manual/keepalive.html
-share/doc/apache/manual/location.html
-share/doc/apache/manual/man-template.html
-share/doc/apache/manual/misc/API.html
-share/doc/apache/manual/misc/FAQ.html
-share/doc/apache/manual/misc/HTTP_Features.tsv
-share/doc/apache/manual/misc/client_block_api.html
-share/doc/apache/manual/misc/compat_notes.html
-share/doc/apache/manual/misc/custom_errordocs.html
-share/doc/apache/manual/misc/descriptors.html
-share/doc/apache/manual/misc/fin_wait_2.html
-share/doc/apache/manual/misc/footer.html
-share/doc/apache/manual/misc/header.html
-share/doc/apache/manual/misc/howto.html
-share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/known_client_problems.html
-share/doc/apache/manual/misc/nopgp.html
-share/doc/apache/manual/misc/perf-bsd44.html
-share/doc/apache/manual/misc/perf-dec.html
-share/doc/apache/manual/misc/perf-hp.html
-share/doc/apache/manual/misc/perf-tuning.html
-share/doc/apache/manual/misc/perf.html
-share/doc/apache/manual/misc/rewriteguide.html
-share/doc/apache/manual/misc/security_tips.html
-share/doc/apache/manual/misc/tutorials.html
-share/doc/apache/manual/misc/vif-info.html
-share/doc/apache/manual/misc/windoz_keepalive.html
-share/doc/apache/manual/mod/core.html
-share/doc/apache/manual/mod/directive-dict.html.en
-share/doc/apache/manual/mod/directive-dict.html.html
-share/doc/apache/manual/mod/directive-dict.html.ja.jis
-share/doc/apache/manual/mod/directives.html
-share/doc/apache/manual/mod/footer.html
-share/doc/apache/manual/mod/header.html
-share/doc/apache/manual/mod/index.html
-share/doc/apache/manual/mod/index.html.fr
-share/doc/apache/manual/mod/index-bytype.html
-share/doc/apache/manual/mod/index-bytype.html.fr
-share/doc/apache/manual/mod/mod_access.html
-share/doc/apache/manual/mod/mod_actions.html
-share/doc/apache/manual/mod/mod_alias.html
-share/doc/apache/manual/mod/mod_asis.html
-share/doc/apache/manual/mod/mod_auth.html
-share/doc/apache/manual/mod/mod_auth_anon.html
-share/doc/apache/manual/mod/mod_auth_db.html
-share/doc/apache/manual/mod/mod_auth_dbm.html
-share/doc/apache/manual/mod/mod_auth_digest.html
-share/doc/apache/manual/mod/mod_autoindex.html
-share/doc/apache/manual/mod/mod_browser.html
-share/doc/apache/manual/mod/mod_cern_meta.html
-share/doc/apache/manual/mod/mod_cgi.html
-share/doc/apache/manual/mod/mod_cookies.html
-share/doc/apache/manual/mod/mod_define.html
-share/doc/apache/manual/mod/mod_digest.html
-share/doc/apache/manual/mod/mod_dir.html
-share/doc/apache/manual/mod/mod_dld.html
-share/doc/apache/manual/mod/mod_env.html.en
-share/doc/apache/manual/mod/mod_env.html.html
-share/doc/apache/manual/mod/mod_env.html.ja.jis
-share/doc/apache/manual/mod/mod_example.html
-share/doc/apache/manual/mod/mod_expires.html
-share/doc/apache/manual/mod/mod_headers.html
-share/doc/apache/manual/mod/mod_imap.html
-share/doc/apache/manual/mod/mod_include.html
-share/doc/apache/manual/mod/mod_info.html
-share/doc/apache/manual/mod/mod_isapi.html
-share/doc/apache/manual/mod/mod_log_agent.html
-share/doc/apache/manual/mod/mod_log_common.html
-share/doc/apache/manual/mod/mod_log_config.html
-share/doc/apache/manual/mod/mod_log_referer.html
-share/doc/apache/manual/mod/mod_mime_magic.html
-share/doc/apache/manual/mod/mod_mime.html.en
-share/doc/apache/manual/mod/mod_mime.html.html
-share/doc/apache/manual/mod/mod_mime.html.ja.jis
-share/doc/apache/manual/mod/mod_mmap_static.html
-share/doc/apache/manual/mod/mod_negotiation.html.en
-share/doc/apache/manual/mod/mod_negotiation.html.html
-share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
-share/doc/apache/manual/mod/mod_proxy.html
-share/doc/apache/manual/mod/mod_rewrite.html
-share/doc/apache/manual/mod/mod_setenvif.html.en
-share/doc/apache/manual/mod/mod_setenvif.html.html
-share/doc/apache/manual/mod/mod_setenvif.html.ja.jis
-share/doc/apache/manual/mod/mod_so.html
-share/doc/apache/manual/mod/mod_speling.html
-share/doc/apache/manual/mod/mod_ssl/index.html
-share/doc/apache/manual/mod/mod_ssl/ssl_compat.gfont000.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_compat.html
-share/doc/apache/manual/mod/mod_ssl/ssl_compat.wml
-share/doc/apache/manual/mod/mod_ssl/ssl_cover.wml
-share/doc/apache/manual/mod/mod_ssl/ssl_cover_logo.jpg
-share/doc/apache/manual/mod/mod_ssl/ssl_cover_title.jpg
-share/doc/apache/manual/mod/mod_ssl/ssl_faq.gfont000.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_faq.html
-share/doc/apache/manual/mod/mod_ssl/ssl_faq.wml
-share/doc/apache/manual/mod/mod_ssl/ssl_glossary.html
-share/doc/apache/manual/mod/mod_ssl/ssl_glossary.wml
-share/doc/apache/manual/mod/mod_ssl/ssl_howto.gfont000.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_howto.html
-share/doc/apache/manual/mod/mod_ssl/ssl_howto.wml
-share/doc/apache/manual/mod/mod_ssl/ssl_intro.gfont000.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_intro.html
-share/doc/apache/manual/mod/mod_ssl/ssl_intro.wml
-share/doc/apache/manual/mod/mod_ssl/ssl_intro_fig1.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_intro_fig2.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_intro_fig3.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_overview.gfont000.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_overview.html
-share/doc/apache/manual/mod/mod_ssl/ssl_overview.wml
-share/doc/apache/manual/mod/mod_ssl/ssl_overview_fig1.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_reference.gfont000.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_reference.html
-share/doc/apache/manual/mod/mod_ssl/ssl_reference.wml
-share/doc/apache/manual/mod/mod_ssl/ssl_template.head-chapter.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-1.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-2.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-3.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-4.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.inc
-share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-5.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-6.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-7.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.navbut-next-n.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.navbut-next-s.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.navbut-prev-n.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.navbut-prev-s.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.title-abstract.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.title-compat.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.title-faq.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.title-gloss.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.title-howto.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.title-intro.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.title-over.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.title-preface.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.title-ref.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.title-toc.gif
-share/doc/apache/manual/mod/mod_ssl/ssl_template.title-tutor.gif
-share/doc/apache/manual/mod/mod_status.html
-share/doc/apache/manual/mod/mod_unique_id.html
-share/doc/apache/manual/mod/mod_userdir.html
-share/doc/apache/manual/mod/mod_usertrack.html
-share/doc/apache/manual/mod/mod_vhost_alias.html
-share/doc/apache/manual/mod/module-dict.html.en
-share/doc/apache/manual/mod/module-dict.html.html
-share/doc/apache/manual/mod/module-dict.html.ja.jis
-share/doc/apache/manual/multilogs.html
-share/doc/apache/manual/netware.html
-share/doc/apache/manual/new_features_1_0.html
-share/doc/apache/manual/new_features_1_1.html
-share/doc/apache/manual/new_features_1_2.html
-share/doc/apache/manual/new_features_1_3.html.en
-share/doc/apache/manual/new_features_1_3.html.html
-share/doc/apache/manual/new_features_1_3.html.ja.jis
-share/doc/apache/manual/new_features_2_0.html
-share/doc/apache/manual/process-model.html
-share/doc/apache/manual/programs/ab.html
-share/doc/apache/manual/programs/apachectl.html
-share/doc/apache/manual/programs/apxs.html
-share/doc/apache/manual/programs/dbmmanage.html
-share/doc/apache/manual/programs/footer.html
-share/doc/apache/manual/programs/header.html
-share/doc/apache/manual/programs/htdigest.html
-share/doc/apache/manual/programs/htpasswd.html
-share/doc/apache/manual/programs/httpd.html
-share/doc/apache/manual/programs/index.html.en
-share/doc/apache/manual/programs/index.html.html
-share/doc/apache/manual/programs/index.html.ja.jis
-share/doc/apache/manual/programs/logresolve.html
-share/doc/apache/manual/programs/other.html
-share/doc/apache/manual/programs/rotatelogs.html
-share/doc/apache/manual/programs/suexec.html
-share/doc/apache/manual/readme-tpf.html
-share/doc/apache/manual/search/manual-index.cgi
-share/doc/apache/manual/sections.html
-share/doc/apache/manual/server-wide.html.en
-share/doc/apache/manual/server-wide.html.fr
-share/doc/apache/manual/server-wide.html.html
-share/doc/apache/manual/server-wide.html.ja.jis
-share/doc/apache/manual/sourcereorg.html
-share/doc/apache/manual/stopping.html
-share/doc/apache/manual/stopping.html.fr
-share/doc/apache/manual/stopping.html.html
-share/doc/apache/manual/suexec_1_2.html
-share/doc/apache/manual/suexec.html.en
-share/doc/apache/manual/suexec.html.html
-share/doc/apache/manual/suexec.html.ja.jis
-share/doc/apache/manual/unixware.html
-share/doc/apache/manual/upgrading_to_1_3.html
-share/doc/apache/manual/urlmapping.html
-share/doc/apache/manual/vhosts/details.html
-share/doc/apache/manual/vhosts/details_1_2.html
-share/doc/apache/manual/vhosts/examples.html
-share/doc/apache/manual/vhosts/fd-limits.html
-share/doc/apache/manual/vhosts/footer.html
-share/doc/apache/manual/vhosts/header.html
-share/doc/apache/manual/vhosts/host.html
-share/doc/apache/manual/vhosts/index.html.en
-share/doc/apache/manual/vhosts/index.html.html
-share/doc/apache/manual/vhosts/index.html.ja.jis
-share/doc/apache/manual/vhosts/ip-based.html
-share/doc/apache/manual/vhosts/mass.html
-share/doc/apache/manual/vhosts/name-based.html
-share/doc/apache/manual/vhosts/vhosts-in-depth.html
-share/doc/apache/manual/vhosts/virtual-host.html
-share/doc/apache/manual/windows.html
-share/doc/apache/manual/win_compiling.html
-share/doc/apache/manual/win_service.html
+share/doc/apache/install-tpf.html
+share/doc/apache/install.html.es
+share/doc/apache/install.html.en
+share/doc/apache/install.html.ja.jis
+share/doc/apache/invoking.html.en
+share/doc/apache/invoking.html.html
+share/doc/apache/keepalive.html.en
+share/doc/apache/keepalive.html.html
+share/doc/apache/keepalive.html.ja.jis
+share/doc/apache/location.html
+share/doc/apache/logs.html
+share/doc/apache/man-template.html
+share/doc/apache/misc/API.html
+share/doc/apache/misc/FAQ.html
+share/doc/apache/misc/HTTP_Features.tsv
+share/doc/apache/misc/client_block_api.html
+share/doc/apache/misc/compat_notes.html
+share/doc/apache/misc/custom_errordocs.html
+share/doc/apache/misc/descriptors.html
+share/doc/apache/misc/fin_wait_2.html
+share/doc/apache/misc/footer.html
+share/doc/apache/misc/header.html
+share/doc/apache/misc/howto.html
+share/doc/apache/misc/index.html
+share/doc/apache/misc/known_client_problems.html
+share/doc/apache/misc/nopgp.html
+share/doc/apache/misc/perf-bsd44.html
+share/doc/apache/misc/perf-dec.html
+share/doc/apache/misc/perf-hp.html
+share/doc/apache/misc/perf-tuning.html
+share/doc/apache/misc/perf.html
+share/doc/apache/misc/rewriteguide.html
+share/doc/apache/misc/security_tips.html
+share/doc/apache/misc/tutorials.html
+share/doc/apache/misc/vif-info.html
+share/doc/apache/misc/windoz_keepalive.html
+share/doc/apache/mod/core.html.en
+share/doc/apache/mod/core.html.fr
+share/doc/apache/mod/core.html.html
+share/doc/apache/mod/directive-dict.html.en
+share/doc/apache/mod/directive-dict.html.fr
+share/doc/apache/mod/directive-dict.html.ja.jis
+share/doc/apache/mod/directives.html.de
+share/doc/apache/mod/directives.html.en
+share/doc/apache/mod/directives.html.fr
+share/doc/apache/mod/directives.html.html
+share/doc/apache/mod/directives.html.ja.jis
+share/doc/apache/mod/footer.html
+share/doc/apache/mod/header.html
+share/doc/apache/mod/index-bytype.html.en
+share/doc/apache/mod/index-bytype.html.fr
+share/doc/apache/mod/index-bytype.html.html
+share/doc/apache/mod/index.html.en
+share/doc/apache/mod/index.html.fr
+share/doc/apache/mod/index.html.html
+share/doc/apache/mod/index.html.ja.jis
+share/doc/apache/mod/mod_access.html
+share/doc/apache/mod/mod_actions.html
+share/doc/apache/mod/mod_alias.html
+share/doc/apache/mod/mod_asis.html
+share/doc/apache/mod/mod_auth.html
+share/doc/apache/mod/mod_auth_anon.html
+share/doc/apache/mod/mod_auth_db.html
+share/doc/apache/mod/mod_auth_dbm.html
+share/doc/apache/mod/mod_auth_digest.html
+share/doc/apache/mod/mod_autoindex.html
+share/doc/apache/mod/mod_browser.html
+share/doc/apache/mod/mod_cern_meta.html
+share/doc/apache/mod/mod_cgi.html
+share/doc/apache/mod/mod_cookies.html
+share/doc/apache/mod/mod_define.html
+share/doc/apache/mod/mod_digest.html
+share/doc/apache/mod/mod_dir.html
+share/doc/apache/mod/mod_dld.html
+share/doc/apache/mod/mod_env.html.en
+share/doc/apache/mod/mod_env.html.html
+share/doc/apache/mod/mod_env.html.ja.jis
+share/doc/apache/mod/mod_example.html
+share/doc/apache/mod/mod_expires.html
+share/doc/apache/mod/mod_headers.html
+share/doc/apache/mod/mod_imap.html
+share/doc/apache/mod/mod_include.html
+share/doc/apache/mod/mod_info.html
+share/doc/apache/mod/mod_isapi.html
+share/doc/apache/mod/mod_log_agent.html
+share/doc/apache/mod/mod_log_common.html
+share/doc/apache/mod/mod_log_config.html
+share/doc/apache/mod/mod_log_referer.html
+share/doc/apache/mod/mod_mime.html.en
+share/doc/apache/mod/mod_mime.html.html
+share/doc/apache/mod/mod_mime.html.ja.jis
+share/doc/apache/mod/mod_mime_magic.html
+share/doc/apache/mod/mod_mmap_static.html
+share/doc/apache/mod/mod_negotiation.html.en
+share/doc/apache/mod/mod_negotiation.html.ja.jis
+share/doc/apache/mod/mod_proxy.html
+share/doc/apache/mod/mod_rewrite.html
+share/doc/apache/mod/mod_setenvif.html.en
+share/doc/apache/mod/mod_setenvif.html.html
+share/doc/apache/mod/mod_setenvif.html.ja.jis
+share/doc/apache/mod/mod_so.html
+share/doc/apache/mod/mod_speling.html
+share/doc/apache/mod/mod_ssl/index.html
+share/doc/apache/mod/mod_ssl/ssl_compat.gfont000.gif
+share/doc/apache/mod/mod_ssl/ssl_compat.html
+share/doc/apache/mod/mod_ssl/ssl_compat.wml
+share/doc/apache/mod/mod_ssl/ssl_cover.wml
+share/doc/apache/mod/mod_ssl/ssl_cover_logo.jpg
+share/doc/apache/mod/mod_ssl/ssl_cover_title.jpg
+share/doc/apache/mod/mod_ssl/ssl_faq.gfont000.gif
+share/doc/apache/mod/mod_ssl/ssl_faq.html
+share/doc/apache/mod/mod_ssl/ssl_faq.wml
+share/doc/apache/mod/mod_ssl/ssl_glossary.html
+share/doc/apache/mod/mod_ssl/ssl_glossary.wml
+share/doc/apache/mod/mod_ssl/ssl_howto.gfont000.gif
+share/doc/apache/mod/mod_ssl/ssl_howto.html
+share/doc/apache/mod/mod_ssl/ssl_howto.wml
+share/doc/apache/mod/mod_ssl/ssl_intro.gfont000.gif
+share/doc/apache/mod/mod_ssl/ssl_intro.html
+share/doc/apache/mod/mod_ssl/ssl_intro.wml
+share/doc/apache/mod/mod_ssl/ssl_intro_fig1.gif
+share/doc/apache/mod/mod_ssl/ssl_intro_fig2.gif
+share/doc/apache/mod/mod_ssl/ssl_intro_fig3.gif
+share/doc/apache/mod/mod_ssl/ssl_overview.gfont000.gif
+share/doc/apache/mod/mod_ssl/ssl_overview.html
+share/doc/apache/mod/mod_ssl/ssl_overview.wml
+share/doc/apache/mod/mod_ssl/ssl_overview_fig1.gif
+share/doc/apache/mod/mod_ssl/ssl_reference.gfont000.gif
+share/doc/apache/mod/mod_ssl/ssl_reference.html
+share/doc/apache/mod/mod_ssl/ssl_reference.wml
+share/doc/apache/mod/mod_ssl/ssl_template.head-chapter.gif
+share/doc/apache/mod/mod_ssl/ssl_template.head-num-1.gif
+share/doc/apache/mod/mod_ssl/ssl_template.head-num-2.gif
+share/doc/apache/mod/mod_ssl/ssl_template.head-num-3.gif
+share/doc/apache/mod/mod_ssl/ssl_template.head-num-4.gif
+share/doc/apache/mod/mod_ssl/ssl_template.head-num-5.gif
+share/doc/apache/mod/mod_ssl/ssl_template.head-num-6.gif
+share/doc/apache/mod/mod_ssl/ssl_template.head-num-7.gif
+share/doc/apache/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
+share/doc/apache/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
+share/doc/apache/mod/mod_ssl/ssl_template.inc
+share/doc/apache/mod/mod_ssl/ssl_template.navbut-next-n.gif
+share/doc/apache/mod/mod_ssl/ssl_template.navbut-next-s.gif
+share/doc/apache/mod/mod_ssl/ssl_template.navbut-prev-n.gif
+share/doc/apache/mod/mod_ssl/ssl_template.navbut-prev-s.gif
+share/doc/apache/mod/mod_ssl/ssl_template.title-abstract.gif
+share/doc/apache/mod/mod_ssl/ssl_template.title-compat.gif
+share/doc/apache/mod/mod_ssl/ssl_template.title-faq.gif
+share/doc/apache/mod/mod_ssl/ssl_template.title-gloss.gif
+share/doc/apache/mod/mod_ssl/ssl_template.title-howto.gif
+share/doc/apache/mod/mod_ssl/ssl_template.title-intro.gif
+share/doc/apache/mod/mod_ssl/ssl_template.title-over.gif
+share/doc/apache/mod/mod_ssl/ssl_template.title-preface.gif
+share/doc/apache/mod/mod_ssl/ssl_template.title-ref.gif
+share/doc/apache/mod/mod_ssl/ssl_template.title-toc.gif
+share/doc/apache/mod/mod_ssl/ssl_template.title-tutor.gif
+share/doc/apache/mod/mod_status.html
+share/doc/apache/mod/mod_unique_id.html
+share/doc/apache/mod/mod_userdir.html
+share/doc/apache/mod/mod_usertrack.html
+share/doc/apache/mod/mod_vhost_alias.html
+share/doc/apache/mod/module-dict.html.en
+share/doc/apache/mod/module-dict.html.ja.jis
+share/doc/apache/mpeix.html
+share/doc/apache/multilogs.html
+share/doc/apache/netware.html
+share/doc/apache/new_features_1_0.html
+share/doc/apache/new_features_1_1.html
+share/doc/apache/new_features_1_2.html
+share/doc/apache/new_features_1_3.html.en
+share/doc/apache/new_features_1_3.html.ja.jis
+share/doc/apache/new_features_2_0.html
+share/doc/apache/process-model.html
+share/doc/apache/programs/ab.html
+share/doc/apache/programs/apachectl.html
+share/doc/apache/programs/apxs.html
+share/doc/apache/programs/dbmmanage.html
+share/doc/apache/programs/footer.html
+share/doc/apache/programs/header.html
+share/doc/apache/programs/htdigest.html
+share/doc/apache/programs/htpasswd.html
+share/doc/apache/programs/httpd.html
+share/doc/apache/programs/index.html.en
+share/doc/apache/programs/index.html.html
+share/doc/apache/programs/index.html.ja.jis
+share/doc/apache/programs/logresolve.html
+share/doc/apache/programs/other.html
+share/doc/apache/programs/rotatelogs.html
+share/doc/apache/programs/suexec.html
+share/doc/apache/readme-tpf.html
+share/doc/apache/search/manual-index.cgi
+share/doc/apache/server-wide.html.en
+share/doc/apache/server-wide.html.ja.jis
+share/doc/apache/sections.html
+share/doc/apache/sourcereorg.html
+share/doc/apache/stopping.html.en
+share/doc/apache/stopping.html.fr
+share/doc/apache/stopping.html.html
+share/doc/apache/suexec.html.en
+share/doc/apache/suexec.html.html
+share/doc/apache/suexec.html.ja.jis
+share/doc/apache/suexec_1_2.html
+share/doc/apache/unixware.html
+share/doc/apache/upgrading_to_1_3.html
+share/doc/apache/vhosts/details.html
+share/doc/apache/vhosts/details_1_2.html
+share/doc/apache/vhosts/examples.html
+share/doc/apache/vhosts/fd-limits.html
+share/doc/apache/vhosts/footer.html
+share/doc/apache/vhosts/header.html
+share/doc/apache/vhosts/host.html
+share/doc/apache/vhosts/index.html.en
+share/doc/apache/vhosts/index.html.ja.jis
+share/doc/apache/vhosts/ip-based.html
+share/doc/apache/vhosts/mass.html
+share/doc/apache/vhosts/name-based.html.en
+share/doc/apache/vhosts/name-based.html.html
+share/doc/apache/vhosts/name-based.html.ja.jis
+share/doc/apache/vhosts/vhosts-in-depth.html
+share/doc/apache/vhosts/virtual-host.html
+share/doc/apache/win_compiling.html
+share/doc/apache/win_service.html.en
+share/doc/apache/win_service.html.html
+share/doc/apache/win_service.html.ja.jis
+share/doc/apache/windows.html
+share/doc/apache/mod/directive-dict.html.html
+share/doc/apache/mod/mod_negotiation.html.html
+share/doc/apache/mod/module-dict.html.html
+share/doc/apache/configuring.html.html
+share/doc/apache/custom-error.html.fr
+share/doc/apache/custom-error.html.html
+share/doc/apache/handler.html.html
+share/doc/apache/index.html.fr
+share/doc/apache/index.html.html
+share/doc/apache/install.html.fr
+share/doc/apache/install.html.html
+share/doc/apache/invoking.html.fr
+share/doc/apache/new_features_1_3.html.html
+share/doc/apache/server-wide.html.fr
+share/doc/apache/server-wide.html.html
+share/doc/apache/howto/cgi.html.html
+share/doc/apache/howto/ssi.html.en
+share/doc/apache/howto/ssi.html.html
+share/doc/apache/howto/ssi.html.ja.jis
+share/doc/apache/urlmapping.html
+share/doc/apache/vhosts/index.html.html
 www/cgi-bin.default/printenv
+@exec [ -d %D/www/cgi-bin/ ] || ln -fs %B %D/www/cgi-bin
 www/cgi-bin.default/test-cgi
 www/icons/README
 www/icons/a.gif
@@ -689,16 +714,124 @@ www/icons/uu.gif
 www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
+www/icons/a.png
+www/icons/alert.black.png
+www/icons/alert.red.png
+www/icons/apache_pb.png
+www/icons/back.png
+www/icons/ball.gray.png
+www/icons/ball.red.png
+www/icons/binary.png
+www/icons/binhex.png
+www/icons/blank.png
+www/icons/bomb.png
+www/icons/box1.png
+www/icons/box2.png
+www/icons/broken.png
+www/icons/burst.png
+www/icons/c.png
+www/icons/comp.blue.png
+www/icons/comp.gray.png
+www/icons/compressed.png
+www/icons/continued.png
+www/icons/dir.png
+www/icons/down.png
+www/icons/dvi.png
+www/icons/f.png
+www/icons/folder.png
+www/icons/folder.open.png
+www/icons/folder.sec.png
+www/icons/forward.png
+www/icons/generic.png
+www/icons/generic.red.png
+www/icons/generic.sec.png
+www/icons/hand.right.png
+www/icons/hand.up.png
+www/icons/icon.sheet.png
+www/icons/image1.png
+www/icons/image2.png
+www/icons/image3.png
+www/icons/index.png
+www/icons/layout.png
+www/icons/left.png
+www/icons/link.png
+www/icons/movie.png
+www/icons/p.png
+www/icons/patch.png
+www/icons/pdf.png
+www/icons/pie0.png
+www/icons/pie1.png
+www/icons/pie2.png
+www/icons/pie3.png
+www/icons/pie4.png
+www/icons/pie5.png
+www/icons/pie6.png
+www/icons/pie7.png
+www/icons/pie8.png
+www/icons/portal.png
+www/icons/ps.png
+www/icons/quill.png
+www/icons/right.png
+www/icons/screw1.png
+www/icons/screw2.png
+www/icons/script.png
+www/icons/small/back.png
+www/icons/small/binary.png
+www/icons/small/binhex.png
+www/icons/small/blank.png
+www/icons/small/broken.png
+www/icons/small/burst.png
+www/icons/small/comp1.png
+www/icons/small/comp2.png
+www/icons/small/compressed.png
+www/icons/small/continued.png
+www/icons/small/dir.png
+www/icons/small/dir2.png
+www/icons/small/doc.png
+www/icons/small/forward.png
+www/icons/small/generic.png
+www/icons/small/generic2.png
+www/icons/small/generic3.png
+www/icons/small/image.png
+www/icons/small/image2.png
+www/icons/small/index.png
+www/icons/small/key.png
+www/icons/small/movie.png
+www/icons/small/patch.png
+www/icons/small/ps.png
+www/icons/small/rainbow.png
+www/icons/small/sound.png
+www/icons/small/sound2.png
+www/icons/small/tar.png
+www/icons/small/text.png
+www/icons/small/transfer.png
+www/icons/small/unknown.png
+www/icons/small/uu.png
+www/icons/sound1.png
+www/icons/sound2.png
+www/icons/sphere1.png
+www/icons/sphere2.png
+www/icons/tar.png
+www/icons/tex.png
+www/icons/text.png
+www/icons/transfer.png
+www/icons/unknown.png
+www/icons/up.png
+www/icons/uu.png
+www/icons/uuencoded.png
+www/icons/world1.png
+www/icons/world2.png
 @exec mkdir -p %D/www/proxy
 @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
+@unexec if [ -L %D/www/data.default/manual ]; then rm -f %D/www/data.default/manual; fi
 @exec cd %D/etc/apache/ssl.crt && make >/dev/null 2>&1
 @unexec rm -f %D/etc/apache/ssl.crt/[0-9a-fA-F]*.[0-9]*
-@dirrm etc/apache/ssl.crl
 @dirrm etc/apache/ssl.crt
+@dirrm etc/apache/ssl.crl
 @dirrm etc/apache/ssl.csr
-@dirrm etc/apache/ssl.key
 @dirrm etc/apache/ssl.prm
+@dirrm etc/apache/ssl.key
 @dirrm etc/apache/tables/cyrillic
 @dirrm etc/apache/tables/czech
 @dirrm etc/apache/tables/russian
@@ -710,16 +843,16 @@ www/icons/world2.gif
 @dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm share/doc/apache/manual/images
-@dirrm share/doc/apache/manual/howto
-@dirrm share/doc/apache/manual/programs
-@dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/mod/mod_ssl
-@dirrm share/doc/apache/manual/mod
-@dirrm share/doc/apache/manual/search
-@dirrm share/doc/apache/manual/vhosts
-@dirrm share/doc/apache/manual
+@dirrm share/doc/apache/vhosts
+@dirrm share/doc/apache/search
+@dirrm share/doc/apache/mod/mod_ssl
+@dirrm share/doc/apache/mod
+@dirrm share/doc/apache/misc
+@dirrm share/doc/apache/images
+@dirrm share/doc/apache/howto
+@dirrm share/doc/apache/programs
 @dirrm share/doc/apache
+@dirrm www/data.default
 @dirrm www/cgi-bin.default
 @dirrm www/icons/small
 @dirrm www/icons