Upgrade to Apache 1.3.11 + mod_ssl 2.5.0

5 files changed, 32 insertions, 17 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index d2a4695ac3a1..5cae20b354c4 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	Apache + mod_ssl
-# Version required:	1.3.9 + 2.4.10
+# Version required:	1.3.11 + 2.5.0
 # Date created:		Sat Aug 22 12:00:00 CDT 1998
 # Whom:			rse@engelschall.com
 #
@@ -48,8 +48,8 @@ LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl \
 		ssl.1:${PORTSDIR}/security/openssl
 RUN_DEPENDS=	openssl:${PORTSDIR}/security/openssl
 
-VERSION_APACHE=	1.3.9
-VERSION_MODSSL=	2.4.10
+VERSION_APACHE=	1.3.11
+VERSION_MODSSL=	2.5.0
 
 Y2K=		http://www.modssl.org/docs/2.4/ssl_faq.html#y2k
 RESTRICTED=	"Contains cryptography"
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index 1b6ac57a366d..3f4df8be23b9 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
-MD5 (mod_ssl-2.4.10-1.3.9.tar.gz) = 29ae3ab47184bc1056f0b862455f7bfa
+MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1
+MD5 (mod_ssl-2.5.0-1.3.11.tar.gz) = 0d630dd536e2cdc6885368c79b45766f
diff --git a/www/apache13-modssl/files/patch-aa b/www/apache13-modssl/files/patch-aa
index 5089b947c7c0..448bc9bf1589 100644
--- a/www/apache13-modssl/files/patch-aa
+++ b/www/apache13-modssl/files/patch-aa
@@ -1,11 +1,11 @@
---- configure.orig	Sat Aug 14 10:29:05 1999
-+++ configure	Fri Aug 20 19:59:53 1999
-@@ -1084,7 +1084,7 @@
- ##  UID/GID as production oriented as a web server in NIS anyway.
+--- configure.orig	Sat Jan 22 21:55:19 2000
++++ configure	Sat Jan 22 21:59:01 2000
+@@ -1198,7 +1198,7 @@
+     conf_user="nobody"
+ fi
+ if [ "x$conf_group" = "x" ]; then
+-    conf_group="\\\\#-1"
++    conf_group="nobody"
+ fi
+ 
  ##
- conf_user="nobody"
--conf_group="#-1"
-+conf_group="nobody"
- conf_port="80"
- conf_serveradmin="you@your.address"
- conf_servername="new.host.name"
diff --git a/www/apache13-modssl/pkg-descr b/www/apache13-modssl/pkg-descr
index 06a8f2420f90..1752a800fb17 100644
--- a/www/apache13-modssl/pkg-descr
+++ b/www/apache13-modssl/pkg-descr
@@ -1,4 +1,4 @@
- Apache 1.3 + mod_ssl 2.4         ``mod_ssl combines the flexibility of   
+ Apache 1.3 + mod_ssl 2.5         ``mod_ssl combines the flexibility of   
  ========================           Apache with the security of OpenSSL.''
                                   
  The Apache Interface to OpenSSL  ``The best SSL solution for       
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index 179059aeaef3..6339f3c4469e 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -119,7 +119,19 @@ libexec/apache/mod_vhost_alias.so
 share/apache/cgi-bin/printenv
 share/apache/cgi-bin/test-cgi
 share/apache/htdocs/apache_pb.gif
-share/apache/htdocs/index.html
+share/apache/htdocs/index.html.ca
+share/apache/htdocs/index.html.cz
+share/apache/htdocs/index.html.de
+share/apache/htdocs/index.html.dk
+share/apache/htdocs/index.html.ee
+share/apache/htdocs/index.html.en
+share/apache/htdocs/index.html.es
+share/apache/htdocs/index.html.fr
+share/apache/htdocs/index.html.it
+share/apache/htdocs/index.html.lu
+share/apache/htdocs/index.html.nl
+share/apache/htdocs/index.html.pt
+share/apache/htdocs/index.html.se
 share/apache/htdocs/manual/LICENSE
 share/apache/htdocs/manual/bind.html
 share/apache/htdocs/manual/cgi_path.html
@@ -133,6 +145,7 @@ share/apache/htdocs/manual/footer.html
 share/apache/htdocs/manual/handler.html
 share/apache/htdocs/manual/header.html
 share/apache/htdocs/manual/images/apache_pb.gif
+share/apache/htdocs/manual/images/feather.jpg
 share/apache/htdocs/manual/images/custom_errordocs.gif
 share/apache/htdocs/manual/images/home.gif
 share/apache/htdocs/manual/images/index.gif
@@ -149,6 +162,7 @@ share/apache/htdocs/manual/invoking.html
 share/apache/htdocs/manual/keepalive.html
 share/apache/htdocs/manual/location.html
 share/apache/htdocs/manual/man-template.html
+share/apache/htdocs/manual/netware.html
 share/apache/htdocs/manual/install-tpf.html
 share/apache/htdocs/manual/readme-tpf.html
 share/apache/htdocs/manual/misc/API.html
@@ -170,6 +184,7 @@ share/apache/htdocs/manual/misc/perf-dec.html
 share/apache/htdocs/manual/misc/perf-hp.html
 share/apache/htdocs/manual/misc/perf-tuning.html
 share/apache/htdocs/manual/misc/perf.html
+share/apache/htdocs/manual/misc/rewriteguide.html
 share/apache/htdocs/manual/misc/security_tips.html
 share/apache/htdocs/manual/misc/vif-info.html
 share/apache/htdocs/manual/misc/windoz_keepalive.html