upgrade to 2.0.45. security bug fixes

- http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0132
- file descriptor leak to child process (i.e. cgi)

3 files changed, 48 insertions, 17 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index dd291e13c80..d031b0628ca 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2003/02/23 15:55:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2003/04/03 08:27:08 itojun Exp $
 
 DISTNAME=		httpd-${APACHE_VERSION}
 PKGNAME=		apache-${APACHE_VERSION}
-APACHE_VERSION=		2.0.44
+APACHE_VERSION=		2.0.45
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/} \
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index 695523c68d3..96d80f32bce 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2003/03/24 11:08:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2003/04/03 08:27:09 itojun Exp $
 bin/apr-config
 bin/apu-config
 etc/rc.d/apache
@@ -22,6 +22,7 @@ include/httpd/apr_compat.h
 include/httpd/apr_date.h
 include/httpd/apr_dbm.h
 include/httpd/apr_dso.h
+include/httpd/apr_env.h
 include/httpd/apr_errno.h
 include/httpd/apr_file_info.h
 include/httpd/apr_file_io.h
@@ -118,12 +119,12 @@ lib/libapr.a
 lib/libapr.la
 lib/libapr.so
 lib/libapr.so.9
-lib/libapr.so.9.2
+lib/libapr.so.9.3
 lib/libaprutil.a
 lib/libaprutil.la
 lib/libaprutil.so
 lib/libaprutil.so.9
-lib/libaprutil.so.9.2
+lib/libaprutil.so.9.3
 libexec/cgi-bin/printenv
 libexec/cgi-bin/test-cgi
 man/man1/dbmmanage.1
@@ -151,6 +152,7 @@ share/examples/httpd/httpd-std.conf
 share/examples/httpd/magic
 share/examples/httpd/mime.types
 share/examples/httpd/ssl-std.conf
+share/httpd/build/apr_rules.mk
 share/httpd/build/config_vars.mk
 share/httpd/build/instdso.sh
 share/httpd/build/library.mk
@@ -214,7 +216,7 @@ share/httpd/htdocs/index.html.ru.cp866
 share/httpd/htdocs/index.html.ru.iso-ru
 share/httpd/htdocs/index.html.ru.koi8-r
 share/httpd/htdocs/index.html.ru.utf8
-share/httpd/htdocs/index.html.se
+share/httpd/htdocs/index.html.sv
 share/httpd/htdocs/index.html.var
 share/httpd/htdocs/index.html.zh
 share/httpd/icons/README
@@ -557,32 +559,39 @@ share/httpd/manual/install.xml.ru
 share/httpd/manual/invoking.html.de
 share/httpd/manual/invoking.html.en
 share/httpd/manual/invoking.html.ja.jis
+share/httpd/manual/invoking.html.ru.koi8-r
 share/httpd/manual/invoking.xml
 share/httpd/manual/invoking.xml.de
 share/httpd/manual/invoking.xml.ja
+share/httpd/manual/invoking.xml.ru
 share/httpd/manual/logs.html.en
 share/httpd/manual/logs.html.ja.jis
 share/httpd/manual/logs.xml
 share/httpd/manual/logs.xml.ja
-share/httpd/manual/misc/custom_errordocs.html
-share/httpd/manual/misc/descriptors.html
-share/httpd/manual/misc/fin_wait_2.html
-share/httpd/manual/misc/footer.html
-share/httpd/manual/misc/header.html
+share/httpd/manual/misc/custom_errordocs.html.en
+share/httpd/manual/misc/custom_errordocs.xml
+share/httpd/manual/misc/descriptors.html.en
+share/httpd/manual/misc/descriptors.xml
+share/httpd/manual/misc/fin_wait_2.html.en
+share/httpd/manual/misc/fin_wait_2.xml
 share/httpd/manual/misc/index.html.en
 share/httpd/manual/misc/index.xml
-share/httpd/manual/misc/known_client_problems.html
+share/httpd/manual/misc/known_client_problems.html.en
+share/httpd/manual/misc/known_client_problems.xml
 share/httpd/manual/misc/perf-tuning.html.en
 share/httpd/manual/misc/perf-tuning.xml
 share/httpd/manual/misc/rewriteguide.html.en
 share/httpd/manual/misc/rewriteguide.xml
 share/httpd/manual/misc/security_tips.html.en
 share/httpd/manual/misc/security_tips.xml
