Upgrading to Apache 1.3.20 + mod_ssl 2.8.4

3 files changed, 28 insertions, 10 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index d80767d15eb..f54a2e58c7c 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -48,8 +48,8 @@ USE_OPENSSL=	YES
 
 LIB_DEPENDS=	mm.11:${PORTSDIR}/devel/mm
 
-VERSION_APACHE=	1.3.19
-VERSION_MODSSL=	2.8.3
+VERSION_APACHE=	1.3.20
+VERSION_MODSSL=	2.8.4
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index 9a53b6712f7..a8c4dea7a17 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
-MD5 (mod_ssl-2.8.3-1.3.19.tar.gz) = 1b7ed7ae80fe1fa675aea6896c0e68c8
+MD5 (apache_1.3.20.tar.gz) = d58d373b5f528a61a3490daec5e8f91f
+MD5 (mod_ssl-2.8.4-1.3.20.tar.gz) = ff1a548c2387f123a3df4436a1e884f9
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index ad2c1afad91..2bbd510550f 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -45,6 +45,7 @@ include/apache/ap_config.h
 include/apache/ap_config_auto.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
 include/apache/ap_mm.h
@@ -159,11 +160,12 @@ 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.tw.Big5
+share/doc/apache/index.html.zh.Big5
 share/doc/apache/index.html.el
 share/doc/apache/manual/LICENSE
 share/doc/apache/manual/bind.html
 share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/configuring.html.fr
 share/doc/apache/manual/configuring.html.en
 share/doc/apache/manual/configuring.html.ja.jis
 share/doc/apache/manual/content-negotiation.html
@@ -198,9 +200,11 @@ share/doc/apache/manual/images/sub.gif
 share/doc/apache/manual/index.html.en
 share/doc/apache/manual/index.html.ja.jis
 share/doc/apache/manual/install-tpf.html
+share/doc/apache/manual/install.html.es
 share/doc/apache/manual/install.html.en
 share/doc/apache/manual/install.html.ja.jis
 share/doc/apache/manual/invoking.html
+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
@@ -235,7 +239,9 @@ 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-bytype.html
+share/doc/apache/manual/mod/index-bytype.html.fr
 share/doc/apache/manual/mod/index.html
+share/doc/apache/manual/mod/index.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
@@ -254,7 +260,9 @@ 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
+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
@@ -266,14 +274,18 @@ 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.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_mime_magic.html
 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.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
+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
@@ -356,7 +368,9 @@ 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
+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
@@ -368,7 +382,11 @@ share/doc/apache/manual/server-wide.html.ja.jis
 share/doc/apache/manual/sections.html
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
-share/doc/apache/manual/suexec.html
+share/doc/apache/manual/stopping.html.fr
+share/doc/apache/manual/stopping.html.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/suexec_1_2.html
 share/doc/apache/manual/unixware.html
 share/doc/apache/manual/upgrading_to_1_3.html