From ef73d56a23e22f146c6e9ad8bff70719105a0fd1 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Sun, 25 Jun 2023 22:35:12 +0200 Subject: [PATCH 1/2] fix(bundler): Enable zip's deflate feature flag --- tooling/bundler/Cargo.toml | 2 +- tooling/cli/Cargo.lock | 41 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml index cbf4e1853199..3e6e6bcf7ff8 100644 --- a/tooling/bundler/Cargo.toml +++ b/tooling/bundler/Cargo.toml @@ -38,7 +38,7 @@ hex = "0.4" semver = "1" sha1 = "0.10" sha2 = "0.10" -zip = { version = "0.6", default-features = false } +zip = { version = "0.6", default-features = false, features = ["deflate"] } dunce = "1" [target."cfg(target_os = \"windows\")".dependencies] diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index 8e55ab74d7d5..c2dc1b0472e8 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -3188,14 +3188,24 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" dependencies = [ "log", "ring", + "rustls-webpki", "sct", - "webpki", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", ] [[package]] @@ -4467,18 +4477,18 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "ureq" -version = "2.6.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" dependencies = [ - "base64 0.13.1", + "base64 0.21.2", "flate2", "log", "native-tls", "once_cell", "rustls", + "rustls-webpki", "url", - "webpki", "webpki-roots", ] @@ -4692,23 +4702,13 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "webpki", + "rustls-webpki", ] [[package]] @@ -5051,6 +5051,7 @@ dependencies = [ "byteorder", "crc32fast", "crossbeam-utils", + "flate2", ] [[package]] From b00649151ac732e77635d6f9fb20145b8e420e0d Mon Sep 17 00:00:00 2001 From: FabianLars Date: Mon, 26 Jun 2023 13:54:50 +0200 Subject: [PATCH 2/2] changefile --- .changes/bundler-zip-deflate.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changes/bundler-zip-deflate.md diff --git a/.changes/bundler-zip-deflate.md b/.changes/bundler-zip-deflate.md new file mode 100644 index 000000000000..a6cf01db840c --- /dev/null +++ b/.changes/bundler-zip-deflate.md @@ -0,0 +1,5 @@ +--- +'tauri-bundler': 'patch:bug' +--- + +Enable `zip`'s `deflate` feature flag to fix issues when downloading nsis and wix tools.