From nobody Mon Sep 18 12:47:13 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 4Rq4Lp1YThz4t8MN; Mon, 18 Sep 2023 12:47:14 +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 4Rq4Lp13Fdz4MFh; Mon, 18 Sep 2023 12:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695041234; 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=QDD22vuNj7DBwJur3XOXv9+XTJGTLbG0QI+o8/cJm/k=; b=aUv6GudagBRy7xcQRXkH1tTdX6mdkExQS3m9nvvgir5NZ4QhybBrh1M+waiRfp3kP8BMoe oNVbP3LGwqRQo1OoXxVdCMnCoOj9f9I8WhUl8oWT/XJxIQnkh6JggRWNryfmSx9eWZHu3o UI1iHIDWIFA9evwEdB9mudRx3QyUMVilzYdRYrNkmbtMVrfkMclwrzwMZ8MXjV8u+mXH3a zyUw9y0S0Xy/tf76h/Y6sE59jpj3hy9nYSl5U/Pe8fN3WSVSkfqXnMBVRkYWW04WD/iZJ8 Xj8SWubLHOyxlLk1Yu4eGnIxNgmt7ZJkg2WJR2K3EsQDQmKTCji//ei3Zc/Vlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695041234; a=rsa-sha256; cv=none; b=JIMWrkMtZfnntKGDB23RjTkY/+b4yQakZJ1i8IZ4l4VHo7RzUmgfMxIXxrOdK3jaghkmHK M9blKcZG5cYNIlo5O9BScDEAqBemSZtMJhnB+DG92zgkHV8ZBPYEu53NviZ0C+xLWPMto2 0HS3plk8R+cWbrdee6DfvAaQKc8ZwKPZM3jyC2ImIvPT+0ilRNSaujLQulNay4YgYhIlNr snHg9QK+lUvapudH6fPKe6l8GmVVSk96Pcyxs7Ixvq1lgkw71C3knQ2uhRr4feH8aqxXJm yz+maGydN4Jlu1bSN9emLzwS5du3YWWAyyrd6TN7kaDtZXjestC3y3VEkPjo+g== 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=1695041234; 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=QDD22vuNj7DBwJur3XOXv9+XTJGTLbG0QI+o8/cJm/k=; b=mVmqxJ1vbrAMw5x25/eSu5q7vbttbs8IYy+OlTgrMJ9ZFnqE0y3mmLrRbtzmVNWNenKNgb j9V5O2vkO12tNJ8P9JK5qkcVwxjwQ6AFUpH4j3SqAerkQuY52IcOWgumIS9sd094wxwQta KscYeXztxhRIwaeLJ6axdo0DHhJA9cC8AK2zD4oEf3pW9j2C8v9nxV/7Jedhnewk0VcSTZ IQrzGHY850jkdfj/qiErZsVKsye+NI0D7mmPe0HL35M+HTzKfgTYSqCQwsFyOn+d7h8JG4 omOS9jg8p8dOZShJCFD8gprZp2qIvxvVDEWWYea20rFg9a2OblDGcUvyDivuzw== 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 4Rq4Lp053NzXTQ; Mon, 18 Sep 2023 12:47:14 +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 38IClDfV030328; Mon, 18 Sep 2023 12:47:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IClDfH030325; Mon, 18 Sep 2023 12:47:13 GMT (envelope-from git) Date: Mon, 18 Sep 2023 12:47:13 GMT Message-Id: <202309181247.38IClDfH030325@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: fc4ebc143c4b - 2023Q3 - www/phpvirtualbox{,-legacy}: PHP 8 support (1 more catch) - "preg_replace" 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/2023Q3 X-Git-Reftype: branch X-Git-Commit: fc4ebc143c4b097ec1ea90fa6831a3125c8619de Auto-Submitted: auto-generated The branch 2023Q3 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc4ebc143c4b097ec1ea90fa6831a3125c8619de commit fc4ebc143c4b097ec1ea90fa6831a3125c8619de Author: Vladimir Druzenko AuthorDate: 2023-09-18 12:35:49 +0000 Commit: Vladimir Druzenko CommitDate: 2023-09-18 12:47:04 +0000 www/phpvirtualbox{,-legacy}: PHP 8 support (1 more catch) - "preg_replace" Fixed: PHP Warning: preg_replace() expects at least 3 parameters, 2 given in endpoints/screen.php on line 91 PR: 261498 Approved by: tcberner (mentor) MFH: 2023Q3 (cherry picked from commit 3f1b38acfda124fc8f03fe5f4edfef10ef214501) --- www/phpvirtualbox-legacy/Makefile | 2 +- www/phpvirtualbox/Makefile | 2 +- www/phpvirtualbox/files/patch-php8 | 28 +++++++++++++++++++++++++--- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/www/phpvirtualbox-legacy/Makefile b/www/phpvirtualbox-legacy/Makefile index 38709462e376..ba80ba721ec8 100644 --- a/www/phpvirtualbox-legacy/Makefile +++ b/www/phpvirtualbox-legacy/Makefile @@ -1,6 +1,6 @@ PORTNAME= phpvirtualbox DISTVERSION= 5.2-1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www PKGNAMESUFFIX= -legacy diff --git a/www/phpvirtualbox/Makefile b/www/phpvirtualbox/Makefile index 4c4929542c6f..cc67954d33a0 100644 --- a/www/phpvirtualbox/Makefile +++ b/www/phpvirtualbox/Makefile @@ -1,6 +1,6 @@ PORTNAME= phpvirtualbox DISTVERSION= 6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= vbox@FreeBSD.org diff --git a/www/phpvirtualbox/files/patch-php8 b/www/phpvirtualbox/files/patch-php8 index d6566684b8ca..477a1596ba4c 100644 --- a/www/phpvirtualbox/files/patch-php8 +++ b/www/phpvirtualbox/files/patch-php8 @@ -144,12 +144,34 @@ diff -ur endpoints/screen.php.orig endpoints/screen.php // Let the browser cache images for 3 seconds $ctime = 0; - if(strpos($_SERVER['HTTP_IF_NONE_MATCH'],'_')) { -+ if(strpos($_SERVER['HTTP_IF_NONE_MATCH'] ?? '','_')) { - $ctime = preg_replace("/.*_/",str_replace('"','',$_SERVER['HTTP_IF_NONE_MATCH'])); +- $ctime = preg_replace("/.*_/",str_replace('"','',$_SERVER['HTTP_IF_NONE_MATCH'])); - } else if(strpos($_ENV['HTTP_IF_NONE_MATCH'],'_')) { +- $ctime = preg_replace("/.*_/",str_replace('"','',$_ENV['HTTP_IF_NONE_MATCH'])); +- } else if(strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'],'GMT')) { ++ if(strpos($_SERVER['HTTP_IF_NONE_MATCH'] ?? '','_')) { ++ $ctime = preg_replace("/.*_/","",str_replace('"','',$_SERVER['HTTP_IF_NONE_MATCH'])); + } else if(strpos($_ENV['HTTP_IF_NONE_MATCH'] ?? '','_')) { - $ctime = preg_replace("/.*_/",str_replace('"','',$_ENV['HTTP_IF_NONE_MATCH'])); ++ $ctime = preg_replace("/.*_/","",str_replace('"','',$_ENV['HTTP_IF_NONE_MATCH'])); ++ } else if(strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'] ?? '','GMT')) { + $ctime = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']); +- } else if(strpos($_ENV['HTTP_IF_MODIFIED_SINCE'],'GMT')) { ++ } else if(strpos($_ENV['HTTP_IF_MODIFIED_SINCE'] ?? '','GMT')) { + $ctime = strtotime($_ENV['HTTP_IF_MODIFIED_SINCE']); + } + +@@ -164,13 +164,13 @@ + + // Let the browser cache saved state images + $ctime = 0; +- if(strpos($_SERVER['HTTP_IF_NONE_MATCH'],'_')) { +- $ctime = preg_replace("/.*_/",str_replace('"','',$_SERVER['HTTP_IF_NONE_MATCH'])); +- } else if(strpos($_ENV['HTTP_IF_NONE_MATCH'],'_')) { +- $ctime = preg_replace("/.*_/",str_replace('"','',$_ENV['HTTP_IF_NONE_MATCH'])); - } else if(strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'],'GMT')) { ++ if(strpos($_SERVER['HTTP_IF_NONE_MATCH'] ?? '','_')) { ++ $ctime = preg_replace("/.*_/","",str_replace('"','',$_SERVER['HTTP_IF_NONE_MATCH'])); ++ } else if(strpos($_ENV['HTTP_IF_NONE_MATCH'] ?? '','_')) { ++ $ctime = preg_replace("/.*_/","",str_replace('"','',$_ENV['HTTP_IF_NONE_MATCH'])); + } else if(strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'] ?? '','GMT')) { $ctime = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']); - } else if(strpos($_ENV['HTTP_IF_MODIFIED_SINCE'],'GMT')) {