From c9ad753672c57e895475f5e0b71d4262c8664cfc Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Sun, 1 Nov 2026 19:07:04 -0800 Subject: [PATCH] Bump zip from 7 to 9.0.5 (#802) Co-authored-by: Claude Opus 5.5 --- Cargo.lock | 171 +++++++++++++-------- crates-cli/yaak-cli/Cargo.toml | 2 +- crates-cli/yaak-cli/src/commands/plugin.rs | 2 +- crates/yaak-plugins/Cargo.toml | 2 +- 4 files changed, 106 insertions(+), 71 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a52106af9..a286d1852 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -32,13 +32,13 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.4" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +checksum = "35f0f96ce78e38c3dc6d8948aa8163d06385be74000f3c7a95bf1eef35d3ea32" dependencies = [ - "cfg-if", - "cipher 0.4.4", - "cpufeatures 0.2.17", + "cipher 0.5.2", + "cpubits", + "cpufeatures 0.3.1", ] [[package]] @@ -653,6 +653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" dependencies = [ "hybrid-array", + "zeroize", ] [[package]] @@ -1193,8 +1194,8 @@ dependencies = [ "compression-core", "flate2", "memchr", - "zstd 0.14.0", - "zstd-safe 8.0.0", + "zstd", + "zstd-safe", ] [[package]] @@ -1282,18 +1283,21 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "constant_time_eq" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" - [[package]] name = "constant_time_eq" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b" +[[package]] +name = "constant_time_eq" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eb6feb175df65d0a3ccd3e73484e940d0ac664e8034f0519fd49a93db3071d9" +dependencies = [ + "rustversion", +] + [[package]] name = "convert_case" version = "0.4.0" @@ -1449,6 +1453,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "417bef24afe1460300965a25ff4a24b8b45ad011948302ec221e8a0a81eb2c79" +[[package]] +name = "cpubits" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b85f9c39137c3a891689859392b1bd49812121d0d61c9caf00d46ed5ce06ae" + [[package]] name = "cpufeatures" version = "0.2.17" @@ -1469,9 +1479,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "5f97d3416d5337d15c4b0d78c8c91df922ca143f57ec20e2d1c188333047ef04" dependencies = [ "cfg-if", ] @@ -1810,9 +1820,9 @@ dependencies = [ [[package]] name = "deflate64" -version = "0.1.9" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" +checksum = "ac6b926516df9c60bfa16e107b21086399f8285a44ca9711344b9e553c5146e2" [[package]] name = "defmt" @@ -1950,6 +1960,8 @@ dependencies = [ "block-buffer 0.12.1", "const-oid", "crypto-common 0.2.2", + "ctutils", + "zeroize", ] [[package]] @@ -2908,9 +2920,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi 6.0.0", "rand_core 0.10.1", + "wasm-bindgen", ] [[package]] @@ -3197,6 +3211,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "hmac" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" +dependencies = [ + "digest 0.11.3", +] + [[package]] name = "html5ever" version = "0.29.1" @@ -3714,7 +3737,7 @@ dependencies = [ "handlebars", "lazy_static 1.5.0", "libc", - "nix", + "nix 0.23.2", "serde", "serde_derive", ] @@ -4200,11 +4223,11 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "lzma-rust2" -version = "0.15.8" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e20f57f9918e5bd7bc58c22cdd70a6afc7375d4dd9683af5f2b34bd3d2bba619" +checksum = "7277c9742229dc25243236d578b6471a798c554512c6f6a04365ec2e87c2a3bb" dependencies = [ - "sha2", + "sha2 0.11.1", ] [[package]] @@ -4582,6 +4605,18 @@ dependencies = [ "memoffset 0.6.5", ] +[[package]] +name = "nix" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" +dependencies = [ + "bitflags 2.11.0", + "cfg-if", + "cfg_aliases", + "libc", +] + [[package]] name = "nodejs-built-in-modules" version = "1.0.0" @@ -5717,7 +5752,7 @@ dependencies = [ "cipher 0.4.4", "des", "getrandom 0.2.16", - "hmac", + "hmac 0.12.1", "lazy_static 1.5.0", "rc2", "sha1 0.10.7", @@ -5808,12 +5843,12 @@ checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] name = "pbkdf2" -version = "0.12.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +checksum = "112d82ceb8c5bf524d9af484d4e4970c9fd5a0cc15ba14ad93dccd28873b0629" dependencies = [ - "digest 0.10.7", - "hmac", + "digest 0.11.3", + "hmac 0.13.0", ] [[package]] @@ -6260,9 +6295,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppmd-rust" -version = "1.4.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9219bcb9d7aca6b2f63c83cf100cf78bcd619ac46e6ecbd0dd90869a39345d" +checksum = "cd4acc8d264ea385db64ccfdcdfd5909ee9eda0975666723d59f3bfec80b3611" [[package]] name = "ppv-lite86" @@ -8105,6 +8140,17 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha2" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.1", + "digest 0.11.3", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -8734,7 +8780,7 @@ dependencies = [ "semver", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "syn 2.0.119", "tauri-utils 2.9.1", "thiserror 2.0.21", @@ -9025,7 +9071,7 @@ dependencies = [ "raw-window-handle", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "tauri-runtime", "tauri-utils 2.9.1", "url", @@ -9287,6 +9333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134" dependencies = [ "deranged", + "js-sys", "libc", "num-conv", "num_threads", @@ -9854,6 +9901,12 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d" +[[package]] +name = "typed-path" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ec2755506471f54baf5e4bb5499d8e510cc1caf271270e778a736bd2d7336c" + [[package]] name = "typedmap" version = "0.6.0" @@ -11217,7 +11270,7 @@ dependencies = [ "once_cell", "percent-encoding", "raw-window-handle", - "sha2", + "sha2 0.10.9", "soup3", "tao-macros", "thiserror 2.0.21", @@ -11296,7 +11349,7 @@ dependencies = [ "md5", "rusqlite", "serde_json", - "sha2", + "sha2 0.10.9", "tempfile", "thiserror 2.0.21", "tokio", @@ -11436,7 +11489,7 @@ dependencies = [ "schemars 0.8.22", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "tempfile", "tokio", "walkdir", @@ -11452,7 +11505,7 @@ dependencies = [ "yaak-models", "yaak-plugins", "yaak-templates", - "zip 7.0.0", + "zip 9.0.5", ] [[package]] @@ -11623,7 +11676,7 @@ dependencies = [ "yaak-models", "yaak-templates", "yaak-tls", - "zstd 0.14.0", + "zstd", ] [[package]] @@ -11701,7 +11754,7 @@ dependencies = [ "sea-query-rusqlite", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "thiserror 2.0.21", "ts-rs", "urlencoding", @@ -11744,7 +11797,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "thiserror 2.0.21", "tokio", "tokio-tungstenite", @@ -11753,7 +11806,7 @@ dependencies = [ "yaak-crypto", "yaak-models", "yaak-templates", - "zip 7.0.0", + "zip 9.0.5", ] [[package]] @@ -12243,30 +12296,30 @@ dependencies = [ [[package]] name = "zip" -version = "7.0.0" +version = "9.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd8a47718a4ee5fe78e07667cd36f3de80e7c2bfe727c7074245ffc7303c037" +checksum = "6e04976da629d3b04204ba8105b396a193af8ad2583b2c79bfb3ab8af580a11e" dependencies = [ "aes", - "arbitrary", "bzip2", - "constant_time_eq 0.3.1", + "constant_time_eq 0.6.1", "crc32fast", "deflate64", "flate2", - "generic-array", - "getrandom 0.3.4", - "hmac", + "getrandom 0.4.3", + "hmac 0.13.0", "indexmap 2.14.2", "lzma-rust2", "memchr", + "nix 0.31.3", "pbkdf2", "ppmd-rust", - "sha1 0.10.7", + "sha1 0.11.0", "time", + "typed-path", "zeroize", "zopfli", - "zstd 0.13.3", + "zstd", ] [[package]] @@ -12283,9 +12336,9 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "zopfli" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7" +checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249" dependencies = [ "bumpalo", "crc32fast", @@ -12293,31 +12346,13 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "zstd" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" -dependencies = [ - "zstd-safe 7.2.4", -] - [[package]] name = "zstd" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf06bd8162af0734b344780deb55b42a2429ae430870d13fcc12f238e880fe6e" dependencies = [ - "zstd-safe 8.0.0", -] - -[[package]] -name = "zstd-safe" -version = "7.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" -dependencies = [ - "zstd-sys", + "zstd-safe", ] [[package]] diff --git a/crates-cli/yaak-cli/Cargo.toml b/crates-cli/yaak-cli/Cargo.toml index 4a7e59719..46b484b3d 100644 --- a/crates-cli/yaak-cli/Cargo.toml +++ b/crates-cli/yaak-cli/Cargo.toml @@ -42,7 +42,7 @@ tokio = { workspace = true, features = [ ] } walkdir = "2" webbrowser = "1" -zip = "7" +zip = "9.0.5" yaak = { workspace = true } yaak-api = { workspace = true } yaak-common = { workspace = true } diff --git a/crates-cli/yaak-cli/src/commands/plugin.rs b/crates-cli/yaak-cli/src/commands/plugin.rs index 6da2ca3bb..9aeb73c40 100644 --- a/crates-cli/yaak-cli/src/commands/plugin.rs +++ b/crates-cli/yaak-cli/src/commands/plugin.rs @@ -850,7 +850,7 @@ mod tests { let mut names = HashSet::new(); for i in 0..zip.len() { let file = zip.by_index(i).expect("zip entry"); - names.insert(file.name().to_string()); + names.insert(file.name().expect("zip entry name").to_string()); } assert!(names.contains("README.md")); diff --git a/crates/yaak-plugins/Cargo.toml b/crates/yaak-plugins/Cargo.toml index 462a5022b..037265720 100644 --- a/crates/yaak-plugins/Cargo.toml +++ b/crates/yaak-plugins/Cargo.toml @@ -27,4 +27,4 @@ yaak-common = { workspace = true } yaak-crypto = { workspace = true } yaak-models = { workspace = true } yaak-templates = { workspace = true } -zip = "7" +zip = "9.0.5"