Update ap-ssl to 2.8.0. Relevant changes from version 2.7.1:

   -) Rename mod_ssl.conf to apache_start.conf.
   *) Upgraded to Apache 1.3.17 as base version.
   *) Allow %{ENV:variable} in SSLRequire expressions, too.
   *) Make sure the user is not able to fake the client certificate
      based authentication by just entering an X.509 Subject DN
      ("/XX=YYY/XX=YYY/..") as the username and "password" as the
      password if "SSLVerifyClient optional" is used in combination
      with "SSLOptions +FakeBasicAuth".

8 files changed, 51 insertions, 56 deletions

diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 67688099e07..3b6d452b7ab 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.27 2001/01/29 11:34:44 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.28 2001/02/02 16:41:22 jlam Exp $
 
-DISTNAME=	mod_ssl-2.7.1-1.3.14
-PKGNAME=	ap-ssl-2.7.1
-CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.modssl.org/source/
+DISTNAME=		mod_ssl-2.8.0-1.3.17
+PKGNAME=		ap-ssl-2.8.0
+CATEGORIES=		www security
+MASTER_SITES=		http://www.modssl.org/source/
 
-MAINTAINER=	jlam@netbsd.org
-HOMEPAGE=	http://www.modssl.org/
+MAINTAINER=		jlam@netbsd.org
+HOMEPAGE=		http://www.modssl.org/
 
-DEPENDS+=	apache-1.3.14nb1:../../www/apache
+DEPENDS+=		apache-1.3.17:../../www/apache
 # For "apxs":
-BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS+=		${PERL5}:../../lang/perl5-base
 
-CONFLICTS=	apache-1.3.[0123456789] apache-*modssl-* apache6-*
+CONFLICTS=		apache-1.3.[0-9] apache-*modssl-* apache6-*
 
-HAS_CONFIGURE=	defined
-USE_SSL=	defined
+HAS_CONFIGURE=		# defined
+USE_SSL=		# defined
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,44 +23,42 @@ CONFIGURE_ARGS+=	--with-apxs=${PREFIX}/sbin/apxs
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 
 post-extract:
-	@cd ${WRKSRC}/pkg.sslsup; ${MV} -f mkcert.sh mkcert.sh.in
+	cd ${WRKSRC}/pkg.contrib; ${MV} -f loadcacert.cgi loadcacert.cgi.in
+	cd ${WRKSRC}/pkg.sslsup; ${MV} -f mkcert.sh mkcert.sh.in
 
 post-build:
-	${SED} -e "s,@PREFIX@,${PREFIX},g" \
-		< ${WRKSRC}/pkg.sslsup/mkcert.sh.in \
-		> ${WRKSRC}/pkg.sslsup/mkcert.sh
+	cd ${WRKSRC}; ${SED} -e "s|^#!/.*|#!${PERL5}|g"			\
+		pkg.contrib/loadcacert.cgi.in > pkg.contrib/loadcacert.cgi
+	cd ${WRKSRC}; ${SED} -e "s|@PREFIX@|${PREFIX}|g"		\
+		pkg.sslsup/mkcert.sh.in > pkg.sslsup/mkcert.sh
 
 post-install:
-	@${SED} -e "s,@PREFIX@,${PREFIX},g" \
-		< ${FILESDIR}/README.mkcert > ${WRKDIR}/README.mkcert
+	${SED} -e "s|@PREFIX@|${PREFIX}|g"				\
+		${FILESDIR}/README.mkcert > ${WRKDIR}/README.mkcert
 
