Attachment #205839 for bug #239264

View | Details | Raw Unified | Return to bug 239264
Collapse All | Expand All




			--${SUEXEC_CONFARGS}-userdir="${SUEXEC_USERDIR}" \
			--${SUEXEC_CONFARGS}-docroot="${SUEXEC_DOCROOT}" \
			--${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \
			--${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" \
			--${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec"

.	if defined(WITH_SUEXEC_UMASK)
CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-umask=${SUEXEC_UMASK}
.	endif

.	if !${PORT_OPTIONS:MSUEXEC_SYSLOG}
CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}"
.	endif

.endif

.if !defined(_APACHE_DISABLED_MODS)

Lines 91-96 Link Here

(-)www/apache24/Makefile (+1 lines)
91	# apu-1-config --(includes\|ldflags) and apr_rules.mk	91	# apu-1-config --(includes\|ldflags) and apr_rules.mk
92	SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE}	92	SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE}
93	SSL_USES= ssl	93	SSL_USES= ssl
		94	SUEXEC_SYSLOG_CONFIGURE_ON= --without-suexec-logfile --with-suexec-syslog
94	XML2ENC_USE= GNOME=libxml2	95	XML2ENC_USE= GNOME=libxml2
95	XML2ENC_USES= gnome	96	XML2ENC_USES= gnome
96		97

Lines 55-61 Link Here

(-)www/apache24/Makefile.options (-1 / +2 lines)
55	WATCHDOG XML2ENC	55	WATCHDOG XML2ENC
56		56
57	MOST_DISABLED_MODULES= \	57	MOST_DISABLED_MODULES= \
58	AUTHNZ_LDAP BROTLI IDENT LDAP LUA MD SOCACHE_DC SOCACHE_REDIS SUEXEC	58	AUTHNZ_LDAP BROTLI IDENT LDAP LUA MD SOCACHE_DC SOCACHE_REDIS SUEXEC \
		59	SUEXEC_SYSLOG
59		60
60	# enable/disable additional PROXY/SESSION modules	61	# enable/disable additional PROXY/SESSION modules
61	META_MODULES= PROXY SESSION	62	META_MODULES= PROXY SESSION

Lines 156-161 Link Here

(-)www/apache24/Makefile.options.desc (+1 lines)
156	STATUS_DESC= Process/thread monitoring	156	STATUS_DESC= Process/thread monitoring
157	SUBSTITUTE_DESC= Response content rewrite-like filtering	157	SUBSTITUTE_DESC= Response content rewrite-like filtering
158	SUEXEC_DESC= Set uid and gid for spawned processes	158	SUEXEC_DESC= Set uid and gid for spawned processes
		159	SUEXEC_SYSLOG_DESC= Enable syslog for suexec
159		160
160	UNIQUE_ID_DESC= Per-request unique ids	161	UNIQUE_ID_DESC= Per-request unique ids
161	UNIXD_DESC= (required) security for Unix-family platforms	162	UNIXD_DESC= (required) security for Unix-family platforms

Return to bug 239264

Lines 182-193 Link Here

(-)Mk/Uses/apache.mk (-1 / +5 lines)
182	--${SUEXEC_CONFARGS}-userdir="${SUEXEC_USERDIR}" \	182	--${SUEXEC_CONFARGS}-userdir="${SUEXEC_USERDIR}" \
183	--${SUEXEC_CONFARGS}-docroot="${SUEXEC_DOCROOT}" \	183	--${SUEXEC_CONFARGS}-docroot="${SUEXEC_DOCROOT}" \
184	--${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \	184	--${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \
185	--${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" \
186	--${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec"	185	--${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec"
187		186
188	. if defined(WITH_SUEXEC_UMASK)	187	. if defined(WITH_SUEXEC_UMASK)
189	CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-umask=${SUEXEC_UMASK}	188	CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-umask=${SUEXEC_UMASK}
190	. endif	189	. endif
		190
		191	. if !${PORT_OPTIONS:MSUEXEC_SYSLOG}
		192	CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}"
		193	. endif
		194
191	.endif	195	.endif
192		196
193	.if !defined(_APACHE_DISABLED_MODS)	197	.if !defined(_APACHE_DISABLED_MODS)