Date: Thu, 23 Dec 2010 16:36:08 GMT From: Mathieu <sigsys@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/153406: www/apache22's SUEXEC_RSRCLIMIT option does not take effect Message-ID: <201012231636.oBNGa8eK015953@red.freebsd.org> Resent-Message-ID: <201012231640.oBNGe92t029265@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 153406
>Category: ports
>Synopsis: www/apache22's SUEXEC_RSRCLIMIT option does not take effect
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 23 16:40:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Mathieu
>Release: 8.1-STABLE r212312M amd64
>Organization:
>Environment:
>Description:
Enabling the "SuEXEC rlimits based on login class" option when building www/apache22 does not cause suexec to be patched with this feature.
It did put this line in /var/db/ports/apache22/options though:
WITH_SUEXEC_RSRCLIMIT=true
But it seems like those variables are not loaded early enough in the Makefile to take effect.
The "Applying extra patch /usr/ports/www/apache22/files/extra-patch-suexec_rsrclimit" message is not printed and work/httpd-2.2.17/support/suexec.c is not patched.
I think some of the other conditionals in the Makefile might also be broken for the same reason.
>How-To-Repeat:
>Fix:
Mostly as a test, I tried moving some blocks of code around and it *seems* to fix it. No idea if this is the right fix though.
--- Makefile.orig 2010-12-23 11:24:17.000000000 -0500
+++ Makefile 2010-12-23 11:29:22.587249000 -0500
@@ -63,14 +63,6 @@
.include "${APACHEDIR}/Makefile.options"
.endif
-.if defined(WITH_SUEXEC_RSRCLIMIT)
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit
-.if !defined(WITH_SUEXEC)
-IGNORE= suEXEC resource limit patch requires mod_suexec.\
- Please (re)run 'make config' and choose SUEXEC option also
-.endif
-.endif
-
CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-layout=FreeBSD \
--with-perl=${PERL5} \
@@ -98,6 +90,18 @@
WITH_HTTP_PORT?= 80
+.include "${APACHEDIR}/Makefile.doc"
+.include "${APACHEDIR}/Makefile.modules"
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SUEXEC_RSRCLIMIT)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit
+.if !defined(WITH_SUEXEC)
+IGNORE= suEXEC resource limit patch requires mod_suexec.\
+ Please (re)run 'make config' and choose SUEXEC option also
+.endif
+.endif
+
.if defined(WITH_STATIC_SUPPORT)
CONFIGURE_ARGS+= --enable-static-support
.endif
@@ -114,10 +118,6 @@
CONFIGURE_ARGS+= --enable-exception-hook
.endif
-.include "${APACHEDIR}/Makefile.doc"
-.include "${APACHEDIR}/Makefile.modules"
-.include <bsd.port.pre.mk>
-
# OPTIONS fixups
.if defined (WITH_AUTHNZ_LDAP)
WITH_LDAP= yes
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012231636.oBNGa8eK015953>