Upgrade to Apache 1.3.17 + mod_ssl 2.8.0.

3 files changed, 51 insertions, 16 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 9558630af7b4..db49850e3fd9 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache+mod_ssl
 PORTVERSION= 	${VERSION_APACHE}+${VERSION_MODSSL}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	www security
 MASTER_SITES=	http://www.apache.org/dist/ \
 		http://www.modssl.org/source/ \
@@ -48,8 +48,8 @@ USE_OPENSSL=	YES
 
 LIB_DEPENDS=	mm.11:${PORTSDIR}/devel/mm
 
-VERSION_APACHE=	1.3.14
-VERSION_MODSSL=	2.7.1
+VERSION_APACHE=	1.3.17
+VERSION_MODSSL=	2.8.0
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index b119f4ab3e83..657f6d1db9c1 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109
-MD5 (mod_ssl-2.7.1-1.3.14.tar.gz) = 99e05bd4ab7bd5c72fbb70bd8cfbf283
+MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
+MD5 (mod_ssl-2.8.0-1.3.17.tar.gz) = 3a158f3b5442cb8b7bee4a55851c3794
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index ba8a1730b8c6..d4da5faf636d 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -160,20 +160,30 @@ 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.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
+share/doc/apache/manual/configuring.html.en
+share/doc/apache/manual/configuring.html.ja.jis
 share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/custom-error.html
+share/doc/apache/manual/custom-error.html.en
+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/footer.html
-share/doc/apache/manual/handler.html
+share/doc/apache/manual/handler.html.en
+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.ja.jis
+share/doc/apache/manual/howto/footer.html
+share/doc/apache/manual/howto/header.html
+share/doc/apache/manual/howto/ssi.html
 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
@@ -184,10 +194,13 @@ 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
+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
+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/keepalive.html
 share/doc/apache/manual/location.html
@@ -217,7 +230,8 @@ 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
+share/doc/apache/manual/mod/directive-dict.html.en
+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
@@ -241,7 +255,6 @@ 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_dll.html
 share/doc/apache/manual/mod/mod_env.html
 share/doc/apache/manual/mod/mod_example.html
 share/doc/apache/manual/mod/mod_expires.html
@@ -257,7 +270,8 @@ share/doc/apache/manual/mod/mod_log_referer.html
 share/doc/apache/manual/mod/mod_mime.html
 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
+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
@@ -322,18 +336,36 @@ 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
+share/doc/apache/manual/mod/module-dict.html.en
+share/doc/apache/manual/mod/module-dict.html.ja.jis
 share/doc/apache/manual/mpeix.html
 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
+share/doc/apache/manual/new_features_1_3.html.en
+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
+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/server-wide.html.en
+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
@@ -348,7 +380,8 @@ 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
+share/doc/apache/manual/vhosts/index.html.en
+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
@@ -488,6 +521,8 @@ www/icons/world2.gif
 @dirrm share/doc/apache/manual/mod
 @dirrm share/doc/apache/manual/misc
 @dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual/howto
+@dirrm share/doc/apache/manual/programs
 @dirrm share/doc/apache/manual
 @dirrm share/doc/apache
 @dirrm www/cgi-bin.default