From 806404e96e535be8c9878e90058c18fefd0ea64e Mon Sep 17 00:00:00 2001 From: Tony <68118705+Legend-Master@users.noreply.github.com> Date: Thu, 16 May 2024 20:43:59 +0800 Subject: [PATCH] chore(updater): disable zip crate default features (#1329) * Only use deflate feature from zip crate * Add change file * Disable all zip crate features --- .changes/updater-zip-no-default-features.md | 5 + Cargo.lock | 143 +------------------- plugins/updater/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 143 deletions(-) create mode 100644 .changes/updater-zip-no-default-features.md diff --git a/.changes/updater-zip-no-default-features.md b/.changes/updater-zip-no-default-features.md new file mode 100644 index 00000000..9d8aa3be --- /dev/null +++ b/.changes/updater-zip-no-default-features.md @@ -0,0 +1,5 @@ +--- +"updater": "patch" +--- + +Disable zip crate default features diff --git a/Cargo.lock b/Cargo.lock index 32519b24..6ebd6415 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -848,27 +848,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "cairo-rs" version = "0.18.5" @@ -941,11 +920,6 @@ name = "cc" version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" -dependencies = [ - "jobserver", - "libc", - "once_cell", -] [[package]] name = "cesu8" @@ -1093,15 +1067,6 @@ dependencies = [ "error-code", ] -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - [[package]] name = "cocoa" version = "0.25.0" @@ -1515,12 +1480,6 @@ dependencies = [ "tauri-plugin-deep-link", ] -[[package]] -name = "deflate64" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" - [[package]] name = "der" version = "0.7.9" @@ -2007,7 +1966,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", - "libz-ng-sys", "miniz_oxide", ] @@ -3017,7 +2975,7 @@ dependencies = [ "generic-array", "getrandom 0.2.15", "hmac", - "pbkdf2 0.11.0", + "pbkdf2", "serde", "sha2 0.10.8", "unicode-normalization", @@ -3160,15 +3118,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" -[[package]] -name = "jobserver" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" -dependencies = [ - "libc", -] - [[package]] name = "jpeg-decoder" version = "0.3.1" @@ -3366,16 +3315,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "libz-ng-sys" -version = "1.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5" -dependencies = [ - "cmake", - "libc", -] - [[package]] name = "line-wrap" version = "0.2.0" @@ -3422,16 +3361,6 @@ dependencies = [ "tracing-subscriber", ] -[[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 = "mac" version = "0.1.1" @@ -4130,16 +4059,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest 0.10.7", - "hmac", -] - [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -7221,12 +7140,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - [[package]] name = "typenum" version = "1.17.0" @@ -8396,66 +8309,12 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c700ea425e148de30c29c580c1f9508b93ca57ad31c9f4e96b83c194c37a7a8f" dependencies = [ - "aes 0.8.4", "arbitrary", - "bzip2", - "constant_time_eq 0.3.0", "crc32fast", "crossbeam-utils", - "deflate64", "displaydoc", - "flate2", - "hmac", "indexmap 2.2.6", - "lzma-rs", - "pbkdf2 0.12.2", - "rand 0.8.5", - "sha1", "thiserror", - "time", - "zeroize", - "zopfli", - "zstd", -] - -[[package]] -name = "zopfli" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1f48f3508a3a3f2faee01629564400bc12260f6214a056d06a3aaaa6ef0736" -dependencies = [ - "crc32fast", - "log", - "simd-adler32", - "typed-arena", -] - -[[package]] -name = "zstd" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" -dependencies = [ - "cc", - "pkg-config", ] [[package]] diff --git a/plugins/updater/Cargo.toml b/plugins/updater/Cargo.toml index c4e80e51..dfad44ad 100644 --- a/plugins/updater/Cargo.toml +++ b/plugins/updater/Cargo.toml @@ -34,7 +34,7 @@ tempfile = "3" infer = "0.15" [target."cfg(target_os = \"windows\")".dependencies] -zip = { version = "1", optional = true } +zip = { version = "1", default-features = false, optional = true } windows-sys = { version = "0.52.0", features = [ "Win32_Foundation", "Win32_UI_WindowsAndMessaging" ] } [target."cfg(target_os = \"linux\")".dependencies]