diff options
| author | jlam <jlam> | 2001-12-26 21:20:26 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-12-26 21:20:26 +0000 |
| commit | ff634e70dc6d749cfd18dae37de423ba259c0ae4 (patch) | |
| tree | db288e147ec49a0af8e9db2f388aa4298747274f /www/apache6 | |
| parent | fc2ed3e96f6091fa2190ff268503582b1075aa7d (diff) | |
| download | pkgsrc-ff634e70dc6d749cfd18dae37de423ba259c0ae4.tar.gz | |
(1) Create new variable "APACHE_SUEXEC_CONFIGURE_ARGS" that may contain
--suexec-* configure options that are passed directly to the Apache
configure script. This may be used to tune the suEXEC configuration
in more restrictive ways, e.g. --suexec-uidmin=1000. This solution
is more open-ended than the fix proposed in pkg/14973. Also, we
don't duplicate all of the options from the Apache configure script
in pkgsrc bsd.pkg.defaults.mk. This closes pkg/14973 by Eric
Schnoebelen <eric@cirr.com>
(2) For namespace consistency, deprecate APACHE_USER in favor of
APACHE_SUEXEC_USER. Move APACHE_USER into bsd.pkg.obsolete.mk.
(3) Create the suEXEC user when the functionality is enabled in the server
so that CGI scripts will work properly. This closes pkg/14903 by
Wojciech Puchar <wojtek@3miasto.net>
Diffstat (limited to 'www/apache6')
| -rw-r--r-- | www/apache6/Makefile | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 07019c158b8..400c7442778 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2001/12/02 06:56:45 jlam Exp $ +# $NetBSD: Makefile,v 1.49 2001/12/26 21:20:27 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -50,15 +50,18 @@ IGNORE= "IPv6 only build" PKG_SYSCONFSUBDIR?= httpd .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES -APACHE_USER?= www -APACHE_SUEXEC_DOCROOT?= ${LOCALBASE}/share/httpd/htdocs -SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin -CONFIGURE_ARGS+= --enable-suexec \ - --suexec-caller=${APACHE_USER} \ - --suexec-safepath='${SUEXEC_PATH}' \ +APACHE_SUEXEC_USER?= www +APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs +APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin +APACHE_SUEXEC_CONFIGURE_ARGS+= \ + --suexec-caller=${APACHE_SUEXEC_USER} \ + --suexec-safepath='${APACHE_SUEXEC_PATH}' \ --suexec-docroot=${APACHE_SUEXEC_DOCROOT} +CONFIGURE_ARGS+= --enable-suexec \ + ${APACHE_SUEXEC_CONFIGURE_ARGS:M--suexec-*} PLIST_SRC= ${PKGDIR}/PLIST.suexec -BUILD_DEFS+= APACHE_USER APACHE_SUEXEC_DOCROOT +PKG_USERS= ${APACHE_SUEXEC_USER}:nogroup::Apache\\ suEXEC\\ user +BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS .endif # Note that there is NO static compile module hook here. This is intentional. @@ -136,12 +139,12 @@ post-patch: > ${WRKSRC}/conf/httpd.conf-dist pre-configure: - ${SED} ${FILES_SUBST_SED} \ + @${SED} ${FILES_SUBST_SED} \ ${FILESDIR}/config.layout > ${WRKDIR}/config.layout pre-install: ${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f - ${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh + @${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh post-install: .if !defined(NOPIC) |