From nobody Mon Dec 25 16:22:24 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 4SzNTr5sgkz54xt3; Mon, 25 Dec 2023 16:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzNTr5JwBz4QYD; Mon, 25 Dec 2023 16:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703521344; 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=yKpFTUYvl5m7WhDavDWi7423UqleFx7gD1fkOjMAja4=; b=FNfpj6U4ExMBV91SI1sm0RAIlN9fE+LRJ5nt7ti0oghuwuzAa28MGU4spW3iCAin2aQ68K P7BI5fIpCBzNZGiYz3+Qy9gFnVwQM+s0PDWsw+yXCJq5IFop41mxcms0gREZE9bOaqepMK mKHAyzyvvwRbMWlzUDkS8WIU9CQh65VsoT/Zgb7bwNxsezQBQDmnroeog1Y+Sn2RBaKdyG OQQNkEe/t3CnoNLMi+MwgP8CEzIQKJDouUa0Zel/f+zNDvFo/rVazaoGaUip4znJVEosVm CwcBUZ2Oxpd0A7uqxeHYHSEYTwq5r9HOQgaf0kvAzVkT2MzIsE3W9Lp8cWBPUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703521344; a=rsa-sha256; cv=none; b=mGFhRYPeIgqVW1QXOk+/IFdoS5qgHMp4oFkrRagL1BMdc7dtZvl7MeBpCHCDkt/3AvKG4A Hq0GwfGWrnMbWPr8Mky7wAtEoM223zibNe82vIlqwEh1C8GrabIOn2aLKQVDIhho7gZjGm e4w6FiqT9TRDV8aPsGgqusEaav413JXt6aP/vw7XJn1Z3Nj+kz3k7pXhMDZQidhpZqshTa p44dke7tVNJ6ekdICm7bAHT1oS61Ic8gVNXGgEOEMwpy+o6KLrbOuRfASNaaYo+0VelnvX R0KvrMbQ9DqmugdpAS8D+AVoqQvD393fuShJYwcOSdPndj50uNyuMDpuq5kowg== 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=1703521344; 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=yKpFTUYvl5m7WhDavDWi7423UqleFx7gD1fkOjMAja4=; b=FyCI/V/R6vqtiYLXqaTKg4e72xns1rF5SBC6BC/sNWkNWXgpktd9DI+zUniwdPo+xHbiM8 A6PGlekfwhpYZOmEZRxlQAljuTG0or8tmXGYrmqektJEZmgVDZul08WgVQwP2iw9lsepZ+ 0bmWqTfCD5UMC92D7qeHOIKK7+1yUknk6TWQtL0h5VinqYMsjBmz9DBLoXfJWRBk9AVBdY ODKHNDOwB9Y/vPUEZtc4NeeoRhKhIJh1oTPEziJQmJamLn4XoYR7DuO0Ka9ap5OK2FrTuU 3g3SjnNDYadqFsxIcj4oaBcCEqNsSqeMdGZ2WtRQDeHE5ZvJpVeWM6zH97cLhw== 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 4SzNTr4QxHz3db; Mon, 25 Dec 2023 16:22:24 +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 3BPGMOBw028040; Mon, 25 Dec 2023 16:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPGMOGn028037; Mon, 25 Dec 2023 16:22:24 GMT (envelope-from git) Date: Mon, 25 Dec 2023 16:22:24 GMT Message-Id: <202312251622.3BPGMOGn028037@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 2245103f43c9 - 2023Q4 - 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 2245103f43c99d592f4e78e3b0621ac3b0755f83 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2245103f43c99d592f4e78e3b0621ac3b0755f83 commit 2245103f43c99d592f4e78e3b0621ac3b0755f83 Author: Vladimir Druzenko AuthorDate: 2023-12-25 16:15:08 +0000 Commit: Vladimir Druzenko CommitDate: 2023-12-25 16:22:16 +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 (cherry picked from commit 1c0edfc75b4b1d3620cfb25407bc4baaaa1c711f) --- 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