-share/httpd/manual/misc/tutorials.html
+share/httpd/manual/misc/tutorials.html.en
+share/httpd/manual/misc/tutorials.xml
 share/httpd/manual/mod/beos.html.en
 share/httpd/manual/mod/beos.xml
+share/httpd/manual/mod/core.html.de
 share/httpd/manual/mod/core.html.en
 share/httpd/manual/mod/core.xml
+share/httpd/manual/mod/core.xml.de
 share/httpd/manual/mod/directive-dict.html.en
 share/httpd/manual/mod/directive-dict.html.ja.jis
 share/httpd/manual/mod/directive-dict.xml
@@ -590,9 +599,11 @@ share/httpd/manual/mod/directive-dict.xml.ja
 share/httpd/manual/mod/directives.html.de
 share/httpd/manual/mod/directives.html.en
 share/httpd/manual/mod/directives.html.ja.jis
+share/httpd/manual/mod/directives.html.ru.koi8-r
 share/httpd/manual/mod/directives.xml
 share/httpd/manual/mod/directives.xml.de
 share/httpd/manual/mod/directives.xml.ja
+share/httpd/manual/mod/directives.xml.ru
 share/httpd/manual/mod/footer.html
 share/httpd/manual/mod/header.html
 share/httpd/manual/mod/index.html.de
@@ -653,6 +664,7 @@ share/httpd/manual/mod/mod_dav.xml
 share/httpd/manual/mod/mod_dav.xml.ja
 share/httpd/manual/mod/mod_dav_fs.html.en
 share/httpd/manual/mod/mod_dav_fs.xml
+share/httpd/manual/mod/mod_dav_fs.xml.ja
 share/httpd/manual/mod/mod_deflate.html.en
 share/httpd/manual/mod/mod_deflate.html.ja.jis
 share/httpd/manual/mod/mod_deflate.xml
@@ -711,6 +723,8 @@ share/httpd/manual/mod/mod_negotiation.html.en
 share/httpd/manual/mod/mod_negotiation.html.ja.jis
 share/httpd/manual/mod/mod_negotiation.xml
 share/httpd/manual/mod/mod_negotiation.xml.ja
+share/httpd/manual/mod/mod_nw_ssl.html.en
+share/httpd/manual/mod/mod_nw_ssl.xml
 share/httpd/manual/mod/mod_proxy.html.en
 share/httpd/manual/mod/mod_proxy.xml
 share/httpd/manual/mod/mod_proxy_connect.html.en
@@ -757,41 +771,53 @@ share/httpd/manual/mod/module-dict.html.en
 share/httpd/manual/mod/module-dict.html.ja.jis
 share/httpd/manual/mod/module-dict.xml
 share/httpd/manual/mod/module-dict.xml.ja
+share/httpd/manual/mod/mpm_common.html.de
 share/httpd/manual/mod/mpm_common.html.en
 share/httpd/manual/mod/mpm_common.html.ja.jis
 share/httpd/manual/mod/mpm_common.xml
+share/httpd/manual/mod/mpm_common.xml.de
 share/httpd/manual/mod/mpm_common.xml.ja
 share/httpd/manual/mod/mpm_netware.html.en
 share/httpd/manual/mod/mpm_netware.xml
+share/httpd/manual/mod/mpm_winnt.html.de
 share/httpd/manual/mod/mpm_winnt.html.en
 share/httpd/manual/mod/mpm_winnt.html.ja.jis
 share/httpd/manual/mod/mpm_winnt.xml
+share/httpd/manual/mod/mpm_winnt.xml.de
 share/httpd/manual/mod/mpm_winnt.xml.ja
 share/httpd/manual/mod/mpmt_os2.html.en
 share/httpd/manual/mod/mpmt_os2.xml
 share/httpd/manual/mod/perchild.html.en
 share/httpd/manual/mod/perchild.xml
+share/httpd/manual/mod/prefork.html.de
 share/httpd/manual/mod/prefork.html.en
 share/httpd/manual/mod/prefork.html.ja.jis
 share/httpd/manual/mod/prefork.xml
