Upgrade to Apache 1.3.4 + mod_ssl 2.2.4

PS: This mod_ssl version has two really nasty bugs fixed,
    so you're strongly encouraged to upgrade.

4 files changed, 13 insertions, 12 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 60ff2afe59bb..3f1bca11c2fa 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	Apache + mod_ssl
-# Version required:	1.3.4 + 2.2.3
+# Version required:	1.3.4 + 2.2.4
 # Date created:		Sat Aug 22 12:00:00 CDT 1998
 # Whom:			rse@engelschall.com
 #
-# $Id: Makefile,v 1.20 1999/02/05 15:36:09 rse Exp $
+# $Id: Makefile,v 1.21 1999/02/21 17:05:24 rse Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -33,7 +33,7 @@ BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/openssl \
 RUN_DEPENDS=	ssleay:${PORTSDIR}/security/openssl
 
 VERSION_APACHE=	1.3.4
-VERSION_MODSSL=	2.2.3
+VERSION_MODSSL=	2.2.4
 
 Y2K=		http://www.engelschall.com/sw/mod_ssl/docs/2.2/ssl_faq.html#y2k
 RESTRICTED=	"Contains cryptography"
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index 3f70db3ab2c6..89eb31944e93 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
 MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3
-MD5 (mod_ssl-2.2.3-1.3.4.tar.gz) = eaa885df7ed38ce92396ec3271df0a68
+MD5 (mod_ssl-2.2.4-1.3.4.tar.gz) = 8abe5c4d041c49f4fb8f4525f836fd59
diff --git a/www/apache13-modssl/pkg-descr b/www/apache13-modssl/pkg-descr
index c94f1f945eb3..d4fce03c6af7 100644
--- a/www/apache13-modssl/pkg-descr
+++ b/www/apache13-modssl/pkg-descr
@@ -1,12 +1,13 @@
  Apache 1.3 + mod_ssl 2.2          ``mod_ssl combines the flexibility of  
- ========================            Apache with the security of SSLeay.''
+ ========================            Apache with the security of OpenSSL.''
 
  This is Apache version 1.3 plus mod_ssl which provides strong cryptography
  via the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
- v1) protocols by the help of the SSL/TLS implementation library SSLeay from
- Eric A. Young and Tim J. Hudson. The mod_ssl package was created in April
- 1998 by Ralf S. Engelschall and was originally derived from software
- developed by Ben Laurie for use in the Apache-SSL HTTP server project. 
+ v1) protocols by the help of the SSL/TLS implementation toolkit OpenSSL which
+ is based on SSLeay from Eric A. Young and Tim J. Hudson. The mod_ssl package
+ was created in April 1998 by Ralf S. Engelschall and was originally derived
+ from software developed by Ben Laurie for use in the Apache-SSL HTTP server
+ project. 
 
  As a summary, here are its main SSL/TLS-related features:
    o  Open-Source software (BSD-style license)
@@ -18,7 +19,7 @@
    o  Clean Apache module architecture
    o  Integrates seamlessly into Apache through an Extended API (EAPI)
    o  Full Dynamic Shared Object (DSO) support
-   o  Support for the SSLeay+RSAref US-situation
+   o  Support for the OpenSSL+RSAref US-situation
    o  Advanced pass-phrase handling for private keys
    o  X.509 certificate based authentication for both client and server
    o  Support for per-URL renegotiation of SSL handshake parameters
@@ -35,4 +36,4 @@
  All documentation can be found on-line on the Web:
    o  Apache:  http://www.apache.org/
    o  mod_ssl: http://www.engelschall.com/sw/mod_ssl/
-   o  SSLeay:  http://www.ssleay.org/
+   o  OpenSSL: http://www.openssl.org/
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index e99b18552c59..d967976b9f8b 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -116,7 +116,7 @@ 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/ssleay.gif
+share/doc/apache/manual/images/openssl_ics.gif
 share/doc/apache/manual/images/sub.gif
 share/doc/apache/manual/index.html
 share/doc/apache/manual/install.html