Update ap-ssl to 2.7.0. Major changes from version 2.6.6:

    o  Added experimental support for OpenSSL's crypto device support
    o  Completely removed RSAref support
    o  Added new Cyclic Buffer based Shared Memory Session Cache variant
    o  Restructured the Session Cache implementation(s)
    o  Upgrade to Apache 1.3.14

4 files changed, 13 insertions, 33 deletions

diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index e01df30b6e1..02949c8aae8 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,44 +1,29 @@
-# $NetBSD: Makefile,v 1.23 2000/10/05 14:07:37 fredb Exp $
+# $NetBSD: Makefile,v 1.24 2000/10/13 21:48:01 jlam Exp $
 #
 
-DISTNAME=	mod_ssl-2.6.6-1.3.12
-PKGNAME=	ap-ssl-2.6.6
+DISTNAME=	mod_ssl-2.7.0-1.3.14
+PKGNAME=	ap-ssl-2.7.0
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.modssl.org/source/
 
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.modssl.org/
 
-DEPENDS+=	apache-1.3.12:../../www/apache
+DEPENDS+=	apache-1.3.14:../../www/apache
 # For "apxs":
 BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
 
 CONFLICTS=	apache-1.3.[0123456789] apache-*modssl-* apache6-*
 
 HAS_CONFIGURE=	defined
-USE_RSAREF2=	NO
 USE_SSL=	defined
 
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 .include "../../mk/bsd.prefs.mk"
 
-fetch-depends:
-.if !defined(USE_RSAREF2) || ${USE_RSAREF2} != YES && ${USE_RSAREF2} != NO
-	@${ECHO} ""
-	@${ECHO} "The variable USE_RSAREF2 must be set to either YES or NO"
-	@${ECHO} "in order to build this package.  People with no RSA"
-	@${ECHO} "license MUST set this variable to YES.  Users outside"
-	@${ECHO} "the USA MUST set this variable to NO.  RSA licensees may"
-	@${ECHO} "choose -- NO is faster."
-	@${FALSE}
-.endif
-
 CONFIGURE_ARGS+=	--with-apxs=${PREFIX}/sbin/apxs
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
-.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
-CONFIGURE_ARGS+=	--with-rsa=${PREFIX}/lib
-.endif
 
 post-extract:
 	@cd ${WRKSRC}/pkg.sslsup; ${MV} -f mkcert.sh mkcert.sh.in
diff --git a/www/ap-ssl/files/md5 b/www/ap-ssl/files/md5
index 3066a3284df..5bb604ef796 100644
--- a/www/ap-ssl/files/md5
+++ b/www/ap-ssl/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.7 2000/09/12 14:05:16 jlam Exp $
+$NetBSD: md5,v 1.8 2000/10/13 21:48:02 jlam Exp $
 
-MD5 (mod_ssl-2.6.6-1.3.12.tar.gz) = 573b4d89c1f203216a55fb5c2aece009
+MD5 (mod_ssl-2.7.0-1.3.14.tar.gz) = 65aae4a18dcd0e36140dbfda4584f8d7
diff --git a/www/ap-ssl/pkg/MESSAGE b/www/ap-ssl/pkg/MESSAGE
index 1d6462fe056..0ebf358fa2e 100644
--- a/www/ap-ssl/pkg/MESSAGE
+++ b/www/ap-ssl/pkg/MESSAGE
@@ -1,5 +1,5 @@
 =============================================================================
-$NetBSD: MESSAGE,v 1.4 2000/09/12 14:05:16 jlam Exp $
+$NetBSD: MESSAGE,v 1.5 2000/10/13 21:48:02 jlam Exp $
 
 You will need to generate certificates and keys for your server before
 Apache will start with mod_ssl support.  Please read
@@ -15,9 +15,4 @@ configuration parts of the default httpd.conf are bracketed by:
   <IfDefine SSL>
   </IfDefine>
 
-If you are using RSAREF, you MUST uncomment the line in the SSL block of
-httpd.conf which reads:
-
-  #LoadFile !librsaref.so
-
 =============================================================================
diff --git a/www/ap-ssl/pkg/PLIST b/www/ap-ssl/pkg/PLIST
index 4fabdfe298b..3717240a0fa 100644
--- a/www/ap-ssl/pkg/PLIST
+++ b/www/ap-ssl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/09/12 14:58:56 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/10/13 21:48:02 jlam Exp $
 etc/httpd/mod_ssl.conf
 etc/httpd/ssl.crl/Makefile.crl
 etc/httpd/ssl.crl/README.CRL
@@ -21,10 +21,6 @@ etc/httpd/ssl.prm/snakeoil-dsa.prm
 lib/httpd/mod_ssl.so
 sbin/mkcert.sh
 share/doc/mod_ssl/README.mkcert
-share/mod_ssl/cca.sh
-share/mod_ssl/gid-mkcert.sh
-share/mod_ssl/loadcacert.cgi
-share/mod_ssl/sign.sh
 share/httpd/htdocs/manual/mod/mod_ssl/apache_pb.gif
 share/httpd/htdocs/manual/mod/mod_ssl/feather.jpg
 share/httpd/htdocs/manual/mod/mod_ssl/index.html
@@ -74,6 +70,10 @@ share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-preface.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-ref.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-toc.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-tutor.gif
+share/mod_ssl/cca.sh
+share/mod_ssl/gid-mkcert.sh
+share/mod_ssl/loadcacert.cgi
+share/mod_ssl/sign.sh
+@dirrm share/mod_ssl
 @dirrm share/httpd/htdocs/manual/mod/mod_ssl
 @dirrm share/doc/mod_ssl
-@dirrm share/mod_ssl