View | Details | Raw Unified | Return to bug 268318 | Differences between
and this patch

Collapse All | Expand All

(-)b/www/apache24/Makefile (-1 / +1 lines)
Lines 1-6 Link Here
1
PORTNAME=	apache24
1
PORTNAME=	apache24
2
PORTVERSION=	2.4.57
2
PORTVERSION=	2.4.57
3
PORTREVISION=	1
3
PORTREVISION=	2
4
CATEGORIES=	www
4
CATEGORIES=	www
5
MASTER_SITES=	APACHE_HTTPD
5
MASTER_SITES=	APACHE_HTTPD
6
DISTNAME=	httpd-${PORTVERSION}
6
DISTNAME=	httpd-${PORTVERSION}
(-)b/www/apache24/files/apache24.in (+12 lines)
Lines 22-27 Link Here
22
#                             module on start up and load if not loaded.
22
#                             module on start up and load if not loaded.
23
# apache24_fib (str):	      Set an altered default network view for apache
23
# apache24_fib (str):	      Set an altered default network view for apache
24
# apache24_configcheck_disable (bool): Set to "YES" to disable sanity check on startup
24
# apache24_configcheck_disable (bool): Set to "YES" to disable sanity check on startup
25
# apache24_aslr_disable (bool): Set to "YES" to disable ASLR (Address Space Layout
26
#                             Randomization): workaround for PR#268318
25
27
26
. /etc/rc.subr
28
. /etc/rc.subr
27
29
Lines 46-51 envvars="%%PREFIX%%/sbin/envvars" Link Here
46
[ -z "$apache24limits_args" ]   && apache24limits_args="-e -C daemon"
48
[ -z "$apache24limits_args" ]   && apache24limits_args="-e -C daemon"
47
[ -z "$apache24_http_accept_enable" ] && apache24_http_accept_enable="NO"
49
[ -z "$apache24_http_accept_enable" ] && apache24_http_accept_enable="NO"
48
[ -z "$apache24_configcheck_disable" ] && apache24_configcheck_disable="NO"
50
[ -z "$apache24_configcheck_disable" ] && apache24_configcheck_disable="NO"
51
[ -z "$apache24_aslr_disable" ] && apache24_aslr_disable="NO"
49
52
50
apache24_accf()
53
apache24_accf()
51
{
54
{
Lines 76-81 if [ -n "$2" ]; then Link Here
76
		eval apache24limits_args="\${apache24limits_${profile}_args:-${apache24limits_args}}"
79
		eval apache24limits_args="\${apache24limits_${profile}_args:-${apache24limits_args}}"
77
		eval apache24_fib="\${apache24_${profile}_fib:-${apache24_fib}}"
80
		eval apache24_fib="\${apache24_${profile}_fib:-${apache24_fib}}"
78
		eval apache24_configcheck_disable="\${apache24_${profile}_configcheck_disable:-${apache24_configcheck_disable}}"
81
		eval apache24_configcheck_disable="\${apache24_${profile}_configcheck_disable:-${apache24_configcheck_disable}}"
82
		eval apache24_aslr_disable="\${apache24_${profile}_aslr_disable:-${apache24_aslr_disable}}"
79
		eval command="\${apache24_${profile}_command:-${command}}"
83
		eval command="\${apache24_${profile}_command:-${command}}"
80
		eval pidfile="\${apache24_${profile}_pidfile:-${pidfile}}"
84
		eval pidfile="\${apache24_${profile}_pidfile:-${pidfile}}"
81
		eval apache24_envvars="\${apache24_${profile}_envvars:-${envvars}}"
85
		eval apache24_envvars="\${apache24_${profile}_envvars:-${envvars}}"
Lines 189-194 apache24_precmd() Link Here
189
193
190
}
194
}
191
195
196
apache24_checkalsr () {
197
	if checkyesno apache24_aslr_disable
198
	then
199
		command="/usr/bin/proccontrol -m aslr -s disable ${command}"
200
	fi
201
}
202
192
apache24_checkfib () {
203
apache24_checkfib () {
193
	if command -v check_namevarlist > /dev/null 2>&1; then
204
	if command -v check_namevarlist > /dev/null 2>&1; then
194
		check_namevarlist fib && return 0
205
		check_namevarlist fib && return 0
Lines 206-211 apache24_checkfib () { Link Here
206
}
217
}
207
218
208
apache24_prestart() {
219
apache24_prestart() {
220
	apache24_checkalsr
209
	apache24_checkfib
221
	apache24_checkfib
210
	apache24_precmd
222
	apache24_precmd
211
}
223
}

Return to bug 268318