diff options
Diffstat (limited to 'editors/vscode/files')
5 files changed, 68 insertions, 7 deletions
diff --git a/editors/vscode/files/patch-package.json b/editors/vscode/files/patch-package.json new file mode 100644 index 000000000000..c40a6ad34f03 --- /dev/null +++ b/editors/vscode/files/patch-package.json @@ -0,0 +1,14 @@ +https://github.com/eclipse/openvsx/issues/543 +https://github.com/termux/termux-packages/issues/24739 +https://github.com/termux/termux-packages/pull/24757 + +--- package.json.orig 2025-08-20 15:13:53 UTC ++++ package.json +@@ -105,6 +105,7 @@ + "native-is-elevated": "0.7.0", + "native-keymap": "^3.3.5", + "native-watchdog": "^1.4.1", ++ "node-ovsx-sign": "^1.2.0", + "node-pty": "^1.1.0-beta33", + "open": "^10.1.2", + "tas-client-umd": "0.2.0", diff --git a/editors/vscode/files/patch-src_vs_base_common_platform.ts b/editors/vscode/files/patch-src_vs_base_common_platform.ts index 69cd665fa3a2..e032caf7dbf1 100644 --- a/editors/vscode/files/patch-src_vs_base_common_platform.ts +++ b/editors/vscode/files/patch-src_vs_base_common_platform.ts @@ -1,4 +1,4 @@ ---- src/vs/base/common/platform.ts.orig 2024-09-04 12:53:09 UTC +--- src/vs/base/common/platform.ts.orig 2025-08-06 20:09:28 UTC +++ src/vs/base/common/platform.ts @@ -74,7 +74,7 @@ if (typeof nodeProcess === 'object') { if (typeof nodeProcess === 'object') { @@ -8,7 +8,7 @@ + _isLinux = (nodeProcess.platform === 'linux' || nodeProcess.platform === 'freebsd'); _isLinuxSnap = _isLinux && !!nodeProcess.env['SNAP'] && !!nodeProcess.env['SNAP_REVISION']; _isElectron = isElectronProcess; - _isCI = !!nodeProcess.env['CI'] || !!nodeProcess.env['BUILD_ARTIFACTSTAGINGDIRECTORY']; + _isCI = !!nodeProcess.env['CI'] || !!nodeProcess.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] || !!nodeProcess.env['GITHUB_WORKSPACE']; @@ -100,7 +100,7 @@ else if (typeof navigator === 'object' && !isElectronR _isWindows = _userAgent.indexOf('Windows') >= 0; _isMacintosh = _userAgent.indexOf('Macintosh') >= 0; diff --git a/editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts b/editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts new file mode 100644 index 000000000000..b10a1adb8f06 --- /dev/null +++ b/editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts @@ -0,0 +1,47 @@ +https://github.com/eclipse/openvsx/issues/543 +https://github.com/termux/termux-packages/issues/24739 +https://github.com/termux/termux-packages/pull/24757 + +--- src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts.orig 2025-08-20 15:13:53 UTC ++++ src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts +@@ -35,7 +35,7 @@ declare module vsceSign { + } + + declare module vsceSign { +- export function verify(vsixFilePath: string, signatureArchiveFilePath: string, verbose: boolean): Promise<ExtensionSignatureVerificationResult>; ++ export function verify(vsixFilePath: string, signatureArchiveFilePath: string, verbose: boolean): Promise<boolean>; + } + + /** +@@ -67,7 +67,7 @@ export class ExtensionSignatureVerificationService imp + } + + private async resolveVsceSign(): Promise<typeof vsceSign> { +- const mod = '@vscode/vsce-sign'; ++ const mod = 'node-ovsx-sign'; + return import(mod); + } + +@@ -87,7 +87,21 @@ export class ExtensionSignatureVerificationService imp + + try { + this.logService.trace(`Verifying extension signature for ${extensionId}...`); +- result = await module.verify(vsixFilePath, signatureArchiveFilePath, this.logService.getLevel() === LogLevel.Trace); ++ let isSignatureValid = ++ await module.verify(vsixFilePath, signatureArchiveFilePath, this.logService.getLevel() === LogLevel.Trace); ++ if (isSignatureValid) { ++ result = { ++ code: ExtensionSignatureVerificationCode.Success, ++ didExecute: true, ++ output: "The extension signature is valid." ++ }; ++ } else { ++ result = { ++ code: ExtensionSignatureVerificationCode.SignatureIsNotValid, ++ didExecute: true, ++ output: "The extension signature is invalid." ++ }; ++ } + } catch (e) { + result = { + code: ExtensionSignatureVerificationCode.UnknownError, diff --git a/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts index efeed8cb2bfd..d31d73e874d3 100644 --- a/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts +++ b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts @@ -1,6 +1,6 @@ ---- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-07-09 22:00:36 UTC +--- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-08-06 20:09:28 UTC +++ src/vs/workbench/services/actions/common/menusExtensionPoint.ts -@@ -1174,7 +1174,10 @@ class CommandsTableRenderer extends Disposable impleme +@@ -1172,7 +1172,10 @@ class CommandsTableRenderer extends Disposable impleme switch (platform) { case 'win32': key = rawKeyBinding.win; break; diff --git a/editors/vscode/files/patch-test_automation_src_electron.ts b/editors/vscode/files/patch-test_automation_src_electron.ts index 5952d2a91663..e3e4afbe21d0 100644 --- a/editors/vscode/files/patch-test_automation_src_electron.ts +++ b/editors/vscode/files/patch-test_automation_src_electron.ts @@ -1,6 +1,6 @@ ---- test/automation/src/electron.ts.orig 2025-06-11 13:47:56 UTC +--- test/automation/src/electron.ts.orig 2025-08-06 20:09:28 UTC +++ test/automation/src/electron.ts -@@ -85,6 +85,7 @@ export function getDevElectronPath(): string { +@@ -86,6 +86,7 @@ export function getDevElectronPath(): string { case 'darwin': return join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron'); case 'linux': @@ -8,7 +8,7 @@ return join(buildPath, 'electron', `${product.applicationName}`); case 'win32': return join(buildPath, 'electron', `${product.nameShort}.exe`); -@@ -97,7 +98,8 @@ export function getBuildElectronPath(root: string): st +@@ -98,7 +99,8 @@ export function getBuildElectronPath(root: string): st switch (process.platform) { case 'darwin': return join(root, 'Contents', 'MacOS', 'Electron'); |