From nobody Wed Sep 04 15:50:21 2024 X-Original-To: dev-commits-ports-branches@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 4WzRld6L4gz5V7hn; Wed, 04 Sep 2024 15:50:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzRld5Trhz4T8g; Wed, 4 Sep 2024 15:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725465021; 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=6rzsAhdY+fsCehg31FP7BlL49yP0yh7ds8QqihxoPnc=; b=coXa7e8lsVE0wGzBXo2VHJxwJyww64aHhN5so1euMcWcE6A6/SWphnP8Prre50ekhoI91S TJuB5xzbG0w93eBJ2jf+Ofv1sCjCcwlLfPeT6P3w7NLyleo7XQk8MOo/zENnJlzCMdV6A4 7GN/WIlWgR5WAtWqwZac/DvTWwPyOOtYOivlVXm9XSMHoGk7c8MucEpAzjFBuG94G317KL M2r/nX8bPrqXZemm/dIz/uPsmqwGvp5+BvgbdIT4T95RSaYeo/8FI8MrRgHWb+AGEUpyRq tDtIs2TukPRVWfWJAmqUxE9JzG+JCw/iH4r4rFPFtWyG891ePk+yDFWnlkfHxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725465021; a=rsa-sha256; cv=none; b=Fe9WqgihQo6oWbmbM374XW3Bvo18bMZyw4FoaZje+bRiNuXZZaihCEP+UAPDnT7O3nzPC1 j7ie0uxNy/gmHTVTszH3P5cJuRZVlT+Y6srA3tOVzBnhUoKkli0402qoTqtZN4iKm6yoJO vdncRoCG6HVx66v/0zpo4Ag0ePSSclIkfGOysk6In5JqS7ra/e6dXWosFDhsVaMQOASbXh 0kFjf+lamvwjJyUoVct+fC+44kfXzNHE8Md9+Q/BOZqb0ShNn169MKcrDUh1Kl8l5MWWwl 6x92umPDv3tSrFyd0QSCnvzPqYqZgodIeHOxsOcpsk3Ps9B9QWrNzkM/BHrELQ== 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=1725465021; 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=6rzsAhdY+fsCehg31FP7BlL49yP0yh7ds8QqihxoPnc=; b=UdPDDpPrmlX63H2K2xY3mhqAvozzbZ95m2tI0Orb9PV1k6N+0bDm5/MGezenWPxOUPuBPT lWaowYu/UAxwL6ynXZu6IdcAeUyMFNyt07zzLrz1/l2flfQnTJ69JrGVF0bAhwkgTjluq2 2hYbv2dj/QiunOz1OinRbUa5ltbOps8iPQJRgsNYEpQzo7gTX79Xh6pvFrW1wzjK1Bk+Ki wmR4WxZq8EiMJPlkszOWQE0n80OSSJVrhAt8gGrqoGaubCKaVtd6a+IEuIx8XhuMpdX9/E 7V1eMclvYK1gkTF+49ro/K66CfOzsACkl2wxpc+snkmZKmaYwSdy2XQn1h3Sog== 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 4WzRld5563zWj1; Wed, 4 Sep 2024 15:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484FoL5i012401; Wed, 4 Sep 2024 15:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484FoLfq012398; Wed, 4 Sep 2024 15:50:21 GMT (envelope-from git) Date: Wed, 4 Sep 2024 15:50:21 GMT Message-Id: <202409041550.484FoLfq012398@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 247d0c593812 - 2024Q3 - lang/php82: Update version 8.2.20=>8.2.21 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 247d0c593812b12a121006971ec79fc61142313e Auto-Submitted: auto-generated The branch 2024Q3 has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=247d0c593812b12a121006971ec79fc61142313e commit 247d0c593812b12a121006971ec79fc61142313e Author: Muhammad Moinur Rahman AuthorDate: 2024-07-28 00:26:34 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-09-04 15:49:52 +0000 lang/php82: Update version 8.2.20=>8.2.21 - Add profile support in php-fpm rc script for running multiple php master process - Make the rc script jail ready [1] Changelog: https://www.php.net/ChangeLog-8.php#8.2.21 Reported by: netchild [1] (cherry picked from commit d6c16b39eaba13b0c240747534b8707056abb32b) --- lang/php82/Makefile | 2 +- lang/php82/distinfo | 6 ++--- lang/php82/files/php-fpm.in | 54 +++++++++++++++++++++++++++++++++++++-------- 3 files changed, 49 insertions(+), 13 deletions(-) diff --git a/lang/php82/Makefile b/lang/php82/Makefile index 5d3f58f61ef8..50b7b1f6e7ba 100644 --- a/lang/php82/Makefile +++ b/lang/php82/Makefile @@ -1,5 +1,5 @@ PORTNAME= php82 -DISTVERSION= 8.2.20 +DISTVERSION= 8.2.21 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions diff --git a/lang/php82/distinfo b/lang/php82/distinfo index 8badf8eb88ad..f8b6f532853c 100644 --- a/lang/php82/distinfo +++ b/lang/php82/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717709436 -SHA256 (php-8.2.20.tar.xz) = 4474cc430febef6de7be958f2c37253e5524d5c5331a7e1765cd2d2234881e50 -SIZE (php-8.2.20.tar.xz) = 12097568 +TIMESTAMP = 1722079018 +SHA256 (php-8.2.21.tar.xz) = 8cc44d51bb2506399ec176f70fe110f0c9e1f7d852a5303a2cd1403402199707 +SIZE (php-8.2.21.tar.xz) = 12106792 diff --git a/lang/php82/files/php-fpm.in b/lang/php82/files/php-fpm.in index c234856b0e54..9f753ea485e9 100644 --- a/lang/php82/files/php-fpm.in +++ b/lang/php82/files/php-fpm.in @@ -6,8 +6,13 @@ # # Add the following line to /etc/rc.conf to enable php-fpm: -# php_fpm_enable="YES" -# +# php-fpm_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable php-fpm +# php-fpm_profiles (str): Set to "" by default. +# Define your profiles here. +# php_fpm_pid_prefix (str): Set to "" by default. +# When using profiles manually assign value to "php_fpm_" +# for prevent collision with other PIDs names. . /etc/rc.subr @@ -17,23 +22,54 @@ rcvar=php_fpm_enable start_precmd="php_fpm_prestart" restart_precmd="php_fpm_checkconfig" reload_precmd="php_fpm_checkconfig" +command="%%PREFIX%%/sbin/php-fpm" configtest_cmd="php_fpm_checkconfig" +_pidprefix="/var/run" +pidfile="${_pidprefix}/php-fpm.pid" +required_files="%%PREFIX%%/etc/php-fpm.conf" -load_rc_config "$name" +load_rc_config "${name}" : ${php_fpm_enable="NO"} : ${php_fpm_umask=""} +: ${php_fpm_svcj_options:="net_basic"} -extra_commands="reload configtest logrotate" +if [ -n "$2" ]; then + profile="$2" + if [ "x${php_fpm_profiles}" != "x" ]; then + pidfile="${_pidprefix}/${php_fpm_pid_prefix}php-fpm-${profile}.pid" + eval php_fpm_configfile="\${php_fpm_${profile}_configfile:-}" + if [ "x${php_fpm_configfile}" = "x" ]; then + echo "You must define a configuration file (php_fpm_${profile}_configfile)" + exit 1 + fi + required_files="${php_fpm_configfile}" + eval php_fpm_enable="\${php_fpm_${profile}_enable:-${php_fpm_enable}}" + php_fpm_flags="-y ${php_fpm_configfile} -g ${pidfile}" + else + echo "$0: extra argument ignored" + fi +else + if [ "x${php_fpm_profiles}" != "x" -a "x$1" != "x" ]; then + for profile in ${php_fpm_profiles}; do + echo "===> php_fpm profile: ${profile}" + /usr/local/etc/rc.d/php-fpm $1 ${profile} + retcode="$?" + if [ "0${retcode}" -ne 0 ]; then + failed="${profile} (${retcode}) ${failed:-}" + else + success="${profile} ${success:-}" + fi + done + exit 0 + fi +fi -command="%%PREFIX%%/sbin/php-fpm" -pidfile="/var/run/php-fpm.pid" +extra_commands="reload configtest logrotate" sig_stop="QUIT" sig_reload="USR2" logrotate_cmd="php_fpm_logrotate" -required_files="%%PREFIX%%/etc/php-fpm.conf" - php_fpm_logrotate() { if [ -z "$rc_pid" ]; then _run_rc_notrunning @@ -46,7 +82,7 @@ php_fpm_logrotate() { php_fpm_checkconfig() { echo "Performing sanity check on php-fpm configuration:" - eval ${command} -t + eval ${command} ${php_fpm_flags} -t } php_fpm_prestart()