Skip to content

Commit e7fabd2

Browse files
authored
[36.0.x] Backports for security fixes (bytecodealliance#14178)
* Update cap-std dependencies * Temporarily disable gating on wasi-nn testing (bytecodealliance#14000) While bytecodealliance#13892 is in the works this disables gating on wasi-nn test results. This helps resolve what looks to be ~5-10 spurious failures per day.
1 parent f65ae51 commit e7fabd2

5 files changed

Lines changed: 42 additions & 36 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,7 @@ jobs:
11271127
- test_capi
11281128
- test_debug_dwarf
11291129
- test_fuzzing
1130-
- test_wasi_nn
1130+
# - test_wasi_nn
11311131
- test_nightly
11321132
- build
11331133
- rustfmt

Cargo.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,12 @@ regalloc2 = "0.12.2"
311311

312312
# cap-std family:
313313
target-lexicon = "0.13.0"
314-
cap-std = "3.4.4"
315-
cap-rand = { version = "3.4.4", features = ["small_rng"] }
316-
cap-fs-ext = "3.4.4"
317-
cap-net-ext = "3.4.4"
318-
cap-time-ext = "3.4.4"
319-
cap-tempfile = "3.4.4"
314+
cap-std = "3.4.6"
315+
cap-rand = { version = "3.4.6", features = ["small_rng"] }
316+
cap-fs-ext = "3.4.6"
317+
cap-net-ext = "3.4.6"
318+
cap-time-ext = "3.4.6"
319+
cap-tempfile = "3.4.6"
320320
fs-set-times = "0.20.1"
321321
system-interface = { version = "0.27.1", features = ["cap_std_impls"] }
322322
io-lifetimes = { version = "2.0.3", default-features = false }

supply-chain/audits.toml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4668,31 +4668,37 @@ end = "2025-12-05"
46684668
criteria = "safe-to-deploy"
46694669
user-id = 6825 # Dan Gohman (sunfishcode)
46704670
start = "2020-12-11"
4671-
end = "2024-07-14"
4671+
end = "2027-08-20"
46724672

46734673
[[trusted.cap-net-ext]]
46744674
criteria = "safe-to-deploy"
46754675
user-id = 6825 # Dan Gohman (sunfishcode)
46764676
start = "2020-12-11"
46774677
end = "2024-07-14"
46784678

4679+
[[trusted.cap-net-ext]]
4680+
criteria = "safe-to-deploy"
4681+
user-id = 6825 # Dan Gohman (sunfishcode)
4682+
start = "2023-04-07"
4683+
end = "2027-08-20"
4684+
46794685
[[trusted.cap-primitives]]
46804686
criteria = "safe-to-deploy"
46814687
user-id = 6825 # Dan Gohman (sunfishcode)
46824688
start = "2020-08-07"
4683-
end = "2024-07-14"
4689+
end = "2027-08-20"
46844690

46854691
[[trusted.cap-rand]]
46864692
criteria = "safe-to-deploy"
46874693
user-id = 6825 # Dan Gohman (sunfishcode)
46884694
start = "2020-09-24"
4689-
end = "2024-07-14"
4695+
end = "2027-08-20"
46904696

46914697
[[trusted.cap-std]]
46924698
criteria = "safe-to-deploy"
46934699
user-id = 6825 # Dan Gohman (sunfishcode)
46944700
start = "2020-06-25"
4695-
end = "2024-07-14"
4701+
end = "2027-08-20"
46964702

46974703
[[trusted.cap-tempfile]]
46984704
criteria = "safe-to-deploy"
@@ -4704,7 +4710,7 @@ end = "2024-07-14"
47044710
criteria = "safe-to-deploy"
47054711
user-id = 6825 # Dan Gohman (sunfishcode)
47064712
start = "2020-09-21"
4707-
end = "2024-07-14"
4713+
end = "2027-08-20"
47084714

47094715
[[trusted.cc]]
47104716
criteria = "safe-to-deploy"

supply-chain/imports.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3786,43 +3786,43 @@ user-login = "alexcrichton"
37863786
user-name = "Alex Crichton"
37873787

37883788
[[publisher.cap-fs-ext]]
3789-
version = "3.2.0"
3790-
when = "2024-07-08"
3789+
version = "3.4.6"
3790+
when = "2026-08-20"
37913791
user-id = 6825
37923792
user-login = "sunfishcode"
37933793
user-name = "Dan Gohman"
37943794

37953795
[[publisher.cap-net-ext]]
3796-
version = "3.2.0"
3797-
when = "2024-07-08"
3796+
version = "3.4.6"
3797+
when = "2026-08-20"
37983798
user-id = 6825
37993799
user-login = "sunfishcode"
38003800
user-name = "Dan Gohman"
38013801

38023802
[[publisher.cap-primitives]]
3803-
version = "3.2.0"
3804-
when = "2024-07-08"
3803+
version = "3.4.6"
3804+
when = "2026-08-20"
38053805
user-id = 6825
38063806
user-login = "sunfishcode"
38073807
user-name = "Dan Gohman"
38083808

38093809
[[publisher.cap-rand]]
3810-
version = "3.2.0"
3811-
when = "2024-07-08"
3810+
version = "3.4.6"
3811+
when = "2026-08-20"
38123812
user-id = 6825
38133813
user-login = "sunfishcode"
38143814
user-name = "Dan Gohman"
38153815

38163816
[[publisher.cap-std]]
3817-
version = "3.2.0"
3818-
when = "2024-07-08"
3817+
version = "3.4.6"
3818+
when = "2026-08-20"
38193819
user-id = 6825
38203820
user-login = "sunfishcode"
38213821
user-name = "Dan Gohman"
38223822

38233823
[[publisher.cap-time-ext]]
3824-
version = "3.2.0"
3825-
when = "2024-07-08"
3824+
version = "3.4.6"
3825+
when = "2026-08-20"
38263826
user-id = 6825
38273827
user-login = "sunfishcode"
38283828
user-name = "Dan Gohman"

0 commit comments

Comments
 (0)