From nobody Fri Jun 30 07:18:43 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 4Qsmrh3k9Wz4kpGF; Fri, 30 Jun 2023 07:18:44 +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 4Qsmrg6Hthz3lnp; Fri, 30 Jun 2023 07:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109523; 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=PmyFvjPCUgIZfRLudoLsn0xgCJM4Jp5/ykqstlKvL1w=; b=FdvdVcPYokfG0RxtCNmyHUrG3+PT+IFoTAqgBlvvD/jdTXgvgQD3PTSGysBRIwgoQDyKCA 6XrzvgxpN1lmu6jEdSkKkCLSTPKsu0lxV/Ufrf/08xfszGhEW2nyJ4b2rUL0/YGZv2E0i3 yI9DXL2rdkUSv43qXcwROjBhgaDreqG5jSHAoLazCW/9kjZRCXSsCvKrvT39qNP51kkS2D 2PAkJ4x6o+uc3fPzvrQSsrLwb9DPvKB29dFuHVqI0l6d+bkxTQkeElQOPEQxOKz65HG2if 2jPNRtKvP2Amz7n/knvg6MV4lKZZcrjL2AZDTdAuHuq0GRbTbZexnFfoy9fSEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109523; 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=PmyFvjPCUgIZfRLudoLsn0xgCJM4Jp5/ykqstlKvL1w=; b=iqrOLDYuGqfJEUxKile62fi1VGfvv7Pj/GL6953FUcRpUM87MINyImoZIGysqkLA4bQ8Is 9di29dZenTrsMmomJhAxyy8kyIkuhJAK9skjulrv9F4paMAzJ0QbCXecqJ2l+nXh72eIiV sgT/UkGaa1y9BeMsKn7/ze3Xonf3QoGw9prsqD0OoRkXpIT1yUIi889ZKbrc1xdslwdrzA rs9u6DUyDUxI/WK2Cj2mH7hI68tjiYo34i9w0OhqrZwoxNPwIiCWTpsTWTYRNNJUHfp94n 4hfov3H4LmcfFYQuaxWTDUv5nuzsVVIskRObesuM8GYSRubIU0Uh3DGS5xCf2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688109523; a=rsa-sha256; cv=none; b=fwHqct9Gf95kUwEc3E6kUvEPJjegA9XowyAe6jJLMNxmOakhkbryCZA1KhOczpV1/IFOki cvTCNajcCaMTEJO9DOLDtbBWmJJeRhig76aIpRi9Y6Y2c9F0KTh9ii4J7z6Kn+gOSkes99 GOmHK19G2IOtmIFGOv+k8rQUoQ+0Tt+4+kUa7h3s/8/U/rnNLavV3SWC3em1IzdsRKp9wi jr2Ict7BjGTbKLfogK7cxdYB4qm8XIL/SFnheUFIX7jaf6ChoFzKuvVhwmCNJQxRPjMsbf ioVzOkT6bMqAZjvuLMOZrzPrc4w+AD+zlas42QnBKnV6+xAy1aRf4LPG210tLQ== 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 4Qsmrg50ShzqNg; Fri, 30 Jun 2023 07:18:43 +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 35U7IhXT065390; Fri, 30 Jun 2023 07:18:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7IhY5065389; Fri, 30 Jun 2023 07:18:43 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:18:43 GMT Message-Id: <202306300718.35U7IhY5065389@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: 4ea81886d1ce - main - www/pecl-yar: Fix build with PHP 8.2+ 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ea81886d1cea72cf529dcc81b5315de2f4ff35e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ea81886d1cea72cf529dcc81b5315de2f4ff35e commit 4ea81886d1cea72cf529dcc81b5315de2f4ff35e Author: Po-Chuan Hsieh AuthorDate: 2023-06-30 07:02:58 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-30 07:02:58 +0000 www/pecl-yar: Fix build with PHP 8.2+ - Update WWW Obtained from: https://github.com/laruence/yar/pull/177 --- www/pecl-yar/Makefile | 5 ++--- www/pecl-yar/files/patch-php82 | 47 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/www/pecl-yar/Makefile b/www/pecl-yar/Makefile index e0d56d02d729..c7462d0d80dd 100644 --- a/www/pecl-yar/Makefile +++ b/www/pecl-yar/Makefile @@ -4,7 +4,8 @@ CATEGORIES= www MAINTAINER= sunpoet@FreeBSD.org COMMENT= Yar (Yet another RPC framework) is a light, concurrent RPC framework -WWW= https://pecl.php.net/package/yar +WWW= https://pecl.php.net/package/yar \ + https://github.com/laruence/yar LICENSE= PHP301 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -14,8 +15,6 @@ LIB_DEPENDS= libcurl.so:ftp/curl USES= localbase:ldflags php:build,pecl USE_PHP= curl -IGNORE_WITH_PHP=82 83 - OPTIONS_DEFINE= MSGPACK OPTIONS_DEFAULT=MSGPACK MSGPACK_DESC= Enable MSGPACK module diff --git a/www/pecl-yar/files/patch-php82 b/www/pecl-yar/files/patch-php82 new file mode 100644 index 000000000000..636894041167 --- /dev/null +++ b/www/pecl-yar/files/patch-php82 @@ -0,0 +1,47 @@ +Obtained from: https://github.com/laruence/yar/pull/177 + +--- tests/yar.inc.orig 2022-05-18 05:52:56 UTC ++++ tests/yar.inc +@@ -105,17 +105,19 @@ PHP; + + function yar_server_cleanup() { + $dir = dirname(__FILE__) . DIRECTORY_SEPARATOR . "htdocs"; +- $dp = opendir($dir); +- while (($f = readdir($dp))) { +- if (in_array($f, array('.', '..'))) { +- continue; ++ if (is_dir($dir)) { ++ $dp = opendir($dir); ++ while (($f = readdir($dp))) { ++ if (in_array($f, array('.', '..'))) { ++ continue; ++ } ++ $path = $dir . DIRECTORY_SEPARATOR . $f; ++ if (is_file($path)) { ++ unlink($path); ++ } + } +- $path = $dir . DIRECTORY_SEPARATOR . $f; +- if (is_file($path)) { +- unlink($path); +- } ++ rmdir($dir); + } +- rmdir($dir); + } + + /* For TCP */ +--- yar_request.c.orig 2022-05-18 05:52:56 UTC ++++ yar_request.c +@@ -34,7 +34,11 @@ + yar_request_t *php_yar_request_instance(zend_string *method, zend_array *parameters, void **options) /* {{{ */ { + yar_request_t *request = emalloc(sizeof(yar_request_t)); + ++#if PHP_VERSION_ID < 80200 + if (!BG(mt_rand_is_seeded)) { ++#else ++ if (!RANDOM_G(mt19937_seeded)) { ++#endif + php_mt_srand(GENERATE_SEED()); + } +