Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Nov 1998 16:16:50 -0600 (CST)
From:      hetzels@westbend.net
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Subject:   ports/8749: Apache13-FP update to remove quotes from srm.conf
Message-ID:  <199811182216.QAA15207@oldwww.westbend.net>

next in thread | raw e-mail | index | archive | help

>Number:         8749
>Category:       ports
>Synopsis:       The fpsrvadm.exe utility doesn't like quotes in the config
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:
>Keywords:
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 18 14:20:00 PST 1998
>Last-Modified:
>Originator:     Scot W. Hetzel
>Organization:
West Bend Internet
>Release:        FreeBSD 2.2.7-19981016-SNAP i386
>Environment:

>Description:

The Apache 1.3.3 server is shipping with its config files having quotes 
arround the values for the directives.  This causes the fpsrvadm.exe program 
to report that it can't create a directory, or locate the config files.

I corrected most of theses problems when the port was submitted, but 
apparently I missed the DocumentRoot directive in the srm.conf file.

I have also added the server_error_filename.txt patch from www.apache.org.  
This patch to Apache 1.3.3 prevents the server from sending file path
information on a 500 (Internal Server Error) response.  It also fixes
a couple cases where 501 (Method Not Implemented) was being misused.

>How-To-Repeat:

First check srm.conf to see if DocumentRoot is in quotes.  If it is the Enter
the following at the prompt:

/usr/local/frontpage/version3.0/bin/fpsrvadm.exe -o install  -p 80 -s 
/usr/local/lib/apache-1.3/httpd.conf -u fpadmin -type apache-fp -xUser nobody 
-xGroup nogroup -m ""

What you'll get is the following:

Starting install, port: 80, web: ""

Enter user's password:
Confirm password:
Cannot create directory ""/serv/www/data"/_vti_pvt".

>Fix:
	
Apply the attached fix to the apache13-fp port.


diff -ruN apache13-fp.orig/Makefile apache13-fp/Makefile
--- apache13-fp.orig/Makefile	Mon Nov  9 19:55:55 1998
+++ apache13-fp/Makefile	Wed Nov 18 15:46:48 1998
@@ -10,15 +10,13 @@
 PKGNAME=        apache_fp-1.3.3
 CATEGORIES=	www
 MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
-		ftp://ftp.microsoft.com/products/frontpage/
+		ftp://ftp.microsoft.com/products/frontpage/ \
+		ftp://sunsite.doc.ic.ac.uk/Mirrors/ftp.microsoft.com/Products/frontpage/
 
 PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3.3/ \
 		http://www.apache.org/dist/patches/apply_to_1.3.3/
 
-PATCHFILES=	core_404_log_bug.txt proxy_segv.txt
-
-# This file will not apply, fails on hunk 2 for main/http_protocol.c
-#PATCHFILES+=	server_error_filename.txt
+PATCHFILES=	core_404_log_bug.txt proxy_segv.txt server_error_filename.txt
 
 .if defined(PATCH_DEBUG)
 PATCH_DIST_ARGS=       -d ${WRKSRC}/src -E ${PATCH_DIST_STRIP}
@@ -105,6 +103,9 @@
 	@${ECHO} "===>  Extracting FrontPage install scripts"
 	@cd ${WRKSRC} && \
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${FRONTPAGE} ${FPINSTALL} ${CHANGESERVER}
+
+pre-patch:
+	@${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/http_protocol.patch
 
 post-install:
 	@${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh.tmpl file."
diff -ruN apache13-fp.orig/files/http_protocol.patch apache13-fp/files/http_protocol.patch
--- apache13-fp.orig/files/http_protocol.patch	Wed Dec 31 18:00:00 1969
+++ apache13-fp/files/http_protocol.patch	Wed Nov 18 15:22:42 1998
@@ -0,0 +1,13 @@
+--- main/http_protocol.c.orig	Tue Oct  6 14:06:09 1998
++++ main/http_protocol.c	Wed Nov 18 15:16:02 1998
+@@ -2384,7 +2384,9 @@
+ 	             ap_escape_html(r->pool, r->server->server_admin),
+ 	             " and inform them of the time the error occurred,\n"
+ 	             "and anything you might have done that may have\n"
+-	             "caused the error.<P>\n", NULL);
++	             "caused the error.<P>\n"
++		     "More information about this error may be available\n"
++		     "in the server error log.<P>\n", NULL);
+ 	    if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
+ 		ap_bvputs(fd, error_notes, "<P>\n", NULL);
+ 	    }
diff -ruN apache13-fp.orig/files/md5 apache13-fp/files/md5
--- apache13-fp.orig/files/md5	Mon Nov  9 19:55:59 1998
+++ apache13-fp/files/md5	Wed Nov 18 14:43:36 1998
@@ -2,3 +2,4 @@
 MD5 (fp30.bsdi3.tar.Z) = 2aa4396e8bf9a349a946f726f861f97d
 MD5 (core_404_log_bug.txt) = ae7472c857937be679bc1224317a0654
 MD5 (proxy_segv.txt) = 2131d636c758e58e753777e0658fd51f
+MD5 (server_error_filename.txt) = b44defd90b36e83643b94a6a842ec480
diff -ruN apache13-fp.orig/patches/patch-fm apache13-fp/patches/patch-fm
--- apache13-fp.orig/patches/patch-fm	Wed Dec 31 18:00:00 1969
+++ apache13-fp/patches/patch-fm	Sat Nov 14 21:24:30 1998
@@ -0,0 +1,11 @@
+--- conf/srm.conf-dist.orig	Mon Oct  5 12:53:34 1998
++++ conf/srm.conf-dist	Sat Nov 14 21:21:50 1998
+@@ -12,7 +12,7 @@
+ # documents. By default, all requests are taken from this directory, but
+ # symbolic links and aliases may be used to point to other locations.
+ 
+-DocumentRoot "@@ServerRoot@@/htdocs"
++DocumentRoot @@ServerRoot@@/htdocs
+ 
+ # UserDir: The name of the directory which is appended onto a user's home
+ # directory if a ~user request is recieved.
>Audit-Trail:
>Unformatted:
files

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199811182216.QAA15207>