From nobody Mon Jul 29 19:05:03 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 4WXnqM31szz5RnWB; Mon, 29 Jul 2024 19:05:03 +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 4WXnqM29Dtz4Xc0; Mon, 29 Jul 2024 19:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722279903; 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=UK0AvYQ4F0WvuPj4bpYkiZOg/T11jIIzpO83MlZdIP0=; b=hTNRuZNG41k4gm0RcTUtXAGw6hjppoC1zmJYsdFyNOe8VYtiCjZp7VT31zpvGUXyfmaqdi DOf77tjvZ2Rfrix8dgicl+fzUZ1lZUjC36wMuLaloH70kLJ+cugrWsBxs70iaoB5lg5sMZ GGXfpe5LEAgkINmrkGylh+9vOoolB+6kKlH0xs09zSfJ/Yh+PNb3oYlczgwN/+x2Cu8/Ld tgG1uU7vQ6vV84XDtH+XVvLrffqhFEWhks620ZBzHJ+RrZ2ELsu/R1MZYViE+3WG50LAul IoOvoVJtMmUYFlbzIRZ9UQgIzI9/KLQn7siuve1w7lx6BrW9LM/MOSEpaqj1UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722279903; a=rsa-sha256; cv=none; b=sFHu+Iuq8wXXhkGjHPNIAL2aiK513WxHMGwYmtq3T7UEks4CjWth7bKhoCJWH5rb2pvFEw K8KIHgmpzJuZfGfcPFuxA+/YbbnxMZj64oC/WYf8xlQuL3ZXS82HkZmZw4InEJxbq+I71I rphlKX5yfvO2JBXNDr2FgcZcRoliopTtgVE2VmfZo3TeAwWZxJfHGOBScESiPHyTvLaJe/ M0GP8rT8BbZpWYDllGbirbjQuJIH1F4LzifzfvLWn+wg+YzntlUuW26NTQEjvJoeRlZ180 +0MI+gdurooXp5kXZSray0KYdT5Q6VXdQkyuhxeFLDBn4sahnsP9Sz0Hqjv3KQ== 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=1722279903; 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=UK0AvYQ4F0WvuPj4bpYkiZOg/T11jIIzpO83MlZdIP0=; b=dij25aI9JJyztcr5EMWQhkZ7OwAjBmey4EYw5wcaX4QHtZVa6tiRrF76dkuCtkw+uu8uXV 3mnNJa4lhV2cqgviOy2Kt+l4g244qaE+ChQlVTWma5jCn2/o5G48YIPUCMU+kTbiFGdQ0y RfmecJfDpd9LiwizlQYcpFRiaNW1vwVioDObiDpRnMlTF8upDIEuljlbDmfbSJO2ODFF0J 3B6Lz420tIFPNG03aewl6C165LdVZRzNYMWml541HYhHh33Gfi/9Sec91VjuxJumfR5pxu H66akFVoT5rneHpkpU7dlUWl86/Vkhwko/R2zA3w+2wHrc+rSNgtpz2i03hcUw== 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 4WXnqM1cGWzmJC; Mon, 29 Jul 2024 19:05:03 +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 46TJ53UK059849; Mon, 29 Jul 2024 19:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46TJ53qZ059846; Mon, 29 Jul 2024 19:05:03 GMT (envelope-from git) Date: Mon, 29 Jul 2024 19:05:03 GMT Message-Id: <202407291905.46TJ53qZ059846@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 906e82b4032d - main - www/pecl-yaf: Fix build with php84 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 906e82b4032d321d5d8804530d99050a77e75c14 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=906e82b4032d321d5d8804530d99050a77e75c14 commit 906e82b4032d321d5d8804530d99050a77e75c14 Author: Po-Chuan Hsieh AuthorDate: 2024-07-29 19:03:02 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-07-29 19:03:02 +0000 www/pecl-yaf: Fix build with php84 Obtained from: https://github.com/laruence/yaf/commit/b1d252c944a8d70f0dc28415b3d67a7b3bbbf7ce --- www/pecl-yaf/Makefile | 1 - www/pecl-yaf/files/patch-php84 | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/www/pecl-yaf/Makefile b/www/pecl-yaf/Makefile index 0adefd87ff3f..79d1feb3f156 100644 --- a/www/pecl-yaf/Makefile +++ b/www/pecl-yaf/Makefile @@ -13,6 +13,5 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= localbase php:pecl CFLAGS+= -DZEND_HOT= -IGNORE_WITH_PHP=84 .include diff --git a/www/pecl-yaf/files/patch-php84 b/www/pecl-yaf/files/patch-php84 new file mode 100644 index 000000000000..424a5fdd2554 --- /dev/null +++ b/www/pecl-yaf/files/patch-php84 @@ -0,0 +1,46 @@ +Obtained from: https://github.com/laruence/yaf/commit/b1d252c944a8d70f0dc28415b3d67a7b3bbbf7ce + +--- routes/yaf_route_regex.c.orig 2024-06-25 03:13:57 UTC ++++ routes/yaf_route_regex.c +@@ -204,11 +204,18 @@ static int yaf_route_regex_match(yaf_route_regex_objec + #if PHP_VERSION_ID < 70400 + php_pcre_match_impl(pce_regexp, (char*)uri, len, &matches, &subparts /* subpats */, + 0/* global */, 0/* ZEND_NUM_ARGS() >= 4 */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); +-#else ++#elif PHP_VERSION_ID < 80400 + { + zend_string *tmp = zend_string_init(uri, len, 0); + php_pcre_match_impl(pce_regexp, tmp, &matches, &subparts /* subpats */, + 0/* global */, 0/* ZEND_NUM_ARGS() >= 4 */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); ++ zend_string_release(tmp); ++ } ++#else ++ { ++ zend_string *tmp = zend_string_init(uri, len, 0); ++ php_pcre_match_impl(pce_regexp, tmp, &matches, &subparts /* subpats */, ++ 0/* global */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); + zend_string_release(tmp); + } + #endif +--- routes/yaf_route_rewrite.c.orig 2024-06-25 03:13:57 UTC ++++ routes/yaf_route_rewrite.c +@@ -209,11 +209,18 @@ static int yaf_route_rewrite_match(yaf_route_rewrite_o + #if PHP_VERSION_ID < 70400 + php_pcre_match_impl(pce_regexp, (char*)uri, len, &matches, &subparts /* subpats */, + 0/* global */, 0/* ZEND_NUM_ARGS() >= 4 */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); +-#else ++#elif PHP_VERSION_ID <80400 + { + zend_string *tmp = zend_string_init(uri, len, 0); + php_pcre_match_impl(pce_regexp, tmp, &matches, &subparts /* subpats */, + 0/* global */, 0/* ZEND_NUM_ARGS() >= 4 */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); ++ zend_string_release(tmp); ++ } ++#else ++ { ++ zend_string *tmp = zend_string_init(uri, len, 0); ++ php_pcre_match_impl(pce_regexp, tmp, &matches, &subparts /* subpats */, ++ 0/* global */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); + zend_string_release(tmp); + } + #endif