From nobody Fri Jun 7 16:51:55 2024 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 4VwnKm2Lyrz5LLhq; Fri, 07 Jun 2024 16:51:56 +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 4VwnKl2Sm6z4tsQ; Fri, 7 Jun 2024 16:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717779115; 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=9ebkAYZA7YiYM9u6444gsOemb/E9ZmUWJWga9vWcWvM=; b=uzugUNhLd+FpN1mf+omiLvEdadIRTZyimTXoYy4anpUA+1DnDAPdgEx/ZMAKa+z//klWEG yMWnonKzY89T/zi3E8LpcngJfXjj9XylvS8nKu6EkUmhYb8jGjU2n17IZ5HFk/TfADyQsn 2G/aR2p2fl5R8jD/tSRt2YUojMduCh61MAQB44sEpEDfztCma+X6jFkkoe4L75gjXscUDm KelsyORXPLif0eDEunuDmwT3i1vXRYKVtXx3yYY+aYaaHr547mXAerVu1DLAIEQRVkFedR ZDwT9hMJh6M36TJjW7S8VdoHgma/46ABMPhomFmIGOaZf4jnaRY3necRu/sH2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717779115; a=rsa-sha256; cv=none; b=xyiXKSrQFIbKp/4f+BRKQkNWlTZS1/5Rkl7GzSXVA+iA0ayMdmAZpZE3nsTvJFkdOdEBt/ SQjmdynrcvmC7WnZAvmbzdlN/BgkvuMHoe6vioeNsXw9ZpAMIKKLS86zwcEyGx04JATMV8 B3Cq8jNR6xqXKujjerRWGBbcF/h3wMgHyBm1m5YAUg48pdUad6J7cMBv7tz9fUX6/TxDTa QgF/stCh71AzrFObI9K2cmyVG2cyO31/dm72XLxuQZHkQw//67SkGayIwjd1Anb05ramxx F3fEkQeklqXFaepc7JI5qVeFWyO9ou0pFXZljQelcFFWe8s7VqbpGkNwOU8L4Q== 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=1717779115; 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=9ebkAYZA7YiYM9u6444gsOemb/E9ZmUWJWga9vWcWvM=; b=NlBoX4yZLlA8O3PZRBfKHu4epA0WulkwbmRKypb04kNyYTXYxENFc1x6fyv61IZkFIgMr9 pi3fZF3RMjtdiE4CBZJA3m44bERjFSV7tBbD/5fvAMbtLsL47PgXuf4OghoWCprvo70nY5 QKWFuEWnv3DXNrFHrvsPhNe7tjUHxWqXgIva2zJyhjbNirXZ+gfezCWCw9gDDgI7+eXIUP ZqMzNyzZ/sHAUxtc4uL3DVxJN51sLW38iXLYaEjsG3WZwZPbmZ7rmb6CIIr41CirxfWQZu sx/XqN2ZjI0pBvbOcADAGM9aNdt0c0sKXUQhenk+dLuWOrahEPkTk7XJuhyUNA== 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 4VwnKl24yzzMQy; Fri, 7 Jun 2024 16:51:55 +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 457Gptal086704; Fri, 7 Jun 2024 16:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 457Gptx2086688; Fri, 7 Jun 2024 16:51:55 GMT (envelope-from git) Date: Fri, 7 Jun 2024 16:51:55 GMT Message-Id: <202406071651.457Gptx2086688@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: 0ff750a9386c - 2024Q2 - www/phpvirtualbox{,-legacy}: use one patch for both ports, remove "No newline at end of file" from patches 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 0ff750a9386c00c580a99c436ac59c4d58ee8eb8 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ff750a9386c00c580a99c436ac59c4d58ee8eb8 commit 0ff750a9386c00c580a99c436ac59c4d58ee8eb8 Author: Vladimir Druzenko AuthorDate: 2024-06-07 16:41:36 +0000 Commit: Vladimir Druzenko CommitDate: 2024-06-07 16:51:37 +0000 www/phpvirtualbox{,-legacy}: use one patch for both ports, remove "No newline at end of file" from patches Forgot to commit this change in previous commit. PR: 261498 Approved by: portmgr (blanket, fix run) Fixes: c8ee98641064 (PHP 8.2 support - "utf8_encode()") MFH: 2024Q2 (cherry picked from commit d77f8d92ff492b6f408bead68d5484c70a031fba) --- www/phpvirtualbox-legacy/Makefile | 3 +- .../patch-panes_mediumEncryptionPasswords.html | 41 ---------------------- .../patch-panes_mediumEncryptionPasswords.html | 7 ---- www/phpvirtualbox/files/patch-php8 | 7 ---- 4 files changed, 2 insertions(+), 56 deletions(-) diff --git a/www/phpvirtualbox-legacy/Makefile b/www/phpvirtualbox-legacy/Makefile index 623174262c8e..efaccedd0017 100644 --- a/www/phpvirtualbox-legacy/Makefile +++ b/www/phpvirtualbox-legacy/Makefile @@ -22,7 +22,8 @@ DOS2UNIX_REGEX= .*\.(php|txt|js|css|html) WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX} ETCDIR= ${WWWDIR} -EXTRA_PATCHES+= ${.CURDIR}/../phpvirtualbox/files/patch-php8 +EXTRA_PATCHES+= ${.CURDIR}/../phpvirtualbox/files/patch-php8 \ + ${.CURDIR}/../phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html post-patch: @${MV} ${WRKSRC}/phpvirtualbox.conf ${WRKSRC}/phpvirtualbox-legacy.conf diff --git a/www/phpvirtualbox-legacy/files/patch-panes_mediumEncryptionPasswords.html b/www/phpvirtualbox-legacy/files/patch-panes_mediumEncryptionPasswords.html deleted file mode 100644 index 75142aed7747..000000000000 --- a/www/phpvirtualbox-legacy/files/patch-panes_mediumEncryptionPasswords.html +++ /dev/null @@ -1,41 +0,0 @@ ---- panes/mediumEncryptionPasswords.html.orig 2017-07-27 16:54:58 UTC -+++ panes/mediumEncryptionPasswords.html -@@ -15,6 +15,7 @@ - Status - ID - Password -+ Clear on suspend - - - -@@ -37,9 +38,12 @@ function vboxMediumEncryptionPasswordAdd - .append($('') - .append( - valid ? '*****' : -- $('').attr({'type':'password','style':'width:95%'}).addClass('vboxText') -+ $('').attr({'type':'password','style':'width:90%'}).addClass('vboxText') - ) - ) -+ .append($('') -+ .append($('').attr({'type':'checkbox', 'checked':'checked'})) -+ ) - .appendTo($('#vboxMediumEncryptionPasswordList')) - } - -@@ -55,7 +59,8 @@ function vboxMediumEncryptionPasswordsGe - continue; - encryptionPWs.push({ - 'id': $(rowlist[i]).data('vboxEncryptionId'), -- 'password': $(rowlist[i]).find('input').first().val() -+ 'password': $(rowlist[i]).find('input[type="password"]').first().val(), -+ 'clearOnSuspend': $(rowlist[i]).find('input[type="checkbox"]').first().is(':checked') ? '1' : '0' - }); - - } -@@ -75,4 +80,4 @@ function vboxMediumEncryptionPasswordsVa - }); - return valid; - } -- -\ No newline at end of file -+ diff --git a/www/phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html b/www/phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html index 75142aed7747..3e8a7c62dfb7 100644 --- a/www/phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html +++ b/www/phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html @@ -32,10 +32,3 @@ }); } -@@ -75,4 +80,4 @@ function vboxMediumEncryptionPasswordsVa - }); - return valid; - } -- -\ No newline at end of file -+ diff --git a/www/phpvirtualbox/files/patch-php8 b/www/phpvirtualbox/files/patch-php8 index 318b3c4b5a58..52fe5a6a5b12 100644 --- a/www/phpvirtualbox/files/patch-php8 +++ b/www/phpvirtualbox/files/patch-php8 @@ -178,13 +178,6 @@ return $log; } -@@ -5855,4 +5853,4 @@ class vboxconnector { - - return @$rcodes['0x'.strtoupper(dechex($c))] . ' (0x'.strtoupper(dechex($c)).')'; - } --} -\ No newline at end of file -+} --- endpoints/screen.php.orig 2024-06-07 15:46:20 UTC +++ endpoints/screen.php @@ -87,13 +87,13 @@ try {