From nobody Fri Jun 30 07:18:42 2023 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 4Qsmrg0T86z4kpPB; Fri, 30 Jun 2023 07:18:43 +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 4Qsmrf5Bt2z3llg; Fri, 30 Jun 2023 07:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109522; 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=s3W/ufAq/i7jkUs/yPuJlBj44FJvWcQ+IPaNRUeahcY=; b=ssB5Wjr7zM/iXu+FI1PQCpaQ9UaN/29RByNimgPtRVixLpDcoiIaqYbDF0aBLA7RQEuAta Wx3R2e3COtJKLTvAZ7uO5GE/eVEg6PknPfT2NV/Ewes43p2L9GSNmPLreD42wSEof/JmKq yxwW8jap/ktNCgBKJ2jfWemjWFkwBnidB1DJpBMD03n0S+LLc35X7MB/KGFLK6kzXcfvGs WWcABaI1KPEbqarH5Xnqkxv83JZCw2zmabkbmUGP13tSyg+PnTuiRkm4RLQ4hqr8E1JH1a lxmaf4Kq8SGoBfP9IWq4kYCQEVy6aN0SVflGaMzWsNZWOK5S4SpcqTmlWpBGPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109522; 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=s3W/ufAq/i7jkUs/yPuJlBj44FJvWcQ+IPaNRUeahcY=; b=fvZ8FsggoHcW6qiPOX+prANZTsmC02bgU3xSEp89I3jX2xbQV3WXSI6GzocI5i8c+eBSco uifGlvRRhGJtlNjjeflFLQWNNsprVcE0y6w+KeDrE4fmJuh3o6USui5ixPyJwDRmnUDpwx exCW2gOb52+F5azkDxAs8SiwxhJz1BwAXYzpfZnFVWdV+cEvXWaP6wQoMfiybNzy1F9eZG UUHQglOr77wPnl2lQ367qydl3zsmabtxOGv2fiDGyBo4GDskc6dNTWoa4PT63I+ZDMXTBP 53TA9RybhCY7Go/WxWCig2A7JoNbHmVnj6PbaUMyL0Cip2uEGOYlqOiXw+jAJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688109522; a=rsa-sha256; cv=none; b=XPnSrDKp4XfslsE+8OlUZnlwDvPDFzJSdUXfN+guTnN5XyDDRKLFyV3Rmz6Lgx9L5qg1gZ prK6k42jMbffDiJzqp3jBXX4xSsbry5mOMc5+iVUwE7nnfIj7dLL+r32f3mFsujmtU8ktx 06C+S9uaCd8RN9l+0mFrqVPuy7aizIhLdTQMgRyeJ1TJWuhv0LUFEGRtlIguN1dn3hBLwM 36KSLxr9v8S+YiQ5Qo4DoG+XaOVi04yeX1Q9diPA/HbTkYafDPYSwos6ZahjN4f14IDTru xXn3jE7KKMQ0Ta7uHlbH+/EA/+ecS6xTf6buT/KzrFeHGh5DjUIIqWCN3zf1jA== 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 4Qsmrf4CCkzqNf; Fri, 30 Jun 2023 07:18:42 +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 35U7Ig3S065371; Fri, 30 Jun 2023 07:18:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7IgoZ065370; Fri, 30 Jun 2023 07:18:42 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:18:42 GMT Message-Id: <202306300718.35U7IgoZ065370@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: eed0de23279f - main - www/pecl-yaf: Fix build with PHP 8.2 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: eed0de23279ffa5fb5be7186f8998003efcb191d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=eed0de23279ffa5fb5be7186f8998003efcb191d commit eed0de23279ffa5fb5be7186f8998003efcb191d Author: Po-Chuan Hsieh AuthorDate: 2023-06-30 07:02:55 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-30 07:02:55 +0000 www/pecl-yaf: Fix build with PHP 8.2 - Update WWW Obtained from: https://github.com/laruence/yaf/pull/579 [1] --- www/pecl-yaf/Makefile | 5 ++-- www/pecl-yaf/files/patch-php82 | 64 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/www/pecl-yaf/Makefile b/www/pecl-yaf/Makefile index ce14f4c7f153..aeff5b8a6efe 100644 --- a/www/pecl-yaf/Makefile +++ b/www/pecl-yaf/Makefile @@ -4,7 +4,8 @@ CATEGORIES= www MAINTAINER= sunpoet@freeBSD.org COMMENT= MVC framework written as a C PHP extension -WWW= https://pecl.php.net/package/yaf +WWW= https://pecl.php.net/package/yaf \ + https://github.com/laruence/yaf LICENSE= PHP301 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -13,6 +14,6 @@ LIB_DEPENDS= libpcre.so:devel/pcre USES= localbase php:pecl -IGNORE_WITH_PHP=82 83 +IGNORE_WITH_PHP=83 .include diff --git a/www/pecl-yaf/files/patch-php82 b/www/pecl-yaf/files/patch-php82 new file mode 100644 index 000000000000..aa8f63eaa43e --- /dev/null +++ b/www/pecl-yaf/files/patch-php82 @@ -0,0 +1,64 @@ +Obtained from: https://github.com/laruence/yaf/pull/579 + +--- requests/yaf_request_simple.c.orig 2022-05-20 02:26:39 UTC ++++ requests/yaf_request_simple.c +@@ -140,6 +140,9 @@ YAF_STARTUP_FUNCTION(request_simple){ + zend_class_entry ce; + YAF_INIT_CLASS_ENTRY(ce, "Yaf_Request_Simple", "Yaf\\Request\\Simple", yaf_request_simple_methods); + yaf_request_simple_ce = zend_register_internal_class_ex(&ce, yaf_request_ce); ++#if PHP_VERSION_ID >= 80200 ++ yaf_request_simple_ce->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES; ++#endif + + return SUCCESS; + } +--- tests/031.phpt.orig 2022-05-20 02:26:39 UTC ++++ tests/031.phpt +@@ -36,7 +36,7 @@ Array + ) + array ( + '_default' => +- Yaf_Route_Map::__set_state(array( ++ %saf_Route_Map::__set_state(array( + 'ctl_prefer:protected' => true, + 'delimiter:protected' => '##', + )), +--- tests/issue231.phpt.orig 2022-05-20 02:26:40 UTC ++++ tests/issue231.phpt +@@ -34,7 +34,7 @@ Yaf_Request_Http Object + ) + + ) +-Yaf_Request_Http::__set_state(array( ++%saf_Request_Http::__set_state(array( + 'method' => 'POST', + 'module' => NULL, + 'controller' => NULL, +--- views/yaf_view_simple.c.orig 2022-05-20 02:26:39 UTC ++++ views/yaf_view_simple.c +@@ -388,8 +388,10 @@ static int yaf_view_simple_eval(yaf_view_t *view, zend + ZVAL_STR(&phtml, strpprintf(0, "?>%s", ZSTR_VAL(tpl))); + #if PHP_VERSION_ID < 80000 + op_array = zend_compile_string(&phtml, eval_desc); +-#else ++#elif PHP_VERSION_ID < 80200 + op_array = zend_compile_string(Z_STR(phtml), eval_desc); ++#else ++ op_array = zend_compile_string(Z_STR(phtml), eval_desc, ZEND_COMPILE_POSITION_AFTER_OPEN_TAG); + #endif + zval_dtor(&phtml); + efree(eval_desc); +--- yaf_application.c.orig 2022-05-20 02:26:40 UTC ++++ yaf_application.c +@@ -1053,8 +1053,10 @@ YAF_STARTUP_FUNCTION(application) { + yaf_application_ce->ce_flags |= ZEND_ACC_FINAL; + yaf_application_ce->serialize = zend_class_serialize_deny; + yaf_application_ce->unserialize = zend_class_unserialize_deny; +-#else ++#elif PHP_VERSION_ID < 80200 + yaf_application_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE; ++#else ++ yaf_application_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE | ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES; + #endif + + memcpy(&yaf_application_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));