diff options
| author | pat <pat@FreeBSD.org> | 2002-07-12 08:21:12 +0800 |
|---|---|---|
| committer | pat <pat@FreeBSD.org> | 2002-07-12 08:21:12 +0800 |
| commit | 400ac6702c63c9cccc4b3e36d0fe7fbdaa881991 (patch) | |
| tree | ea2719b78382f8d4bae5cfc9486460c17822aad3 | |
| parent | 620d440e024f3b53fdc346fba95b779a69e5deee (diff) | |
| download | freebsd-ports-gnome-400ac6702c63c9cccc4b3e36d0fe7fbdaa881991.tar.gz freebsd-ports-gnome-400ac6702c63c9cccc4b3e36d0fe7fbdaa881991.tar.zst freebsd-ports-gnome-400ac6702c63c9cccc4b3e36d0fe7fbdaa881991.zip | |
Sync with www/apache13: suexec
PR: ports/40426
Submitted by: Brad Laue <brad@brad-x.com>
Reviewed by: tobez
| -rw-r--r-- | www/apache13-modssl/Makefile | 58 | ||||
| -rw-r--r-- | www/apache13-modssl/pkg-plist | 1 |
2 files changed, 48 insertions, 11 deletions
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile index 9cc5e2f77f82..d7726f3b184b 100644 --- a/www/apache13-modssl/Makefile +++ b/www/apache13-modssl/Makefile @@ -24,6 +24,14 @@ MASTER_SITES= http://www.apache.org/dist/httpd/ \ ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \ ftp://apache.nextpath.com/pub/apache/dist/httpd/ \ ${MASTER_SITES_MODSSL:S/$/:modssl/} +DISTNAME= apache_${VERSION_APACHE} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}:modssl + +MAINTAINER= ports@FreeBSD.org + +LIB_DEPENDS= mm.11:${PORTSDIR}/devel/mm + MASTER_SITES_MODSSL= http://www.modssl.org/source/ \ ftp://ftp.modssl.org/source/ \ ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/ \ @@ -36,21 +44,48 @@ MASTER_SITES_MODSSL= http://www.modssl.org/source/ \ ftp://ftp.blatzheim.com/pub/mod_ssl/ \ ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \ ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/ -DISTNAME= apache_${VERSION_APACHE} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}:modssl - -MAINTAINER= ports@FreeBSD.org - USE_OPENSSL= YES .include <bsd.port.pre.mk> -LIB_DEPENDS= mm.11:${PORTSDIR}/devel/mm - VERSION_APACHE= 1.3.26 VERSION_MODSSL= 2.8.10 +DATADIR= ${PREFIX}/www +DOCUMENT_ROOT= ${DATADIR}/data +DEFAULT_PATH=/bin:/usr/bin:${PREFIX}/bin + +.if defined(WITH_APACHE_SUEXEC) && ${WITH_APACHE_SUEXEC} == yes + +APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT} +APACHE_SUEXEC_USERDIR?=public_html + +SUEXEC_CONF=\ + --enable-suexec \ + --suexec-docroot=${APACHE_SUEXEC_DOCROOT} \ + --suexec-caller=www \ + --suexec-uidmin=1000 \ + --suexec-gidmin=1000 \ + --suexec-logfile=/var/log/httpd-suexec.log \ + --suexec-userdir=${APACHE_SUEXEC_USERDIR} \ + --suexec-safepath=${DEFAULT_PATH} + +.if defined(APACHE_SUEXEC_UMASK) +SUEXEC_CONF+=\ + --suexec-umask=${APACHE_SUEXEC_UMASK} +.endif + +PLIST_SUB+= SUB_SUEXEC="" +SUEXEC_MAN= suexec.8 + +.else # !SUEXEC + +SUEXEC_CONF= +PLIST_SUB+= SUB_SUEXEC="@comment " +SUEXEC_MAN= + +.endif # !SUEXEC + USE_PERL5= yes HAS_CONFIGURE= yes CONFIGURE_ARGS+=--prefix=${PREFIX} \ @@ -58,7 +93,6 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --server-gid=www \ --with-perl=${PERL} \ --with-layout=FreeBSD \ - --suexec-docroot=${PREFIX}/www/data \ --without-confadjust \ --enable-module=most \ --enable-module=auth_db \ @@ -66,7 +100,8 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --disable-module=auth_dbm \ --enable-shared=max \ --enable-module=ssl \ - --enable-module=define + --enable-module=define \ + ${SUEXEC_CONF} OPTIM= -DHARD_SERVER_LIMIT=512 \ -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ @@ -98,7 +133,8 @@ CONFIGURE_ENV= CFLAGS='${CFLAGS}' \ INSTALL_TARGET= install-quiet MAN1= dbmmanage.1 htdigest.1 htpasswd.1 -MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 +MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \ + ${SUEXEC_MAN} TYPE= test CRT= diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist index e691902f561e..54fa6041869b 100644 --- a/www/apache13-modssl/pkg-plist +++ b/www/apache13-modssl/pkg-plist @@ -129,6 +129,7 @@ sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs +%%SUB_SUEXEC%%sbin/suexec www/data-dist/apache_pb.gif @exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data www/data-dist/index.html.ca |