From nobody Sat Jul 27 13:07:23 2024 X-Original-To: dev-commits-ports-main@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 4WWPzc2Cyvz5SCv7; Sat, 27 Jul 2024 13:07:24 +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 4WWPzb6QwYz4JYC; Sat, 27 Jul 2024 13:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722085643; 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=120/Qp7gfVstbiRjsw8JFMM2vzAFcZIDRwSXsSVoHWY=; b=fUaOZaUSzcSptzS92OxYcVZt/BI8Y2v0GblH/m6w6Knm8IgN1GY+TvBiJ7eTtS3/oOEj1J nzrDcuTnnMydFvThH3Rp9Ejg9AVtXdQitohDSUE54jjtwSSAuFugBY9BZyWACZkVNePwmO +fR/ckPUyJrlTp/HzSf9uGOVlb/L0TxDJ36v/8AebUOLVzx6XdjmqTkCgS+IFgfrsA8nCe Jrs83yOW7oDvJqu3j4EOrleS5edG+8i7NrPS6tBsGRtAs6D3GOcDQmTkQU0waouTkyAPth QXanQY4k1s9mJDNkivUuNQ1BsyWTjsVPsn5zU7apg3HFLZGyk7liaioXTXiPPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722085643; a=rsa-sha256; cv=none; b=EF2QGGNlaBghMRVgb+C+b8Oi4MPkUt5jZ1qDt+tIg/JyINeTdFB2/VHDoXNkY7SXq1QMmy mEGSUagBNgkNjKX2vm9lL9JYySZt+atn/yyv3Qj1hGQFL5homVTDCCc1Q2HtoIofqBXxfL X+1acQhwrTGlXp/rx5Ex3mMCx5nx022re69AUF9VGycp5vpiTG3Hi+OBLY1efQ6IDSQXVW or17dagPRr6FAPw9gJoLf7/G3w5eEmwPhOWMkuggIfWgpQj6kVw+Y74abZEyJBo5CPlZ56 mZxIh0LZ2qjDTgBz8W/oapixWGwZo6vXFiwe0rX7HG0m4FgLxqcCNMUXk6kY8A== 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=1722085643; 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=120/Qp7gfVstbiRjsw8JFMM2vzAFcZIDRwSXsSVoHWY=; b=XIVPB7qjb2k1LibO0NMFv5aYpX9t80OJsLDCmA8JYCjZCVnvbz9BZ1ngiA8X2qTGqFtxuE 6AKERXffj2e8/teUYLBlDYwtBgxNvxcdY1ImaAFpCqQctsTDhuRe8M9PpVjisZTbznCpcN xnXVKegF2pNwk584NIOmdsrvtxOYqOj+/UP7piSTqwxhg7wBL/2/mzdL1+PiER30/HThxb 3jSvbWU9wxdioChxYQE6d3K0Syg9SoTzJ0N6Chpx6xQpd3Al9dCCY/bzaOzRhdXqeZ0pxj 1wnr/XR9JsM3ts2GR4mNBbf4fNIz5BvXaMIsKUEcwOT+ay6Gcl2BWy2avS9PbA== 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 4WWPzb5zQNz17MK; Sat, 27 Jul 2024 13:07:23 +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 46RD7N2G060721; Sat, 27 Jul 2024 13:07:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46RD7NKG060718; Sat, 27 Jul 2024 13:07:23 GMT (envelope-from git) Date: Sat, 27 Jul 2024 13:07:23 GMT Message-Id: <202407271307.46RD7NKG060718@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: 0f438952da05 - main - lang/php81: Fix build with libxml 2.12 and newer List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 0f438952da055c26e2b55288f2e406bc5b5e474a Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f438952da055c26e2b55288f2e406bc5b5e474a commit 0f438952da055c26e2b55288f2e406bc5b5e474a Author: Muhammad Moinur Rahman AuthorDate: 2024-07-27 12:13:00 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-07-27 13:06:58 +0000 lang/php81: Fix build with libxml 2.12 and newer - Rename rc script to comply to the rc scripting recommendations [1] PR: 280153, 280134 [1] Co-authored-by: Alexander Leidinger Co-authored-by: Daniel Engberg --- UPDATING | 15 +++++++++++++++ lang/php81/Makefile | 8 ++++++-- lang/php81/distinfo | 6 +++++- lang/php81/files/{php-fpm.in => php_fpm.in} | 6 +++--- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/UPDATING b/UPDATING index 79e0ecf9a398..c44b66aad191 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,21 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20240727: + AFFECTS: lang/php81 + AUTHOR: netchildFreeBSD.org + + The start scripts of php-fpm have been renamed to php_fpm for improved + compatibility with other parts of the system. The automatic start at boot + (rc.conf variable settings) is not affected, but if you have some other + automatism you may want to change + ".../etc/rc.d/php-fpm" to ".../etc/rc.d/php_fpm" + or + "service php-fpm ..." to "service php_fpm ..." + + If you have custom start scripts which depend upon php-fpm, you need to + change the REQUIRE lines in them from "php-fpm" to "php_fpm". + 20240726: AFFECTS: users of archivers/py-borgbackup AUTHOR: mandree@FreeBSD.org diff --git a/lang/php81/Makefile b/lang/php81/Makefile index 750403b7109c..f49642639ecd 100644 --- a/lang/php81/Makefile +++ b/lang/php81/Makefile @@ -1,6 +1,6 @@ PORTNAME= php81 DISTVERSION= 8.1.29 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${DISTVERSION} @@ -21,6 +21,10 @@ PHP_VER= 81 CONFLICTS_INSTALL?= php[0-9][0-9]${PKGNAMESUFFIX} .if !defined(PKGNAMESUFFIX) +PATCH_SITES= https://github.com/php/php-src/commit/ +PATCHFILES= 0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch:-p1 \ + 061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch:-p1 + LIB_DEPENDS= libargon2.so:security/libargon2 \ libpcre2-8.so:devel/pcre2 @@ -79,7 +83,7 @@ FPM_CONFIGURE_ON= --enable-fpm \ --with-fpm-group=${WWWGRP} \ --with-fpm-user=${WWWOWN} FPM_VARS= PHP_SAPI+=fpm \ - USE_RC_SUBR+=php-fpm + USE_RC_SUBR+=php_fpm IPV6_CONFIGURE_OFF= --disable-ipv6 LINKTHR_LIBS= -lpthread MYSQLND_CONFIGURE_ON= --enable-mysqlnd diff --git a/lang/php81/distinfo b/lang/php81/distinfo index dc21da65012f..c70ab757f03e 100644 --- a/lang/php81/distinfo +++ b/lang/php81/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1717709327 +TIMESTAMP = 1722079462 SHA256 (php-8.1.29.tar.xz) = 288884af60581d4284baba2ace9ca6d646f72facbd3e3c2dd2acc7fe6f903536 SIZE (php-8.1.29.tar.xz) = 11826292 +SHA256 (0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch) = 5f634c23b5f4e23a3984dbb38cfdd119ca7e0441b01f7f4bc48a650454b0d5d3 +SIZE (0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch) = 2286 +SHA256 (061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch) = ee211a60cf3f2bb6c524ffa49b7e8508967c7b75559c90328237bc5cc69e6f4e +SIZE (061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch) = 10396 diff --git a/lang/php81/files/php-fpm.in b/lang/php81/files/php_fpm.in similarity index 95% rename from lang/php81/files/php-fpm.in rename to lang/php81/files/php_fpm.in index 9f753ea485e9..12253b537b2e 100644 --- a/lang/php81/files/php-fpm.in +++ b/lang/php81/files/php_fpm.in @@ -1,14 +1,14 @@ #!/bin/sh -# PROVIDE: php-fpm +# PROVIDE: php_fpm # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable php-fpm: -# php-fpm_enable (bool): Set to "NO" by default. +# 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. +# 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_"