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

Collapse All | Expand All

(-)b/www/apache24/Makefile (+10 lines)
Lines 1-5 Link Here
1
PORTNAME=	apache24
1
PORTNAME=	apache24
2
PORTVERSION=	2.4.57
2
PORTVERSION=	2.4.57
3
PORTREVISION=	1
3
CATEGORIES=	www
4
CATEGORIES=	www
4
MASTER_SITES=	APACHE_HTTPD
5
MASTER_SITES=	APACHE_HTTPD
5
DISTNAME=	httpd-${PORTVERSION}
6
DISTNAME=	httpd-${PORTVERSION}
Lines 226-231 post-install: Link Here
226
	# Remove files left behind by strip
227
	# Remove files left behind by strip
227
	${RM} ${STAGEDIR}${DATADIR}/build/ecp.???????? 2>/dev/null
228
	${RM} ${STAGEDIR}${DATADIR}/build/ecp.???????? 2>/dev/null
228
229
230
.if ${PORT_OPTIONS:MNOASLR}
231
. for f in checkgid fcgistarter htcacheclean httpd rotatelogs
232
	${ELFCTL} -e +noaslr ${STAGEDIR}${PREFIX}/sbin/${f}
233
. endfor
234
. for f in ab htdbm htdigest htpasswd httxt2dbm logresolve
235
	${ELFCTL} -e +noaslr ${STAGEDIR}${PREFIX}/bin/${f}
236
. endfor
237
.endif
238
229
post-install-LOG_FORENSIC-on:
239
post-install-LOG_FORENSIC-on:
230
	${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin
240
	${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin
231
241
(-)b/www/apache24/Makefile.options (-1 / +1 lines)
Lines 59-65 MOST_DISABLED_MODULES= \ Link Here
59
#     enable/disable additional PROXY/SESSION modules
59
#     enable/disable additional PROXY/SESSION modules
60
META_MODULES=	PROXY SESSION
60
META_MODULES=	PROXY SESSION
61
61
62
ADDITIONAL_OPT=	LUAJIT IPV4_MAPPED
62
ADDITIONAL_OPT=	LUAJIT IPV4_MAPPED NOASLR
63
63
64
# ===================================================================================
64
# ===================================================================================
65
65
(-)b/www/apache24/Makefile.options.desc (+1 lines)
Lines 18-23 MPM_EVENT_DESC= MPM worker variant with the goal of consuming threads only for Link Here
18
# additional (no modules)
18
# additional (no modules)
19
IPV4_MAPPED_DESC=		Allow IPv6 sockets to handle IPv4 connections
19
IPV4_MAPPED_DESC=		Allow IPv6 sockets to handle IPv4 connections
20
LUAJIT_DESC=			LuaJit Support
20
LUAJIT_DESC=			LuaJit Support
21
NOASLR_DESC=			Disable ASLR for compiled binaries
21
22
22
# =====================================
23
# =====================================
23
# modules
24
# modules

Return to bug 268318