From f8452e05cb7c34aec405fc6c4ce6dbade105691b Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 4 Mar 2024 19:48:34 +0100 Subject: [PATCH 1/2] Add deleted files and folders from PR #42954 --- administrator/components/com_admin/script.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 3b6991f592b5f..835db7cf2fe31 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -2239,17 +2239,23 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/ES256.php', '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/ES384.php', '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/ES512.php', + '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/LICENSE', '/libraries/vendor/web-token/jwt-signature-algorithm-eddsa/EdDSA.php', + '/libraries/vendor/web-token/jwt-signature-algorithm-eddsa/LICENSE', '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/Blake2b.php', '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/ES256K.php', '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/HS1.php', '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/HS256_64.php', + '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/LICENSE', '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/RS1.php', '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/HMAC.php', '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/HS256.php', '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/HS384.php', '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/HS512.php', + '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/LICENSE', + '/libraries/vendor/web-token/jwt-signature-algorithm-none/LICENSE', '/libraries/vendor/web-token/jwt-signature-algorithm-none/None.php', + '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/LICENSE', '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/PS256.php', '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/PS384.php', '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/PS512.php', @@ -2528,9 +2534,16 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/media/vendor/joomla-a11y-checker', '/media/plg_system_jooa11y/scss', '/media/plg_system_jooa11y/css', + '/libraries/vendor/web-token/signature-pack', '/libraries/vendor/web-token/jwt-signature/Serializer', '/libraries/vendor/web-token/jwt-signature/Algorithm', '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/Util', + '/libraries/vendor/web-token/jwt-signature-algorithm-rsa', + '/libraries/vendor/web-token/jwt-signature-algorithm-none', + '/libraries/vendor/web-token/jwt-signature-algorithm-hmac', + '/libraries/vendor/web-token/jwt-signature-algorithm-experimental', + '/libraries/vendor/web-token/jwt-signature-algorithm-eddsa', + '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa', '/libraries/vendor/web-token/jwt-signature', '/libraries/vendor/web-token/jwt-core/Util', '/libraries/vendor/web-token/jwt-core', From 0c4a432abb24906143c5bda64d8a0cc66d57e2d5 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Thu, 7 Mar 2024 19:23:17 +0100 Subject: [PATCH 2/2] Update for beta2 --- administrator/components/com_admin/script.php | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 835db7cf2fe31..b275741f3420f 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -2239,23 +2239,17 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/ES256.php', '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/ES384.php', '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/ES512.php', - '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/LICENSE', '/libraries/vendor/web-token/jwt-signature-algorithm-eddsa/EdDSA.php', - '/libraries/vendor/web-token/jwt-signature-algorithm-eddsa/LICENSE', '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/Blake2b.php', '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/ES256K.php', '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/HS1.php', '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/HS256_64.php', - '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/LICENSE', '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/RS1.php', '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/HMAC.php', '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/HS256.php', '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/HS384.php', '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/HS512.php', - '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/LICENSE', - '/libraries/vendor/web-token/jwt-signature-algorithm-none/LICENSE', '/libraries/vendor/web-token/jwt-signature-algorithm-none/None.php', - '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/LICENSE', '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/PS256.php', '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/PS384.php', '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/PS512.php', @@ -2296,6 +2290,13 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/modules/mod_tags_popular/mod_tags_popular.php', '/modules/mod_tags_similar/mod_tags_similar.php', '/modules/mod_wrapper/mod_wrapper.php', + // From 5.1.0-beta1 to 5.1.0-beta2 + '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/LICENSE', + '/libraries/vendor/web-token/jwt-signature-algorithm-eddsa/LICENSE', + '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/LICENSE', + '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/LICENSE', + '/libraries/vendor/web-token/jwt-signature-algorithm-none/LICENSE', + '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/LICENSE', ]; $folders = [ @@ -2534,19 +2535,20 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/media/vendor/joomla-a11y-checker', '/media/plg_system_jooa11y/scss', '/media/plg_system_jooa11y/css', - '/libraries/vendor/web-token/signature-pack', '/libraries/vendor/web-token/jwt-signature/Serializer', '/libraries/vendor/web-token/jwt-signature/Algorithm', '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/Util', + '/libraries/vendor/web-token/jwt-signature', + '/libraries/vendor/web-token/jwt-core/Util', + '/libraries/vendor/web-token/jwt-core', + // From 5.1.0-beta1 to 5.1.0-beta2 + '/libraries/vendor/web-token/signature-pack', '/libraries/vendor/web-token/jwt-signature-algorithm-rsa', '/libraries/vendor/web-token/jwt-signature-algorithm-none', '/libraries/vendor/web-token/jwt-signature-algorithm-hmac', '/libraries/vendor/web-token/jwt-signature-algorithm-experimental', '/libraries/vendor/web-token/jwt-signature-algorithm-eddsa', '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa', - '/libraries/vendor/web-token/jwt-signature', - '/libraries/vendor/web-token/jwt-core/Util', - '/libraries/vendor/web-token/jwt-core', ]; $status['files_checked'] = $files;