Date: Wed, 10 Jul 2002 12:50:49 -0400 (EDT) From: Brad Laue <brad@brad-x.com> To: FreeBSD-gnats-submit@freebsd.org Cc: ports@FreeBSD.org Subject: Apache13-modssl port adjustments Message-ID: <20020710165049.7F5D422104A@TMA-1.brad-x.com>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users
>Originator: Brad Laue
>Organization: brad-x.com
>Confidential: no
>Synopsis: Apache13-modssl port adjustments
>Severity: non-critical
>Priority: medium
>Category: ports
>Class: change-request
>Release: FreeBSD 4.6-RC i386
>Environment:
System: FreeBSD TMA-1.brad-x.com 4.6-RC FreeBSD 4.6-RC #0: Thu May 23 01:31:46 EDT 2002 root@TMA-1.brad-x.com:/usr/src/sys/compile/DISCOVERY-IPF i386
>Description:
This is an adjustment of the existing apache13-modssl port, with additions from the vanilla www/apache13 port.
This brings the www/apache13 www/apache13-modssl, and www/apache13+ipv6 port base configurations into synch, with www/apache13-modssl providing the same general configuration and options as www/apache13 itself.
I believe no change is required to pkg-plist, and the only edited portion of this port is Makefile.
Possible enhancements to the apache ports would be a Makefile.common, which I will submit in another PR.
>How-To-Repeat:
Apply patch and install. Options added to this port were tested by me.
>Fix:
diff -ru /usr/ports/www/apache13-modssl/Makefile /usr/home/brad/apache13-modssl/Makefile
--- /usr/ports/www/apache13-modssl/Makefile Mon Jul 1 12:08:37 2002
+++ /usr/home/brad/apache13-modssl/Makefile Wed Jul 10 09:30:03 2002
@@ -51,22 +51,58 @@
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} \
- --server-uid=www \
- --server-gid=www \
- --with-perl=${PERL} \
- --with-layout=FreeBSD \
- --suexec-docroot=${PREFIX}/www/data \
- --without-confadjust \
- --enable-module=most \
- --enable-module=auth_db \
- --enable-module=mmap_static \
- --disable-module=auth_dbm \
- --enable-shared=max \
+CONFIGURE_ARGS+= \
+ --prefix=${PREFIX} \
+ --server-uid=www \
+ --server-gid=www \
+ --with-perl=${PERL} \
+ --with-layout=FreeBSD \
+ --without-confadjust \
+ --enable-module=most \
+ --enable-module=auth_db \
+ --enable-module=mmap_static \
+ --disable-module=auth_dbm \
+ --enable-shared=max \
--enable-module=ssl \
- --enable-module=define
+ ${SUEXEC_CONF}
OPTIM= -DHARD_SERVER_LIMIT=512 \
-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
@@ -139,5 +175,4 @@
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
fi
-
.include <bsd.port.post.mk>
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?20020710165049.7F5D422104A>