From 7f161c2cd004e05fc9a764fc5cf54a8eb923c2d3 Mon Sep 17 00:00:00 2001 From: "lauren n. liberda" Date: Thu, 30 May 2024 10:45:19 +0200 Subject: [PATCH] testing/electron: upgrade to 30.0.9 --- testing/electron/APKBUILD | 8 ++---- testing/electron/CVE-2024-5274.patch | 41 ---------------------------- 2 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 testing/electron/CVE-2024-5274.patch diff --git a/testing/electron/APKBUILD b/testing/electron/APKBUILD index d16be9e8439..a35cba1007b 100644 --- a/testing/electron/APKBUILD +++ b/testing/electron/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: lauren n. liberda pkgname=electron -pkgver=30.0.7 +pkgver=30.0.9 _semver="${pkgver/_beta/-beta.}" pkgrel=0 -_chromium=124.0.6367.230 +_chromium=124.0.6367.233 _copium_tag=124.5 _depot_tools=495b23b39aaba2ca3b55dd27cadc523f1cb17ee6 pkgdesc="Electron cross-platform desktop toolkit" @@ -143,7 +143,6 @@ source="https://ab-sn.lnl.gay/electron-$_semver-$_chromium.tar.zst python-jinja-3.10.patch webpack-hash.patch unbundle-node.patch - CVE-2024-5274.patch default.conf electron.desktop @@ -545,7 +544,7 @@ lang() { } sha512sums=" -4c27936ffc21c6cd2f5eef7adcc6bb178062ed246fd79a2f2372ce61778b690ef298317ece6490a6073c918b9f3c96a96d8a2b64c46e1e2cb288c5356e3864c0 electron-30.0.7-124.0.6367.230.tar.zst +97024407a16fb41ec56fcc6df5552165ce4eea34fc51b17ecbf30a7e35406baccf8a3001a795a06d1e92d32e134d9d7a18d59fa74eda1b1bc23b59bc4947929b electron-30.0.9-124.0.6367.233.tar.zst 13c647dc2024e27ae8a4d7e8f1202037a342f4a7054477226665c332029e1b6f1d8b99004c2b2809bcf1e6c19b1359ef5e1c971552d7ced59c5b43d5a836af88 copium-124.5.tar.gz 29bb685e03356a77df5fd347cdf55194cc8b3265c421cc76e54d64edefc329dbcb052deb26b22e8f587ce68456876c071de1b7d258dd0fcc6ee66c875ec4a020 chromium-revert-drop-of-system-java.patch 54eb147c0af2ba096d1df375a289b339ee855ab1a9114e7c747753f0274a6bafb7212c1859b7885454c4529d9a5e3bd9559fc14e8e006f23ccd381895fa68d15 compiler.patch @@ -580,7 +579,6 @@ e48693e6b7aeebf69a5acbf80d9a35defe4c23835121dfeb58b051ac7c527e758a41004f4d193274 e05180199ee1d559e4e577cedd3e589844ecf40d98a86321bf1bea5607b02eeb5feb486deddae40e1005b644550331f6b8500177aa7e79bcb3750d3c1ceb76c3 python-jinja-3.10.patch 2aa340854316f1284217c0ca17cbf44953684ad6c7da90815117df30928612eb9fb9ffb734b948dfc309cd25d1a67cd57f77aac2d052a3dd9aca07a3a58cbb30 webpack-hash.patch ebb18a0e2eba4b4606e900fa82f4b57fe91dcbdc943e17544bccb3c9a011a49b4331cdbee59629e44b80184bad4ea54ec887c0bfcd00cda8d5686060dbf365e3 unbundle-node.patch -720aeb93f5accf7df5bc63ec3400df7364868721fe9741a2087d614acfcf004aade96fa5e1c7b5a2380f9547fa9a2e495f8bb51f95b11f49bb49d9783e04135f CVE-2024-5274.patch e8ea87c547546011c4c8fc2de30e4f443b85cd4cfcff92808e2521d2f9ada03feefb8e1b0cf0f6b460919c146e56ef8d5ad4bb5e2461cc5247c30d92eb4d068e default.conf 191559fc7aa1ea0353c6fb0cc321ee1d5803a0e44848c8be941cfab96277b0de6a59962d373e2a2a1686c8f9be2bcf2d2f33706759a339a959e297d3f7fda463 electron.desktop 5f7ba5ad005f196facec1c0f26108356b64cafb1e5cfa462ff714a33b8a4c757ac00bfcb080da09eb5b65032f8eb245d9676a61ec554515d125ed63912708648 electron-launcher.sh diff --git a/testing/electron/CVE-2024-5274.patch b/testing/electron/CVE-2024-5274.patch deleted file mode 100644 index dcff7c3b7a9..00000000000 --- a/testing/electron/CVE-2024-5274.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shu-yu Guo -Date: Tue, 21 May 2024 10:06:20 -0700 -Subject: Using FunctionParsingScope for parsing class static blocks - -Class static blocks contain statements, don't inherit the -ExpressionScope stack. - -Bug: 341663589 -Change-Id: Id52a60d77781201a706fcf2290d7d103f39bed83 -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5553030 -Commit-Queue: Shu-yu Guo -Commit-Queue: Adam Klein -Reviewed-by: Adam Klein -Cr-Commit-Position: refs/heads/main@{#94014} - -diff --git a/v8/src/ast/scopes.cc b/v8/src/ast/scopes.cc -index 39e3a8d5d59acbe9405f351fa6c57121c1900657..2aa1bb6c0f8f6e098a3ddf3f54ec2d0d5af9dc24 100644 ---- a/v8/src/ast/scopes.cc -+++ b/v8/src/ast/scopes.cc -@@ -2445,7 +2445,7 @@ bool Scope::MustAllocate(Variable* var) { - var->set_is_used(); - if (inner_scope_calls_eval_ && !var->is_this()) var->SetMaybeAssigned(); - } -- DCHECK(!var->has_forced_context_allocation() || var->is_used()); -+ CHECK(!var->has_forced_context_allocation() || var->is_used()); - // Global variables do not need to be allocated. - return !var->IsGlobalObjectProperty() && var->is_used(); - } -diff --git a/v8/src/parsing/parser-base.h b/v8/src/parsing/parser-base.h -index 009befd607bbe9135d604550018e36d681340718..6001ea622dfe0d1e4ccd4b42351b7368fd0892ce 100644 ---- a/v8/src/parsing/parser-base.h -+++ b/v8/src/parsing/parser-base.h -@@ -2661,6 +2661,7 @@ typename ParserBase::BlockT ParserBase::ParseClassStaticBlock( - } - - FunctionState initializer_state(&function_state_, &scope_, initializer_scope); -+ FunctionParsingScope body_parsing_scope(impl()); - AcceptINScope accept_in(this, true); - - // Each static block has its own var and lexical scope, so make a new var