From f80a946b0d5964a470e6db0871a47159df451fa4 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Sat, 6 Jul 2024 14:34:25 +0800 Subject: [PATCH] ksud: upgrade zip (#1859) --- userspace/ksud/Cargo.lock | 29 +++++++++++++++++++++++++++-- userspace/ksud/Cargo.toml | 6 ++++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/userspace/ksud/Cargo.lock b/userspace/ksud/Cargo.lock index 0ccca889799b..19f2118fbb01 100644 --- a/userspace/ksud/Cargo.lock +++ b/userspace/ksud/Cargo.lock @@ -377,6 +377,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.4.2" @@ -944,6 +959,16 @@ dependencies = [ "libc", ] +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "memchr" version = "2.7.2" @@ -1761,8 +1786,7 @@ dependencies = [ [[package]] name = "zip" version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39" +source = "git+https://github.com/zip-rs/zip2.git#d45bdccc6afbf5121b3a4668b67dfebbaa328cd8" dependencies = [ "arbitrary", "bzip2", @@ -1772,6 +1796,7 @@ dependencies = [ "displaydoc", "flate2", "indexmap", + "lzma-rs", "memchr", "thiserror", "time", diff --git a/userspace/ksud/Cargo.toml b/userspace/ksud/Cargo.toml index d7e86788bb0e..289805b3d130 100644 --- a/userspace/ksud/Cargo.toml +++ b/userspace/ksud/Cargo.toml @@ -10,12 +10,14 @@ rust-version = "1.77.2" anyhow = "1" clap = { version = "4", features = ["derive"] } const_format = "0.2" -zip = { version = "2", features = [ +zip = { git = "https://github.com/zip-rs/zip2.git", features = [ "deflate", "deflate64", "bzip2", "time", "zstd", + "lzma", + "xz", ], default-features = false } zip-extensions = "0.7" java-properties = "2" @@ -60,4 +62,4 @@ android_logger = "0.14" [profile.release] strip = true opt-level = "z" -lto = true \ No newline at end of file +lto = true