From nobody Mon Dec 25 16:19:41 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 4SzNQj4WTLz54xKV; Mon, 25 Dec 2023 16:19:41 +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 4SzNQj3trhz4Q3b; Mon, 25 Dec 2023 16:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703521181; 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=Mq9FerKRUzwfGBLQpHaBx8NYHIcJRLZDXXJp85m9vcM=; b=fnOoTSsoSHqSG54DzJd1yVK86y1IvuMc7w9HREWeHqP5NVVnXpCAWfVU4aKla6AWpehMj/ jFiDo3nZCzIZkRSwKipgrFqlJfsSp25oBsKXGQotXYXLDPLAUdDuppu9Da6WdUM3oaApmh ukAvP/t1HCUrL5FLW4iUQSFFOZxq5FzNbKXbYJdnG079fnOZgAnV0cv00g7RMgOmH7OrJu YmAbVK8cbM7nMBq7fQxNbf1LcvItf4FgVzKMTGkUjPW9hO8qYnKaWX81M31j76S+vCEYEk 02rwi8DDtR1We/mAjsyQY6wU7k/S2wm3qZSksSHKMh3Y2+hwODleCz9ViZXDbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703521181; a=rsa-sha256; cv=none; b=c6eKMux23yZRnDTz7Ri4F13/UjHyMIQWT4viXg5r9ytgHR91e0HBpduZxgRk1z6/bNQhMK bl5iDzReTCXQbI+8Xkm8esBm8IqqEqVGTtwzKoMcr9kArT7OnU02VYanoySPsiQh69u8XN Ae+IIgt89Tq8hyIbo/+bZCclo347Xhvlajc4LI+z0hcetpzHjWjj8V/rYvPqR/B4X8lYSe BkHpTd8kl2L48fqjQcCjVL+j866qvifFEbXlNRSK1lquc92k2mU8j0bSpMR6yhoo7aVIpQ rU3QuDqOE1FpTmCzi18+zDPEGC0jz2S4mcQvqbdbqfahLQ6yBrBmA3ZC+Eqg7g== 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=1703521181; 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=Mq9FerKRUzwfGBLQpHaBx8NYHIcJRLZDXXJp85m9vcM=; b=UNCOfiIdPNi95BXqj5fG7pTlr2198teGrhzdqnGAkeGugICSnCHo3KfDBX08UAJ0LaIHRs 2Pey13p1U9aOOrF9/j3mRSgVAruTrtTVq3jvmIib7AidSfFWIwIV4b9CUoIF1v7U6an7kh mUFtBH7cNaItJ0KZci7KRaIsIz7jqsc9hNCh2w1GYjKPmHDaqhZVd5msPK475aRpRovpU4 mg1/MKNPDu4hOVncCn52c1xxfEDLPnLEz9ll6PZ2EAMJoOmCiISpluZmdISIcszGy60yEs fokPg6rsvt+1c4vG1y+V3tMPfP+A21IAj0IxVBYp+MTdXhg1RWGEidK7t18NJA== 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 4SzNQj2yb0z3d3; Mon, 25 Dec 2023 16:19:41 +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 3BPGJfw5013008; Mon, 25 Dec 2023 16:19:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPGJfpV013005; Mon, 25 Dec 2023 16:19:41 GMT (envelope-from git) Date: Mon, 25 Dec 2023 16:19:41 GMT Message-Id: <202312251619.3BPGJfpV013005@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 1c0edfc75b4b - main - www/phpvirtualbox{,-legacy}: PHP 8.2 support 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c0edfc75b4b1d3620cfb25407bc4baaaa1c711f Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c0edfc75b4b1d3620cfb25407bc4baaaa1c711f commit 1c0edfc75b4b1d3620cfb25407bc4baaaa1c711f Author: Vladimir Druzenko AuthorDate: 2023-12-25 16:15:08 +0000 Commit: Vladimir Druzenko CommitDate: 2023-12-25 16:19:29 +0000 www/phpvirtualbox{,-legacy}: PHP 8.2 support Was fixed: 1. Deprecated: Creation of dynamic property vboxconnector::$client is deprecated in /usr/local/www/phpvirtualbox/endpoints/lib/vboxconnector.php on line 175. 2. Deprecated: Creation of dynamic property phpVBoxConfigClass::$enableHDFlushConfig is deprecated in /usr/local/www/phpvirtualbox/endpoints/lib/config.php on line 1825. 3. Deprecated: Creation of dynamic property phpVBoxConfigClass::$authMaster is deprecated in /usr/local/www/phpvirtualbox/endpoints/lib/config.php on line 241. 4. Division by zero in endpoints/lib/vboxconnector.php. Upstream issue: https://github.com/usvn/usvn/issues/82 Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D43175 MFH: 2023Q4 --- www/phpvirtualbox-legacy/Makefile | 2 +- www/phpvirtualbox/Makefile | 2 +- www/phpvirtualbox/files/patch-php8 | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/www/phpvirtualbox-legacy/Makefile b/www/phpvirtualbox-legacy/Makefile index ba80ba721ec8..be0c78bb5205 100644 --- a/www/phpvirtualbox-legacy/Makefile +++ b/www/phpvirtualbox-legacy/Makefile @@ -1,6 +1,6 @@ PORTNAME= phpvirtualbox DISTVERSION= 5.2-1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www PKGNAMESUFFIX= -legacy diff --git a/www/phpvirtualbox/Makefile b/www/phpvirtualbox/Makefile index cc67954d33a0..7569c308c855 100644 --- a/www/phpvirtualbox/Makefile +++ b/www/phpvirtualbox/Makefile @@ -1,6 +1,6 @@ PORTNAME= phpvirtualbox DISTVERSION= 6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MAINTAINER= vbox@FreeBSD.org diff --git a/www/phpvirtualbox/files/patch-php8 b/www/phpvirtualbox/files/patch-php8 index 477a1596ba4c..12783b19f800 100644 --- a/www/phpvirtualbox/files/patch-php8 +++ b/www/phpvirtualbox/files/patch-php8 @@ -207,3 +207,37 @@ diff -ur panes/settingsNetwork.html.orig panes/settingsNetwork.html $(nsel).jec(); } +--- endpoints/lib/config.php.orig ++++ endpoints/lib/config.php +@@ -141,6 +141,10 @@ + */ + var $eventListenerTimeout = 20; + ++ var $enableHDFlushConfig = false; ++ ++ var $authMaster = false; ++ + /** + * Read user configuration, apply defaults, and do some sanity checking + * @see vboxconnector +--- endpoints/lib/vboxconnector.php.orig ++++ endpoints/lib/vboxconnector.php +@@ -112,6 +112,8 @@ + */ + var $dsep = null; + ++ var $client = null; ++ + /** + * Obtain configuration settings and set object vars + * @param boolean $useAuthMaster use the authentication master obtained from configuration class +@@ -389,7 +389,8 @@ + + // The amount of time we will wait for events is determined by + // the amount of listeners - at least half a second +- $listenerWait = max(100,intval(500/count($this->persistentRequest['vboxEventListeners']))); ++ $listenerCount = count($this->persistentRequest['vboxEventListeners']); ++ $listenerWait = max(100,intval(500/($listenerCount > 0 ? $listenerCount : 1))); + } + + // Get events from each configured event listener