-	@cd ${PREFIX}/lib/httpd; ${MV} -f libssl.so mod_ssl.so
-	${INSTALL_SCRIPT} ${WRKSRC}/pkg.sslsup/mkcert.sh ${PREFIX}/sbin
-	${INSTALL_DATA} ${FILESDIR}/mod_ssl.conf ${PREFIX}/etc/httpd
+	cd ${PREFIX}/lib/httpd; ${MV} -f libssl.so mod_ssl.so
+	cd ${WRKSRC}/pkg.sslsup; ${INSTALL_SCRIPT} mkcert.sh ${PREFIX}/sbin
+	${INSTALL_DATA} ${FILESDIR}/apache_start.conf ${PREFIX}/etc/httpd
 
 	${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl
-	cd ${WRKSRC}/pkg.ssldoc && ${INSTALL_DATA} *.html *.gif *.jpg \
+	cd ${WRKSRC}/pkg.ssldoc; ${INSTALL_DATA} *.html *.gif *.jpg	\
 		${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl
 	${INSTALL_DATA_DIR} ${PREFIX}/share/mod_ssl
-	cd ${WRKSRC}/pkg.contrib && \
-		${INSTALL_SCRIPT} *.sh *.cgi ${PREFIX}/share/mod_ssl
+	cd ${WRKSRC}/pkg.contrib; ${INSTALL_SCRIPT} *.sh *.cgi		\
+		${PREFIX}/share/mod_ssl
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_ssl
 	${INSTALL_DATA} ${WRKDIR}/README.mkcert ${PREFIX}/share/doc/mod_ssl
 
-	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.CRL \
-		`ls -1 ${WRKSRC}/pkg.sslcfg/*.crl | ${GREP} -v /server\.` \
+	cd ${WRKSRC}/pkg.sslcfg; ${RM} -f server.*
+	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.CRL *.crl	\
 		${PREFIX}/etc/httpd/ssl.crl
-	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.CRT \
-		`ls -1 ${WRKSRC}/pkg.sslcfg/*.crt | ${GREP} -v /server\.` \
+	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.CRT *.crt	\
 		${PREFIX}/etc/httpd/ssl.crt
-	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.CSR \
-		`ls -1 ${WRKSRC}/pkg.sslcfg/*.csr | ${GREP} -v /server\.` \
+	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.CSR		\
 		${PREFIX}/etc/httpd/ssl.csr
-	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.KEY \
-		`ls -1 ${WRKSRC}/pkg.sslcfg/*.key | ${GREP} -v /server\.` \
+	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.KEY *.key	\
 		${PREFIX}/etc/httpd/ssl.key
-	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.PRM \
-		`ls -1 ${WRKSRC}/pkg.sslcfg/*.prm | ${GREP} -v /server\.` \
+	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.PRM *.prm	\
 		${PREFIX}/etc/httpd/ssl.prm
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-ssl/files/mod_ssl.conf b/www/ap-ssl/files/apache_start.conf
index 7eaf1de5995..5269edd8fba 100644
--- a/www/ap-ssl/files/mod_ssl.conf
+++ b/www/ap-ssl/files/apache_start.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mod_ssl.conf,v 1.1 2000/09/12 14:52:44 jlam Exp $
+# $NetBSD: apache_start.conf,v 1.1 2001/02/02 16:41:22 jlam Exp $
 #
 # Start Apache with "startssl" instead of "start".
 #
diff --git a/www/ap-ssl/files/md5 b/www/ap-ssl/files/md5
index 6ec71973576..775c2c674a0 100644
--- a/www/ap-ssl/files/md5
+++ b/www/ap-ssl/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.9 2000/10/17 18:14:17 jlam Exp $
+$NetBSD: md5,v 1.10 2001/02/02 16:41:22 jlam Exp $
 
-MD5 (mod_ssl-2.7.1-1.3.14.tar.gz) = 99e05bd4ab7bd5c72fbb70bd8cfbf283
+MD5 (mod_ssl-2.8.0-1.3.17.tar.gz) = 3a158f3b5442cb8b7bee4a55851c3794
diff --git a/www/ap-ssl/files/patch-sum b/www/ap-ssl/files/patch-sum
index 0c10be8309a..394e0f74409 100644
--- a/www/ap-ssl/files/patch-sum
+++ b/www/ap-ssl/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/09/12 14:05:16 jlam Exp $
+$NetBSD: patch-sum,v 1.6 2001/02/02 16:41:23 jlam Exp $
 
-MD5 (patch-aa) = 685fc042385a78c4d961ded8ac806411
+MD5 (patch-aa) = f4b24f18938bd6784fdd51973df0c9dd
 MD5 (patch-ab) = c89fc044f617d8938cedeecf5319a509
diff --git a/www/ap-ssl/patches/patch-aa b/www/ap-ssl/patches/patch-aa
index 6c209cbcfe4..bbe3160da25 100644
--- a/www/ap-ssl/patches/patch-aa
+++ b/www/ap-ssl/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2000/09/12 14:05:16 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/02/02 16:41:23 jlam Exp $
 
---- pkg.sslmod/libssl.module.orig	Sat Jun  3 01:26:46 2000
-+++ pkg.sslmod/libssl.module	Sat Jun  3 01:26:58 2000
-@@ -418,7 +418,7 @@
+--- pkg.sslmod/libssl.module.orig	Mon Jan  1 05:48:53 2001
++++ pkg.sslmod/libssl.module
+@@ -427,7 +427,7 @@
              exit 1
          fi
      fi
diff --git a/www/ap-ssl/pkg/COMMENT b/www/ap-ssl/pkg/COMMENT
index b98a61f5975..f884113a12d 100644
--- a/www/ap-ssl/pkg/COMMENT
+++ b/www/ap-ssl/pkg/COMMENT
@@ -1 +1 @@
-Secure Sockets Layer module for Apache
+SSL/TLS protocols module for Apache
diff --git a/www/ap-ssl/pkg/DESCR b/www/ap-ssl/pkg/DESCR
index 65daf42ddae..cbf66f7faf8 100644
--- a/www/ap-ssl/pkg/DESCR
+++ b/www/ap-ssl/pkg/DESCR
@@ -1,17 +1,15 @@
                        _             _ 
-   _ __ ___   ___   __| |    ___ ___| |  
-  | '_ ` _ \ / _ \ / _` |   / __/ __| |  
-  | | | | | | (_) | (_| |   \__ \__ \ |  mod_ssl - Apache Interface to SSLeay  
-  |_| |_| |_|\___/ \__,_|___|___/___/_|  http://www.engelschall.com/sw/mod_ssl/
+   _ __ ___   ___   __| |    ___ ___| |  mod_ssl
+  | '_ ` _ \ / _ \ / _` |   / __/ __| |  Apache Interface to OpenSSL
+  | | | | | | (_) | (_| |   \__ \__ \ |  www.modssl.org
+  |_| |_| |_|\___/ \__,_|___|___/___/_|  ftp.modssl.org
                        |_____|         
-
-  Description
-  ___________
+  _____________________________________________________________________________
 
   This Apache module provides strong cryptography for the Apache 1.3 webserver
   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. 
+  v1) protocols by the help of the Open Source SSL/TLS 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
diff --git a/www/ap-ssl/pkg/PLIST b/www/ap-ssl/pkg/PLIST
index 3717240a0fa..d13c2b7c97f 100644
--- a/www/ap-ssl/pkg/PLIST
+++ b/www/ap-ssl/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2000/10/13 21:48:02 jlam Exp $
-etc/httpd/mod_ssl.conf
+@comment $NetBSD: PLIST,v 1.9 2001/02/02 16:41:23 jlam Exp $
+etc/httpd/apache_start.conf
 etc/httpd/ssl.crl/Makefile.crl
 etc/httpd/ssl.crl/README.CRL
 etc/httpd/ssl.crt/Makefile.crt