From nobody Sat Oct 07 11:01:11 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S2j5g3WN3z4wj2V; Sat, 7 Oct 2023 11:01:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S2j5g1zbmz3QwD; Sat, 7 Oct 2023 11:01:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696676471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XC8qm7WmqWNuYtlKS45GnJqL42wpqZXT+Z3DhH6kWe8=; b=kRxwP6UoPRqAxpx2Bv1JV5wtUnTXulxhszNuXY5Oo8m1e+LwYsevXw9OIq11xdFB+r6As7 34Jq3Fs6IK9zSF9m0p9MvCvan35Dg/E9AOiQ7xPruVPgziSF27o57AKIyIDIoCWRij0TKZ n92P4mn/xRMRJt2OPmIK9EYsAafs90zdVFu94OQRS10EvHDA4alCglSFwyzOwvDLegta9D GbuKUMugOmcL6yWXk+z0fcyHV35PG8unO9/MiWWqbv2ow8vuwhSsOHAu1RdwoMrdrb4/Od Udks/OkS9V0yIZsjqb1wNGybveGCXqdXrwtJIu2U0THlEXZoaMTqDTon1bsaTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696676471; a=rsa-sha256; cv=none; b=Kmj2hy5GaLoWaQbat/MQ/FqT4bdRWl/h07cgWM87BiGqh632C7Bw8kp/p+x6aB7jEcZ3W1 uf25Wqp/Aa0riY8ZkhIJrB2n/W433xx+B3k3PT2TaxKYtItq7EbAquTSF9dbey5RWYBiXH HP9nFaIfuvPNHw70lKPgIZcHcHxF7y+zZu5dbyJXGoFJxk9AQJzNNSJRcj0QiqbRzPOIGT 3lR3l2aTxrD2y6pouhs7Irx2PD1/rCnWQ6ahEPG+swq7qh/0Q53j275H/EJXSrWmrifYgL 2UfwbAglTOd6+GvM34dGlZwqPhJNl35ZRoiptxbmYWvzbWjm+YFRyPiX1YLNeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696676471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XC8qm7WmqWNuYtlKS45GnJqL42wpqZXT+Z3DhH6kWe8=; b=OSJtpBlNSdQuwU1syiGTlXAvmHaqi3w4Ov4CndzAN3hp3izFL3BnOGiYmY05CohLj4Hl+X 27Dh6IiQ1h/FJ1p8orpfWsk0+PSHil2Duth02/3ezxg0OrG866gNPmQjfTcO1GOPSQ6Hgw ibohlSOYtnptYUDrhf/S3gcgGcIOnJ0k4kvtolG24EnkHtKbGCPccIV3bN7rcqGBtqQE3W pWmGPjEVJDt5MbL0RtGOeQ/thsX5hNkUffRCuSgyJTniu9k4/ipSKoMQOymCZR9BGiBntS vNYPhSf9BbiKeoWx+pyZnVwGQFtwQguVtgBy150oriAKYCNtrHSwUsAAnizpFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S2j5g15mfzDFB; Sat, 7 Oct 2023 11:01:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 397B1BuW050944; Sat, 7 Oct 2023 11:01:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 397B1Beq050941; Sat, 7 Oct 2023 11:01:11 GMT (envelope-from git) Date: Sat, 7 Oct 2023 11:01:11 GMT Message-Id: <202310071101.397B1Beq050941@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 28374e2250ce - main - lang/php83: Add non-default NOASLR option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28374e2250ce52ea7f88bef2e62c6e56181f573b Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=28374e2250ce52ea7f88bef2e62c6e56181f573b commit 28374e2250ce52ea7f88bef2e62c6e56181f573b Author: Muhammad Moinur Rahman AuthorDate: 2023-10-07 10:56:44 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-10-07 11:00:34 +0000 lang/php83: Add non-default NOASLR option In certain corner cases php-fpm is creating zombie processes specially from 13.2-RELEASE onwards. The exact reason has not been pin-pointed but it looks like disabling ASLR solves the problem. So add a non-default option NOASLR to allow the user build without ASLR. This patch will not go into lang/php80 but will go in lang/php81 and lang/php82 after some more extensive tests. PR: 274135 Reported by: ports@thelanman.net --- lang/php83/Makefile | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/lang/php83/Makefile b/lang/php83/Makefile index 90ca4ef3b915..bf150d592329 100644 --- a/lang/php83/Makefile +++ b/lang/php83/Makefile @@ -31,17 +31,15 @@ CONFIGURE_ARGS+= --disable-all \ --with-password-argon2=${LOCALBASE} DESTDIRNAME= INSTALL_ROOT -USES+= autoreconf:build ssl +USES+= autoreconf:build localbase ssl USE_GNOME= libxml2 -CPPFLAGS= -I${LOCALBASE}/include - -LDFLAGS= -L${OPENSSLLIB} -lcrypto -lssl +LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl # PR230207 Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-z,notext OPTIONS_DEFINE+= CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \ - MYSQLND PHPDBG ZTS + MYSQLND NOASLR PHPDBG ZTS OPTIONS_DEFAULT= CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND OPTIONS_EXCLUDE_DragonFly= DTRACE # ld(1) fails to link probes: Relocations in generic ELF (EM: 0) @@ -83,6 +81,7 @@ FPM_VARS= PHP_SAPI+=fpm \ USE_RC_SUBR+=php-fpm IPV6_CONFIGURE_OFF= --disable-ipv6 LINKTHR_LIBS= -lpthread +NOASLR_USES= elfctl MYSQLND_CONFIGURE_ON= --enable-mysqlnd PHPDBG_CONFIGURE_ON= --enable-phpdbg PHPDBG_VARS= PHP_SAPI+=phpdbg @@ -98,6 +97,23 @@ SHORTMODNAME= php WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!" .endif +.include + +.if ${PORT_OPTIONS:NOASLR} +.if ${PORT_OPTIONS:MCLI} +ELF_FEATURES+=+noaslr:sapi/cli/php +.endif +.if ${PORT_OPTIONS:MCGI} +ELF_FEATURES+=+noaslr:sapi/cgi/php-cgi +.endif +.if ${PORT_OPTIONS:MPHPDBG} +ELF_FEATURES+=+noaslr:sapi/phpdbg/phpdbg +.endif +.if ${PORT_OPTIONS:MFPM} +ELF_FEATURES+=+noaslr:sapi/fpm/php-fpm +.endif +.endif + .include .if ${ARCH} == riscv64