From a51550e063a672e45a69f98e7d865313a1596318 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Fri, 21 Jul 2000 16:59:28 +0000
Subject: Don't install dummy server key and certificate which would overwrite
 the real certifacte and key during. Fixes PR pkg/10644 by Olaf Seibert.

---
 www/ap-ssl/Makefile  | 14 +++++++++-----
 www/ap-ssl/pkg/PLIST |  5 +----
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'www/ap-ssl')

diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 4c6548da3c7..85671cbf1b4 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/04/26 21:18:53 tron Exp $
+# $NetBSD: Makefile,v 1.17 2000/07/21 16:59:28 tron Exp $
 #
 
 DISTNAME=	mod_ssl-2.6.3-1.3.12
@@ -45,12 +45,16 @@ post-install:
 	cd ${WRKSRC}/pkg.contrib && \
 		${INSTALL_SCRIPT} *.sh *.cgi ${PREFIX}/share/mod_ssl/
 	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.CRL \
-		${WRKSRC}/pkg.sslcfg/*.crl ${PREFIX}/etc/httpd/ssl.crl/
+		`ls -1 ${WRKSRC}/pkg.sslcfg/*.crl | grep -v /server\.` \
+		${PREFIX}/etc/httpd/ssl.crl
 	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.CRT \
-		${WRKSRC}/pkg.sslcfg/*.crt ${PREFIX}/etc/httpd/ssl.crt/
+		`ls -1 ${WRKSRC}/pkg.sslcfg/*.crt | grep -v /server\.` \
+		${PREFIX}/etc/httpd/ssl.crt
 	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.CSR \
-		${WRKSRC}/pkg.sslcfg/*.csr ${PREFIX}/etc/httpd/ssl.csr/
+		`ls -1 ${WRKSRC}/pkg.sslcfg/*.csr | grep -v /server\.` \
+		${PREFIX}/etc/httpd/ssl.csr
 	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.KEY \
-		${WRKSRC}/pkg.sslcfg/*.key ${PREFIX}/etc/httpd/ssl.key/
+		`ls -1 ${WRKSRC}/pkg.sslcfg/*.key | grep -v /server\.` \
+		${PREFIX}/etc/httpd/ssl.key
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-ssl/pkg/PLIST b/www/ap-ssl/pkg/PLIST
index 80dcf052f5c..bd0de62c725 100644
--- a/www/ap-ssl/pkg/PLIST
+++ b/www/ap-ssl/pkg/PLIST
@@ -1,18 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 1999/12/01 01:00:18 bad Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/07/21 16:59:31 tron Exp $
 etc/httpd/ssl.crl/Makefile.crl
 etc/httpd/ssl.crl/README.CRL
 etc/httpd/ssl.crt/Makefile.crt
 etc/httpd/ssl.crt/README.CRT
 etc/httpd/ssl.crt/ca-bundle.crt
-etc/httpd/ssl.crt/server.crt
 etc/httpd/ssl.crt/snakeoil-ca-dsa.crt
 etc/httpd/ssl.crt/snakeoil-ca-rsa.crt
 etc/httpd/ssl.crt/snakeoil-dsa.crt
 etc/httpd/ssl.crt/snakeoil-rsa.crt
 etc/httpd/ssl.csr/README.CSR
-etc/httpd/ssl.csr/server.csr
 etc/httpd/ssl.key/README.KEY
-etc/httpd/ssl.key/server.key
 etc/httpd/ssl.key/snakeoil-ca-dsa.key
 etc/httpd/ssl.key/snakeoil-ca-rsa.key
 etc/httpd/ssl.key/snakeoil-dsa.key
-- 
cgit v1.2.3