>Number:         12852
>Category:       pkg
>Synopsis:       Enhance pkg: www/apache to support changing docroot for suexec
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun May 06 16:47:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Eric Schnoebelen
>Release:        20010506
>Organization:
	Central Iowa (Model) Railroad, Dallas, TX US
>Environment:
System: NetBSD milo.cirr.com 1.5.1_BETA NetBSD 1.5.1_BETA (MILO) #6: Fri Apr 13 13:53:34 CDT 2001 eric@milo.cirr.com:/home/milo/eric/work/usr/src/sys/arch/alpha/compile/MILO alpha


>Description:
	Add support to pkgsrc to allow the tuning of the docroot
	parameter to apache's suexec module.

	suexec's idea of where it can be used may now be modified by
	changing the APACHE_SUEXEC_DOCROOT variable in mk.conf.
>How-To-Repeat:
>Fix:
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	apache.patch
#
echo x - apache.patch
sed 's/^X//' >apache.patch << 'END-of-apache.patch'
X? www/apache/README.html
XIndex: mk/mk.conf.example
X===================================================================
XRCS file: /cvsroot/pkgsrc/mk/mk.conf.example,v
Xretrieving revision 1.204
Xdiff -u -b -w -b -u -w -r1.204 mk.conf.example
X+++ mk.conf.example	2001/05/06 23:40:34
X@@ -311,6 +311,11 @@
X # Possible: not defined, YES
X # Default: not defined
X 
X+#APACHE_SUEXEC_DOCROOT=	${LOCALBASE}/share/httpd/htdocs
X+# Specifies the document space in which suexec will be allowed to work.
X+# Possible: Any valid directory
X+# Default: ${LOCALBASE}/share/httpd/htdocs
X+
X #APACHE_SYSCONFDIR=	/etc/httpd
X # Specifies the location for Apache configuration files.
X # If your ${LOCALBASE} is shared between machines use /etc/httpd
XIndex: www/apache/Makefile
X===================================================================
XRCS file: /cvsroot/pkgsrc/www/apache/Makefile,v
Xretrieving revision 1.67
Xdiff -u -b -w -b -u -w -r1.67 Makefile
X+++ Makefile	2001/05/06 23:40:34
X@@ -49,6 +49,11 @@
X 			--suexec-safepath='${SUEXEC_PATH}'
X PLIST_SRC=		${PKGDIR}/PLIST.suexec
X BUILD_DEFS+=		APACHE_USER
X+
X+. if defined(APACHE_SUEXEC_DOCROOT)
X+CONFIGURE_ARGS+=	--suexec-docroot=${APACHE_SUEXEC_DOCROOT}
X+BUILD_DEFS+=		APACHE_SUEXEC_DOCROOT
X+. endif
X .endif
X 
X .if !defined(NOPIC)
END-of-apache.patch
exit

>Release-Note:
>Audit-Trail:
>Unformatted: