Fix installation so that existing config files are preserved when building

from source instead of installing from a binary package (problem noted in
private email by George Coulouris <george@coulouris.org>.  Also move the
ownership of SSL-related config directories to the www/ap-ssl package.

3 files changed, 22 insertions, 85 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 6745ee944f8..09f7982fd76 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2001/12/26 21:20:27 jlam Exp $
+# $NetBSD: Makefile,v 1.87 2002/01/01 06:12:05 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -107,12 +107,7 @@ SUPPORT_FILES=	${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic
 SUPPORT_FILES+=	${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types
 RCD_SCRIPTS=	apache
 
-OWN_DIRS=		${PKG_SYSCONFDIR}/ssl.crl
-OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.crt
-OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.csr
-OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.key
-OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.prm
-OWN_DIRS+=		/var/log/httpd
+OWN_DIRS=		/var/log/httpd
 OWN_DIRS+=		/var/spool/httpd
 OWN_DIRS_PERMS+=	/var/spool/httpd/proxy nobody nobody 0755
 
diff --git a/www/apache/distinfo b/www/apache/distinfo
index d2b4fb57e72..fcb378db647 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2001/11/15 05:32:56 jlam Exp $
+$NetBSD: distinfo,v 1.11 2002/01/01 06:12:05 jlam Exp $
 
 SHA1 (apache_1.3.22.tar.gz) = 5b93c1f8c8cfb703e6082ffa2cd99ea017e1e05e
 Size (apache_1.3.22.tar.gz) = 2177983 bytes
@@ -6,7 +6,7 @@ SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
 SHA1 (mod_ssl-2.8.5-1.3.22.tar.gz) = 432be249fbaa3a87391b50af7b138c5496fac209
 Size (mod_ssl-2.8.5-1.3.22.tar.gz) = 751863 bytes
-SHA1 (patch-aa) = 186301fa5568e275cbd91d9881bcd8d122079fd9
+SHA1 (patch-aa) = 201845cdb27542899dad8d24e91c02983e25f96e
 SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6
 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd
 SHA1 (patch-ad) = 79e9b2adb23e412195f0382b30b56496af735297
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index 50c314ac778..b4f0e31706c 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,8 +1,20 @@
-$NetBSD: patch-aa,v 1.16 2001/11/15 05:32:57 jlam Exp $
+$NetBSD: patch-aa,v 1.17 2002/01/01 06:12:06 jlam Exp $
 
---- Makefile.tmpl.orig	Thu Nov 15 00:06:33 2001
+--- Makefile.tmpl.orig	Tue Jan  1 00:38:59 2002
 +++ Makefile.tmpl
-@@ -387,34 +387,6 @@
+@@ -324,11 +324,6 @@
+ 	$(MKDIR) $(root)$(mandir)/man1
+ 	$(MKDIR) $(root)$(mandir)/man8
+ 	$(MKDIR) $(root)$(sysconfdir)
+-	$(MKDIR) $(root)$(sysconfdir)/ssl.crt
+-	$(MKDIR) $(root)$(sysconfdir)/ssl.crl
+-	$(MKDIR) $(root)$(sysconfdir)/ssl.csr
+-	$(MKDIR) $(root)$(sysconfdir)/ssl.key
+-	$(MKDIR) $(root)$(sysconfdir)/ssl.prm
+ 	$(MKDIR) $(root)$(htdocsdir)
+ 	$(MKDIR) $(root)$(manualdir)
+ 	$(MKDIR) $(root)$(iconsdir)
+@@ -387,34 +382,6 @@
  			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
  			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
  			$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
@@ -37,7 +49,7 @@ $NetBSD: patch-aa,v 1.16 2001/11/15 05:32:57 jlam Exp $
  		done; \
  	fi
  	@echo "<=== [programs]"
-@@ -531,7 +503,7 @@
+@@ -531,7 +498,7 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -46,14 +58,7 @@ $NetBSD: patch-aa,v 1.16 2001/11/15 05:32:57 jlam Exp $
  		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
  	else \
  		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-@@ -547,15 +519,16 @@
- 		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
- 		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
- 	fi
--	-@if [ -f $(root)$(cgidir)/printenv ]; then \
-+	-@if false; then \
- 		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
- 	else \
+@@ -553,9 +520,10 @@
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
@@ -66,7 +71,7 @@ $NetBSD: patch-aa,v 1.16 2001/11/15 05:32:57 jlam Exp $
  		done; \
  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
-@@ -569,7 +542,7 @@
+@@ -569,7 +537,7 @@
  #   and initial config files while preserving existing ones.
  install-config:
  	@echo "===> [config: Installing Apache configuration files]"
@@ -75,66 +80,3 @@ $NetBSD: patch-aa,v 1.16 2001/11/15 05:32:57 jlam Exp $
  		if [ .$$conf = .httpd.conf ]; then \
  			target_conf="$(TARGET).conf"; \
  		else \
-@@ -622,7 +595,7 @@
-         	> $(TOP)/$(SRC)/.apaci.install.tmp && \
- 		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
- 		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
--		if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
-+		if true; then \
- 			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
- 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
- 		else \
-@@ -632,7 +605,7 @@
- 	-@for conf in mime.types magic; do \
- 		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
- 		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
--		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
-+		if true; then \
- 			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
- 			$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
- 		else \
-@@ -650,7 +623,7 @@
- 		chmod 700 $(root)$(sysconfdir)/ssl.key; \
- 		echo "chmod 755 $(root)$(sysconfdir)/ssl.prm"; \
- 		chmod 755 $(root)$(sysconfdir)/ssl.prm; \
--		if [ ! -f "$(root)$(sysconfdir)/ssl.crt/README.CRT" ]; then \
-+		if true; then \
- 			echo "$(INSTALL_DATA) $(TOP)/conf/ssl.crt/README.CRT $(root)$(sysconfdir)/ssl.crt/README.CRT"; \
- 			$(INSTALL) $(TOP)/conf/ssl.crt/README.CRT $(root)$(sysconfdir)/ssl.crt/README.CRT; \
- 			echo "$(INSTALL_DATA) $(TOP)/conf/ssl.crt/Makefile $(root)$(sysconfdir)/ssl.crt/Makefile"; \
-@@ -677,7 +650,7 @@
- 		echo "Updating hash symlinks in $(root)$(sysconfdir)/ssl.crt/:"; \
- 		SSL_PROGRAM="`grep '^SSL_PROGRAM=' $(TOP)/$(SRC)/Makefile.config | sed -e 's:^.*=::'`"; \
- 		(cd $(root)$(sysconfdir)/ssl.crt/ && $(MAKE) $(MFLAGS) SSL_PROGRAM=$$SSL_PROGRAM); \
--		if [ ! -f "$(root)$(sysconfdir)/ssl.csr/README.CSR" ]; then \
-+		if true; then \
- 			echo "$(INSTALL_DATA) $(TOP)/conf/ssl.csr/README.CSR $(root)$(sysconfdir)/ssl.csr/README.CSR"; \
- 			$(INSTALL) $(TOP)/conf/ssl.csr/README.CSR $(root)$(sysconfdir)/ssl.csr/README.CSR; \
- 			echo "$(INSTALL_DATA) -m 400 $(TOP)/conf/ssl.csr/server.csr $(root)$(sysconfdir)/ssl.csr/server.csr"; \
-@@ -685,7 +658,7 @@
- 		else \
- 			echo "[PRESERVING EXISTING CSR FILES: $(root)$(sysconfdir)/ssl.csr/*]"; \
- 		fi; \
--		if [ ! -f "$(root)$(sysconfdir)/ssl.crl/README.CRL" ]; then \
-+		if true; then \
- 			echo "$(INSTALL_DATA) $(TOP)/conf/ssl.crl/README.CRL $(root)$(sysconfdir)/ssl.crl/README.CRL"; \
- 			$(INSTALL) $(TOP)/conf/ssl.crl/README.CRL $(root)$(sysconfdir)/ssl.crl/README.CRL; \
- 			echo "$(INSTALL_DATA) $(TOP)/conf/ssl.crl/Makefile $(root)$(sysconfdir)/ssl.crl/Makefile"; \
-@@ -693,7 +666,7 @@
- 		else \
- 			echo "[PRESERVING EXISTING CRL FILES: $(root)$(sysconfdir)/ssl.crl/*]"; \
- 		fi; \
--		if [ ! -f "$(root)$(sysconfdir)/ssl.key/README.KEY" ]; then \
-+		if true; then \
- 			echo "$(INSTALL_DATA) $(TOP)/conf/ssl.key/README.KEY $(root)$(sysconfdir)/ssl.key/README.KEY"; \
- 			$(INSTALL) $(TOP)/conf/ssl.key/README.KEY $(root)$(sysconfdir)/ssl.key/README.KEY; \
- 			echo "$(INSTALL_DATA) -m 400 $(TOP)/conf/ssl.key/snakeoil-ca-rsa.key $(root)$(sysconfdir)/ssl.key/snakeoil-ca-rsa.key"; \
-@@ -713,7 +686,7 @@
- 		else \
- 			echo "[PRESERVING EXISTING KEY FILES: $(root)$(sysconfdir)/ssl.key/*]"; \
- 		fi; \
--		if [ ! -f "$(root)$(sysconfdir)/ssl.prm/README.PRM" ]; then \
-+		if true; then \
- 			echo "$(INSTALL_DATA) $(TOP)/conf/ssl.prm/README.PRM $(root)$(sysconfdir)/ssl.prm/README.PRM"; \
- 			$(INSTALL) $(TOP)/conf/ssl.prm/README.PRM $(root)$(sysconfdir)/ssl.prm/README.PRM; \
- 			echo "$(INSTALL_DATA) -m 400 $(TOP)/conf/ssl.prm/snakeoil-ca-dsa.prm $(root)$(sysconfdir)/ssl.prm/snakeoil-ca-dsa.prm"; \