From admin@oldwww.westbend.net  Tue Nov 24 21:07:44 1998
Received: from oldwww.westbend.net (www.westbend.net [156.46.203.4] (may be forged))
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id VAA25185
          for <FreeBSD-gnats-submit@freebsd.org>; Tue, 24 Nov 1998 21:07:42 -0800 (PST)
          (envelope-from admin@oldwww.westbend.net)
Received: (from root@localhost)
	by oldwww.westbend.net (8.8.8/8.8.8) id XAA24044;
	Tue, 24 Nov 1998 23:07:11 -0600 (CST)
	(envelope-from admin)
Message-Id: <199811250507.XAA24044@oldwww.westbend.net>
Date: Tue, 24 Nov 1998 23:07:11 -0600 (CST)
From: hetzels@westbend.net
Reply-To: hetzels@westbend.net
To: FreeBSD-gnats-submit@freebsd.org, danny@pentalpha.com.hk
Subject: Apache13-FP Update: Not creating rootweb when linked to doc directory
X-Send-Pr-Version: 3.2

>Number:         8857
>Category:       ports
>Synopsis:       FP will not create rootweb when data directory is linked to apache document directory
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 24 21:10:00 PST 1998
>Closed-Date:    Wed Nov 25 12:46:25 PST 1998
>Last-Modified:  Wed Nov 25 12:50:00 PST 1998
>Originator:     Scot W. Hetzel
>Release:        FreeBSD 2.2.7-STABLE i386
>Organization:
West Bend Internet
>Environment:


>Description:

From: Danny <danny@pentalpha.com.hk>
:When I try to install apache13-fp on my FreeBSD 2.27 stable. I have the
:follow error.
:
:Creating root web
:'/usr/local/share/doc/apache' does not refer to a page in this web.
:ERROR:  / installation failed.
:Hit enter to continue

When the apache13-fp server is installed onto a clean system (no ${PREFIX}/www
directory), it will fail to install due to the ${PREFIX}/www/data directory is
created as a symbolic link to the ${PREFIX}/share/doc/apache directory.  The
fpsrvadm.exe program will not set up the rootweb to a directory that is either
a symbolic link or has symbolic links in it's directory.

>How-To-Repeat:

Type make install on a system in which ${PREFIX}/www/data doesn't exist.

>Fix:

The attached patch updates the following files:
Makefile - No longer installs apache.sh.tmpl file into rc.d
patches/patch-ab - change link to a recursive copy of ${doc_prefix} into
	${datadir}/data
pkg/PLIST - remove apache.sh.tmpl from package list.

diff -ruN apache13-fp.orig/Makefile apache13-fp/Makefile
--- apache13-fp.orig/Makefile	Thu Nov 19 16:48:42 1998
+++ apache13-fp/Makefile	Tue Nov 24 22:30:45 1998
@@ -106,19 +106,11 @@
 	@${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/http_protocol.patch
 
 post-install:
-	@${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh.tmpl file."
+	@${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh file."
 	@${CAT} ${FILESDIR}/apache.sh.tmpl | \
 		${SED} -e 's;PREFIX;${PREFIX};' -e 's;PERL5;${PERL};' \
-		> ${PREFIX}/etc/rc.d/apache.sh.tmpl
-	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		${CP} ${PREFIX}/etc/rc.d/apache.sh.tmpl ${PREFIX}/etc/rc.d/apache.sh; \
-		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
-	else \
-		${ECHO} "apache.sh exists, please compare with apache.sh.tmpl."; \
-		${ECHO} "The template will regenerate the FrontPage suidkey"; \
-		${ECHO} "file when the apache server is started/restarted."; \
-	fi
+		> ${PREFIX}/etc/rc.d/apache.sh
+	@chmod 751 ${PREFIX}/etc/rc.d/apache.sh
 	@${SH} ${WRKSRC}/${FPINSTALL}
 	@${INSTALL_FILE} ${WRKSRC}/${FPINSTALL} ${PREFIX}/${FPINSTALL}
 	@${INSTALL_FILE} ${WRKSRC}/${CHANGESERVER} ${PREFIX}/${CHANGESERVER}
diff -ruN apache13-fp.orig/patches/patch-ab apache13-fp/patches/patch-ab
--- apache13-fp.orig/patches/patch-ab	Mon Nov  9 19:56:00 1998
+++ apache13-fp/patches/patch-ab	Tue Nov 24 21:57:02 1998
@@ -91,7 +91,7 @@
 ! 		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
 ! #	fi
 ! 	if [ ! -d $(root)$(datadir)/data ]; then \
-! 		$(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \
+! 		$(CP) -rp $(root)$(doc_prefix) $(root)$(datadir)/data; \
   	fi
 ! 	$(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default
 ! #	-@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
diff -ruN apache13-fp.orig/pkg/PLIST apache13-fp/pkg/PLIST
--- apache13-fp.orig/pkg/PLIST	Mon Nov  9 19:56:01 1998
+++ apache13-fp/pkg/PLIST	Tue Nov 24 22:32:20 1998
@@ -7,7 +7,6 @@
 etc/apache/mime.types.default
 etc/apache/srm.conf.default
 etc/rc.d/apache.sh
-etc/rc.d/apache.sh.tmpl
 include/apache/alloc.h
 include/apache/ap.h
 include/apache/ap_compat.h
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: billf 
State-Changed-When: Wed Nov 25 12:46:25 PST 1998 
State-Changed-Why:  
Updated in rev1.5, thanks 
>Unformatted:
