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".

1 files changed, 32 insertions, 35 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"