From 565be9ae4c577416545f6e74dd364064bb07e54d Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Tue, 8 Nov 2022 11:32:39 +1100
Subject: [PATCH] Switch back from binstall-zip to zip (#512)

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 Cargo.lock                 | 30 +++++++++++++++---------------
 crates/binstalk/Cargo.toml |  6 +-----
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e61d60bd..6f957d43 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -110,7 +110,6 @@ version = "0.4.1"
 dependencies = [
  "async-trait",
  "binstall-tar",
- "binstall-zip",
  "bytes",
  "bzip2",
  "cargo_toml",
@@ -148,6 +147,7 @@ dependencies = [
  "trust-dns-resolver",
  "url",
  "xz2",
+ "zip",
  "zstd",
 ]
 
@@ -162,20 +162,6 @@ dependencies = [
  "xattr",
 ]
 
-[[package]]
-name = "binstall-zip"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5eddcdebe8fe727d81b47734b3302ffa49a6fe50376fe6c52c609198c0709e5"
-dependencies = [
- "byteorder",
- "bzip2",
- "crc32fast",
- "crossbeam-utils",
- "flate2",
- "zstd",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -2562,6 +2548,20 @@ dependencies = [
  "lzma-sys",
 ]
 
+[[package]]
+name = "zip"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080"
+dependencies = [
+ "byteorder",
+ "bzip2",
+ "crc32fast",
+ "crossbeam-utils",
+ "flate2",
+ "zstd",
+]
+
 [[package]]
 name = "zstd"
 version = "0.11.2+zstd.1.5.2"
diff --git a/crates/binstalk/Cargo.toml b/crates/binstalk/Cargo.toml
index ed80c92f..50bbb1c5 100644
--- a/crates/binstalk/Cargo.toml
+++ b/crates/binstalk/Cargo.toml
@@ -54,17 +54,13 @@ trust-dns-resolver = { version = "0.21.2", optional = true, default-features = f
 url = { version = "2.3.1", features = ["serde"] }
 xz2 = "0.1.7"
 
-# Use a fork here since upstream has not published a new release for a long time
-# while many of its dependencies are updated.
-# Also becasue we need streaming extraction.
-#
 # Disable all features of zip except for features of compression algorithms:
 # Disabled features include:
 #  - aes-crypto: Enables decryption of files which were encrypted with AES, absolutely zero use for
 #    this crate.
 #  - time: Enables features using the [time](https://github.com/time-rs/time) crate,
 #    which is not used by this crate.
-zip = { package = "binstall-zip", version = "0.6.3", default-features = false, features = ["deflate", "bzip2", "zstd"] }
+zip = { version = "0.6.3", default-features = false, features = ["deflate", "bzip2", "zstd"] }
 
 # zstd is also depended by zip.
 # Since zip 0.6.3 depends on zstd 0.11, we also have to use 0.11 here,