Upgrade to Apache 1.3.6 + mod_ssl 2.3.1

Submitted by:	Ralf S. Engelschall <rse@FreeBSD.org> (maintainer)

4 files changed, 32 insertions, 13 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index da32358a2a5f..0d797d2fc09b 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.6 + 2.2.8
+# Version required:	1.3.6 + 2.3.1
 # Date created:		Sat Aug 22 12:00:00 CDT 1998
 # Whom:			rse@engelschall.com
 #
-# $Id: Makefile,v 1.30 1999/04/12 14:25:36 rse Exp $
+# $Id: Makefile,v 1.31 1999/04/30 21:48:16 rse Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -47,9 +47,9 @@ BUILD_DEPENDS=	openssl:${PORTSDIR}/security/openssl \
 RUN_DEPENDS=	openssl:${PORTSDIR}/security/openssl
 
 VERSION_APACHE=	1.3.6
-VERSION_MODSSL=	2.2.8
+VERSION_MODSSL=	2.3.1
 
-Y2K=		http://www.engelschall.com/sw/mod_ssl/docs/2.2/ssl_faq.html#y2k
+Y2K=		http://www.engelschall.com/sw/mod_ssl/docs/2.3/ssl_faq.html#y2k
 RESTRICTED=	"Contains cryptography"
 
 USE_PERL5=	yes
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index f73126595320..34d5a67c9339 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
 MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
-MD5 (mod_ssl-2.2.8-1.3.6.tar.gz) = 0aaf0ff78d38cc53ad10fe73cc42a0f5
+MD5 (mod_ssl-2.3.1-1.3.6.tar.gz) = e82a532308eaff55d68925c5bd0efdf6
diff --git a/www/apache13-modssl/pkg-descr b/www/apache13-modssl/pkg-descr
index d4fce03c6af7..b3dd15df941c 100644
--- a/www/apache13-modssl/pkg-descr
+++ b/www/apache13-modssl/pkg-descr
@@ -1,5 +1,8 @@
- Apache 1.3 + mod_ssl 2.2          ``mod_ssl combines the flexibility of  
- ========================            Apache with the security of OpenSSL.''
+ Apache 1.3 + mod_ssl 2.3         ``mod_ssl combines the flexibility of   
+ ========================           Apache with the security of OpenSSL.''
+                                  
+ The Apache Interface to OpenSSL  ``The best SSL solution for       
+ http://www.modssl.org/             Apache money can't buy.''         
 
  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
@@ -12,9 +15,10 @@
  As a summary, here are its main SSL/TLS-related features:
    o  Open-Source software (BSD-style license)
    o  Useable for both commercial and non-commercial use
-   o  Available for both Unix and Win32 platforms
+   o  Available for both Unix and Win32 (Windows 95/98/NT) platforms 
    o  128-bit strong cryptography world-wide
    o  Support for SSLv2, SSLv3 and TLSv1 protocols
+   o  Support for both RSA and Diffie-Hellman ciphers
    o  Clean reviewable ANSI C source code 
    o  Clean Apache module architecture
    o  Integrates seamlessly into Apache through an Extended API (EAPI)
@@ -22,6 +26,7 @@
    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  X.509 certificate revocation list (CRL) support
    o  Support for per-URL renegotiation of SSL handshake parameters
    o  Support for explicit seeding of the PRNG from external sources
    o  Additional boolean-expression based access control facility
@@ -31,9 +36,9 @@
    o  Simple and robust application to Apache source trees
    o  Fully integrated into the Apache 1.3 configuration mechanism
    o  Additional integration into the Apache Autoconf-style Interface (APACI)
-   o  Assistance in X.509 v3 certificate generation
+   o  Assistance in X.509v3 certificate generation (both RSA and DSA)
 
  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  mod_ssl: http://www.modssl.org/
    o  OpenSSL: http://www.openssl.org/
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index 8f4ea0d02505..036d9802dfc3 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -17,16 +17,28 @@ etc/apache/mime.types.default
 etc/apache/ssl.crt/README.CRT
 etc/apache/ssl.crt/Makefile
 etc/apache/ssl.crt/ca-bundle.crt
-etc/apache/ssl.crt/snakeoil-ca.crt
+etc/apache/ssl.crt/snakeoil-ca-rsa.crt
+etc/apache/ssl.crt/snakeoil-ca-dsa.crt
+etc/apache/ssl.crt/snakeoil-rsa.crt
+etc/apache/ssl.crt/snakeoil-dsa.crt
 etc/apache/ssl.crt/server.crt
+etc/apache/ssl.crl/README.CRL
+etc/apache/ssl.crl/Makefile
 etc/apache/ssl.csr/README.CSR
 etc/apache/ssl.csr/server.csr
+etc/apache/ssl.prm/README.PRM
+etc/apache/ssl.prm/snakeoil-ca-dsa.prm
+etc/apache/ssl.prm/snakeoil-dsa.prm
 etc/apache/ssl.key/README.KEY
-etc/apache/ssl.key/snakeoil-ca.key
+etc/apache/ssl.key/snakeoil-ca-rsa.key
+etc/apache/ssl.key/snakeoil-ca-dsa.key
+etc/apache/ssl.key/snakeoil-rsa.key
+etc/apache/ssl.key/snakeoil-dsa.key
 etc/apache/ssl.key/server.key
 include/apache/alloc.h
 include/apache/ap_ctx.h
 include/apache/ap_hook.h
+include/apache/ap_mm.h
 include/apache/ap.h
 include/apache/ap_compat.h
 include/apache/ap_config.h
@@ -200,7 +212,7 @@ share/apache/htdocs/manual/mod/mod_ssl/index.html
 share/apache/htdocs/manual/mod/mod_ssl/ssl_compat.gfont000.gif
 share/apache/htdocs/manual/mod/mod_ssl/ssl_compat.html
 share/apache/htdocs/manual/mod/mod_ssl/ssl_cover_logo.jpg
-share/apache/htdocs/manual/mod/mod_ssl/ssl_cover_title.gif
+share/apache/htdocs/manual/mod/mod_ssl/ssl_cover_title.jpg
 share/apache/htdocs/manual/mod/mod_ssl/ssl_faq.gfont000.gif
 share/apache/htdocs/manual/mod/mod_ssl/ssl_faq.html
 share/apache/htdocs/manual/mod/mod_ssl/ssl_glossary.html
@@ -389,7 +401,9 @@ share/apache/icons/small/uu.gif
 @exec cd %D/etc/apache/ssl.crt && make >/dev/null 2>&1
 @unexec rm -f %D/etc/apache/ssl.crt/[0-9a-fA-F]*.[0-9]*
 @dirrm etc/apache/ssl.crt
+@dirrm etc/apache/ssl.crl
 @dirrm etc/apache/ssl.csr
+@dirrm etc/apache/ssl.prm
 @dirrm etc/apache/ssl.key
 @dirrm etc/apache
 @dirrm include/apache