+share/httpd/manual/mod/prefork.xml.de
 share/httpd/manual/mod/prefork.xml.ja
 share/httpd/manual/mod/quickreference.html.de
 share/httpd/manual/mod/quickreference.html.en
 share/httpd/manual/mod/quickreference.html.ja.jis
+share/httpd/manual/mod/quickreference.html.ru.koi8-r
 share/httpd/manual/mod/quickreference.xml
 share/httpd/manual/mod/quickreference.xml.de
+share/httpd/manual/mod/quickreference.xml.ja
+share/httpd/manual/mod/quickreference.xml.ru
 share/httpd/manual/mod/threadpool.html.en
 share/httpd/manual/mod/threadpool.xml
-share/httpd/manual/mod/quickreference.xml.ja
+share/httpd/manual/mod/worker.html.de
 share/httpd/manual/mod/worker.html.en
 share/httpd/manual/mod/worker.html.ja.jis
 share/httpd/manual/mod/worker.xml
+share/httpd/manual/mod/worker.xml.de
 share/httpd/manual/mod/worker.xml.ja
 share/httpd/manual/mpm.html.en
 share/httpd/manual/mpm.html.ja.jis
 share/httpd/manual/mpm.html.ko.euc-kr
+share/httpd/manual/mpm.html.ru.koi8-r
 share/httpd/manual/mpm.xml
 share/httpd/manual/mpm.xml.ja
+share/httpd/manual/mpm.xml.ru
 share/httpd/manual/new_features_2_0.html.de
 share/httpd/manual/new_features_2_0.html.en
 share/httpd/manual/new_features_2_0.html.fr
@@ -837,6 +863,7 @@ share/httpd/manual/search/manual-index.cgi
 share/httpd/manual/sections.html.en
 share/httpd/manual/sections.html.ja.jis
 share/httpd/manual/sections.xml
+share/httpd/manual/sections.xml.ja
 share/httpd/manual/server-wide.html.en
 share/httpd/manual/server-wide.html.ja.jis
 share/httpd/manual/server-wide.xml
@@ -872,9 +899,11 @@ share/httpd/manual/ssl/ssl_template.imgdot-1x1-transp.gif
 share/httpd/manual/stopping.html.de
 share/httpd/manual/stopping.html.en
 share/httpd/manual/stopping.html.ja.jis
+share/httpd/manual/stopping.html.ru.koi8-r
 share/httpd/manual/stopping.xml
 share/httpd/manual/stopping.xml.de
 share/httpd/manual/stopping.xml.ja
+share/httpd/manual/stopping.xml.ru
 share/httpd/manual/style/common.dtd
 share/httpd/manual/style/css/manual-loose-100pc.css
 share/httpd/manual/style/css/manual-print.css
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 0a57d8a4f03..89c2cee6fc2 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2003/02/02 09:59:09 jlam Exp $
+$NetBSD: distinfo,v 1.15 2003/04/03 08:27:10 itojun Exp $
 
-SHA1 (httpd-2.0.44.tar.gz) = 606a8a371c753e0bc452dacf7512e3e117818e78
-Size (httpd-2.0.44.tar.gz) = 5505246 bytes
+SHA1 (httpd-2.0.45.tar.gz) = f722399b0e1986e699bc807518e396b7f0286cca
+Size (httpd-2.0.45.tar.gz) = 5549120 bytes
 SHA1 (patch-aa) = 368740503e36e158f88bee8df8463f9fd76ae620
 SHA1 (patch-ad) = e4a0c729ce5fbf43855ea080946052ef025334f1
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
@@ -11,3 +11,5 @@ SHA1 (patch-al) = 29cc52616c50b7ec998339cca386112a8f1611cc
 SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426
 SHA1 (patch-an) = 6b8aff418e1c3af3be7e280cc373c9555c6f8005
 SHA1 (patch-ao) = 30fa298dc4ae6c6f48276034d07667b909829abf
+SHA1 (patch-ap) = e2ab0df3a9f0805d928bb47666ec7c5b00142a2c
+SHA1 (patch-aq) = 9afdd78a3309de52e6de02652d3c76c6c968ab4e