From 1cecad1ce9b322329c1a17d60e37b96ce46fa07e Mon Sep 17 00:00:00 2001 From: Hye-Shik Chang Date: Wed, 16 Apr 2003 21:33:58 +0000 Subject: - Utilize MASTER_SITE_APACHE_HTTPD [1] - Allow to override SUEXEC_SAFEPATH [2] Submitted by: naddy [1], Eugene M. Kim [2] --- www/apache20/Makefile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'www/apache20/Makefile') diff --git a/www/apache20/Makefile b/www/apache20/Makefile index ddbdff33664d..bd2d3a908515 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -8,15 +8,7 @@ PORTNAME= apache PORTVERSION= 2.0.45 CATEGORIES= www ipv6 -MASTER_SITES= http://www.apache.org/dist/httpd/ \ - http://apache.mirrorcentral.com/dist/httpd/ \ - http://apache.missouri.edu/dist/httpd/ \ - http://ftp.epix.net/apache/dist/httpd/ \ - ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \ - ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,} \ - http://www.freebsd.org/gifs/:freebsd \ - http://www2.freebsd.org/gifs/:freebsd +MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} DISTFILES= ${DISTNAME}.tar.gz powerlogo.gif:freebsd EXTRACT_ONLY= ${DISTNAME}.tar.gz @@ -68,12 +60,13 @@ USE_OPENSSL= yes .if defined(WITH_SUEXEC) SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data SUEXEC_USERDIR?= public_html +SUEXEC_SAFEPATH?=${PREFIX_RELDEST}/bin:${LOCALBASE}/bin:/usr/bin:/bin CONFIGURE_ARGS+= --enable-suexec \ --with-suexec-caller=www \ --with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \ --with-suexec-userdir="${SUEXEC_USERDIR}" \ --with-suexec-docroot="${SUEXEC_DOCROOT}" \ - --with-suexec-safepath="${PREFIX_RELDEST}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \ + --with-suexec-safepath="${SUEXEC_SAFEPATH}" \ --with-suexec-logfile="/var/log/httpd-suexec.log" \ --with-suexec-bin="${PREFIX_RELDEST}/sbin/suexec" PLIST_SUB+= SUEXEC="" -- cgit v1.2.3