diff --git a/Cargo.lock b/Cargo.lock index b4f5e3be104..8407288a3a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9325,7 +9325,7 @@ dependencies = [ "toml 0.8.23", "tufaceous-artifact 0.2.0", "uuid", - "zip 4.6.1", + "zip 9.0.0", ] [[package]] @@ -9623,7 +9623,7 @@ dependencies = [ "url", "usdt 0.5.0", "uuid", - "zip 4.6.1", + "zip 9.0.0", ] [[package]] @@ -9773,7 +9773,7 @@ dependencies = [ "unicode-width 0.1.14", "url", "uuid", - "zip 4.6.1", + "zip 9.0.0", ] [[package]] @@ -10097,7 +10097,7 @@ dependencies = [ "x509-cert", "zeroize", "zfs-test-harness", - "zip 4.6.1", + "zip 9.0.0", "zone", ] @@ -10351,6 +10351,7 @@ dependencies = [ "zerovec", "zip 4.6.1", "zip 8.6.0", + "zip 9.0.0", ] [[package]] @@ -14973,7 +14974,7 @@ dependencies = [ "thiserror 2.0.18", "tokio", "zfs-test-harness", - "zip 4.6.1", + "zip 9.0.0", "zstd", ] @@ -15758,7 +15759,7 @@ dependencies = [ "tokio", "tokio-util", "uuid", - "zip 4.6.1", + "zip 9.0.0", "zstd", ] @@ -19232,7 +19233,6 @@ dependencies = [ "crc32fast", "flate2", "indexmap 2.14.0", - "jiff", "memchr", "zopfli", ] @@ -19252,6 +19252,22 @@ dependencies = [ "zopfli", ] +[[package]] +name = "zip" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711e8c9646791c49b7eb799a19c4ae70a9b8372ddc6a1fa4778defd1e2aa5d5e" +dependencies = [ + "bzip2 0.6.1", + "crc32fast", + "flate2", + "indexmap 2.14.0", + "jiff", + "memchr", + "typed-path 0.12.3", + "zopfli", +] + [[package]] name = "zlib-rs" version = "0.6.2" diff --git a/Cargo.toml b/Cargo.toml index 4c99ccbbbf8..94bf68c4fe8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -929,7 +929,7 @@ xshell = "0.2.7" zerocopy = "0.8.26" zeroize = { version = "1.8.1", features = ["zeroize_derive", "serde", "std"] } zfs-test-harness = { path = "sled-storage/zfs-test-harness" } -zip = { version = "4.2.0", default-features = false, features = ["deflate","bzip2"] } +zip = { version = "9.0.0", default-features = false, features = ["deflate","bzip2"] } zone = { version = "0.3.1", default-features = false, features = ["async"] } zstd = { version = "0.13.3", default-features = false } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index dd614babfdc..32fcb2f82a3 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -184,8 +184,9 @@ zerofrom = { version = "0.1.6", default-features = false, features = ["alloc", " zeroize = { version = "1.9.0", features = ["aarch64", "serde", "std", "zeroize_derive"] } zerotrie = { version = "0.2.5", default-features = false, features = ["alloc", "yoke", "zerofrom"] } zerovec = { version = "0.11.9", default-features = false, features = ["alloc", "derive", "yoke"] } -zip-164d15cefe24d7eb = { package = "zip", version = "4.6.1", default-features = false, features = ["bzip2", "deflate", "jiff-02"] } +zip-164d15cefe24d7eb = { package = "zip", version = "4.6.1", default-features = false, features = ["bzip2", "deflate"] } zip-181b0d20215bb231 = { package = "zip", version = "8.6.0", default-features = false, features = ["bzip2", "deflate"] } +zip-5c5a4fb5e9d4273b = { package = "zip", version = "9.0.0", default-features = false, features = ["bzip2", "deflate", "jiff-02"] } [build-dependencies] ahash = { version = "0.8.12" } @@ -362,8 +363,9 @@ zerofrom = { version = "0.1.6", default-features = false, features = ["alloc", " zeroize = { version = "1.9.0", features = ["aarch64", "serde", "std", "zeroize_derive"] } zerotrie = { version = "0.2.5", default-features = false, features = ["alloc", "yoke", "zerofrom"] } zerovec = { version = "0.11.9", default-features = false, features = ["alloc", "derive", "yoke"] } -zip-164d15cefe24d7eb = { package = "zip", version = "4.6.1", default-features = false, features = ["bzip2", "deflate", "jiff-02"] } +zip-164d15cefe24d7eb = { package = "zip", version = "4.6.1", default-features = false, features = ["bzip2", "deflate"] } zip-181b0d20215bb231 = { package = "zip", version = "8.6.0", default-features = false, features = ["bzip2", "deflate"] } +zip-5c5a4fb5e9d4273b = { package = "zip", version = "9.0.0", default-features = false, features = ["bzip2", "deflate", "jiff-02"] } [target.x86_64-unknown-linux-gnu.dependencies] cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }