mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-19 20:13:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

dev-util/fnm: add 1.37.1, drop 1.35.1

Browse Source 
Closes: https://bugs.gentoo.org/937363
Signed-off-by: Alexey Zapparov <alexey@zapparov.com>
This commit is contained in:
Alexey Zapparov
2024-08-18 05:45:05 +02:00
parent b3d248dcce
commit 8c44795a94
5 changed files with 410 additions and 2579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
dev-util/fnm/files/fnm-1.35.1-remove-deprecated-time-dependency.patch
View File

@@ -1,81 +0,0 @@
Remove vulnerable time-0.1.x chrono dependency
https://github.com/Schniz/fnm/pull/884
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -275,7 +275,6 @@ dependencies = [
"js-sys",
"num-traits",
"serde",
- "time 0.1.45",
"wasm-bindgen",
"winapi",
]
@@ -737,7 +736,7 @@ checksum = "be4136b2a15dd319360be1c07d99
dependencies = [
"cfg-if",
"libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
]
[[package]]
@@ -1109,7 +1108,7 @@ source = "registry+https://github.com/ru
checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
"windows-sys 0.48.0",
]
@@ -1755,17 +1754,6 @@ dependencies = [
[[package]]
name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
-name = "time"
version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
@@ -1970,12 +1958,6 @@ dependencies = [
[[package]]
name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
@@ -2287,7 +2269,7 @@ dependencies = [
"hmac",
"pbkdf2",
"sha1",
- "time 0.3.22",
+ "time",
"zstd",
]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ description = "Fast and simple Node.js v
serde = { version = "1.0.166", features = ["derive"] }
clap = { version = "4.3.10", features = ["derive", "env"] }
serde_json = "1.0.100"
-chrono = { version = "0.4.26", features = ["serde"] }
+chrono = { version = "0.4.24", default-features = false, features = ["clock", "serde", "std", "wasmbind"] }
tar = "0.4.38"
xz2 = "0.1.7"
node-semver = "2.1.0"

2212
dev-util/fnm/files/fnm-1.35.1-ring17.patch
View File

File diff suppressed because it is too large Load Diff

72
dev-util/fnm/files/fnm-1.35.1-skip-windows-related-tests.patch → dev-util/fnm/files/fnm-1.37.1-skip-windows-related-tests.patch
View File

@@ -1,4 +1,6 @@
Skip Windows-related tests
diff --git a/e2e/aliases.test.ts b/e2e/aliases.test.ts
index e7dce18..6c437c2 100644
--- a/e2e/aliases.test.ts
+++ b/e2e/aliases.test.ts
@@ -1,5 +1,5 @@
@@ -8,7 +10,7 @@ Skip Windows-related tests
import describe from "./describe.js"
import { writeFile } from "node:fs/promises"
import path from "node:path"
@@ -7,7 +7,7 @@ import testCwd from "./shellcode/test-cw
@@ -7,7 +7,7 @@ import testCwd from "./shellcode/test-cwd.js"
import getStderr from "./shellcode/get-stderr.js"
import testNodeVersion from "./shellcode/test-node-version.js"
@@ -17,6 +19,8 @@ Skip Windows-related tests
describe(shell, () => {
test(`allows to install an lts if version missing`, async () => {
await writeFile(path.join(testCwd(), ".node-version"), "lts/*")
diff --git a/e2e/basic.test.ts b/e2e/basic.test.ts
index 17040d0..b64a717 100644
--- a/e2e/basic.test.ts
+++ b/e2e/basic.test.ts
@@ -1,12 +1,12 @@
@@ -34,6 +38,8 @@ Skip Windows-related tests
describe(shell, () => {
test(`basic usage`, async () => {
await script(shell)
diff --git a/e2e/corepack.test.ts b/e2e/corepack.test.ts
index 6917ea1..a3503e9 100644
--- a/e2e/corepack.test.ts
+++ b/e2e/corepack.test.ts
@@ -1,6 +1,6 @@
@@ -53,6 +59,8 @@ Skip Windows-related tests
describe(shell, () => {
test(`installs corepack`, async () => {
const cwd = testCwd()
diff --git a/e2e/current.test.ts b/e2e/current.test.ts
index 29710c0..430de0f 100644
--- a/e2e/current.test.ts
+++ b/e2e/current.test.ts
@@ -1,8 +1,8 @@
@@ -66,6 +74,8 @@ Skip Windows-related tests
describe(shell, () => {
test(`current returns the current Node.js version set in fnm`, async () => {
await script(shell)
diff --git a/e2e/env.test.ts b/e2e/env.test.ts
index 4c056c8..1ce5a62 100644
--- a/e2e/env.test.ts
+++ b/e2e/env.test.ts
@@ -1,11 +1,11 @@
@@ -82,6 +92,8 @@ Skip Windows-related tests
describe(shell, () => {
test(`outputs json`, async () => {
const filename = `file.json`
diff --git a/e2e/exec.test.ts b/e2e/exec.test.ts
index 4babaad..6d93b59 100644
--- a/e2e/exec.test.ts
+++ b/e2e/exec.test.ts
@@ -1,11 +1,11 @@
@@ -98,6 +110,8 @@ Skip Windows-related tests
describe(shell, () => {
test("`exec` usage", async () => {
await fs.writeFile(path.join(testCwd(), ".nvmrc"), "v8.10.0")
diff --git a/e2e/existing-installation.test.ts b/e2e/existing-installation.test.ts
index 2fb0f90..17140da 100644
--- a/e2e/existing-installation.test.ts
+++ b/e2e/existing-installation.test.ts
@@ -1,9 +1,9 @@
@@ -112,6 +126,8 @@ Skip Windows-related tests
describe(shell, () => {
test(`warns about an existing installation`, async () => {
await script(shell)
diff --git a/e2e/latest-lts.test.ts b/e2e/latest-lts.test.ts
index 83bebb0..1632b0a 100644
--- a/e2e/latest-lts.test.ts
+++ b/e2e/latest-lts.test.ts
@@ -1,8 +1,8 @@
@@ -125,6 +141,23 @@ Skip Windows-related tests
describe(shell, () => {
test(`installs latest lts`, async () => {
await script(shell)
diff --git a/e2e/latest.test.ts b/e2e/latest.test.ts
index 8d2a0fd..2ea4a15 100644
--- a/e2e/latest.test.ts
+++ b/e2e/latest.test.ts
@@ -1,8 +1,8 @@
import { script } from "./shellcode/script.js"
-import { Bash, Fish, PowerShell, Zsh } from "./shellcode/shells.js"
+import { Bash, Fish, Zsh } from "./shellcode/shells.js"
import describe from "./describe.js"
-for (const shell of [Bash, Zsh, Fish, PowerShell]) {
+for (const shell of [Bash, Zsh, Fish]) {
describe(shell, () => {
test(`installs latest`, async () => {
await script(shell)
diff --git a/e2e/log-level.test.ts b/e2e/log-level.test.ts
index f7329c8..2b9f9f7 100644
--- a/e2e/log-level.test.ts
+++ b/e2e/log-level.test.ts
@@ -1,9 +1,9 @@
@@ -139,6 +172,8 @@ Skip Windows-related tests
describe(shell, () => {
test(`"quiet" log level`, async () => {
await script(shell)
diff --git a/e2e/multishell.test.ts b/e2e/multishell.test.ts
index 60f9007..b1b54de 100644
--- a/e2e/multishell.test.ts
+++ b/e2e/multishell.test.ts
@@ -1,9 +1,9 @@
@@ -153,6 +188,8 @@ Skip Windows-related tests
describe(shell, () => {
test(`multishell changes don't affect parent`, async () => {
await script(shell)
diff --git a/e2e/nvmrc-lts.test.ts b/e2e/nvmrc-lts.test.ts
index be5a18d..43c82e1 100644
--- a/e2e/nvmrc-lts.test.ts
+++ b/e2e/nvmrc-lts.test.ts
@@ -1,11 +1,11 @@
@@ -169,6 +206,8 @@ Skip Windows-related tests
describe(shell, () => {
test(`uses .nvmrc with lts definition`, async () => {
await fs.writeFile(path.join(testCwd(), ".nvmrc"), `lts/dubnium`)
diff --git a/e2e/system-node.test.ts b/e2e/system-node.test.ts
index 67fd535..7ca0b1c 100644
--- a/e2e/system-node.test.ts
+++ b/e2e/system-node.test.ts
@@ -1,12 +1,12 @@
@@ -186,6 +225,17 @@ Skip Windows-related tests
describe(shell, () => {
// latest bash breaks this as it seems. gotta find a solution.
const t = process.platform === "darwin" && shell === Bash ? test.skip : test
@@ -45,7 +45,7 @@ for (const shell of [Bash, Fish, PowerShell, WinCmd, Zsh]) {
async function writeCustomNode() {
const customNode = path.join(testBinDir(), "node")
- if (process.platform === "win32" && [WinCmd, PowerShell].includes(shell)) {
+ if (process.platform === "win32" && [WinCmd].includes(shell)) {
await fs.writeFile(customNode + ".cmd", "@echo custom")
} else {
await fs.writeFile(customNode, `#!/bin/bash\n\necho "custom"\n`)
diff --git a/e2e/uninstall.test.ts b/e2e/uninstall.test.ts
index 6726c3e..5d55ae2 100644
--- a/e2e/uninstall.test.ts
+++ b/e2e/uninstall.test.ts
@@ -1,8 +1,8 @@
@@ -199,3 +249,23 @@ Skip Windows-related tests
describe(shell, () => {
test(`uninstalls a version`, async () => {
await script(shell)
diff --git a/e2e/windows-scoop.test.ts b/e2e/windows-scoop.test.ts
index 5b62c48..0954e0a 100644
--- a/e2e/windows-scoop.test.ts
+++ b/e2e/windows-scoop.test.ts
@@ -1,5 +1,5 @@
import { script } from "./shellcode/script.js"
-import { Bash, Fish, PowerShell, WinCmd, Zsh } from "./shellcode/shells.js"
+import { Bash, Fish, Zsh } from "./shellcode/shells.js"
import testNodeVersion from "./shellcode/test-node-version.js"
import describe from "./describe.js"
import os from "node:os"
@@ -18,7 +18,7 @@ if (os.platform() !== "win32") {
])
})
- for (const shell of [Bash, Zsh, Fish, PowerShell, WinCmd]) {
+ for (const shell of [Bash, Zsh, Fish]) {
describe(shell, () => {
test(`scoop shims infer the shell`, async () => {
await script(shell)