From 6a98598a0b7b59e1b953c7b8ea892adc2693f390 Mon Sep 17 00:00:00 2001
From: Ofek Lev <ofekmeister@gmail.com>
Date: Sun, 26 May 2024 00:14:25 -0400
Subject: [PATCH] Use libz-ng

---
 .github/workflows/test.yml |  3 ++-
 Cargo.lock                 | 19 +++++++++++++++++++
 Cargo.toml                 | 12 ++++++------
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a8c6d2a..5e37bb5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -54,7 +54,8 @@ jobs:
           os: windows-2022
         # macOS
         - target: aarch64-apple-darwin
-          os: macos-12
+          os: macos-14
+          test: true
         - target: x86_64-apple-darwin
           os: macos-12
           test: true
diff --git a/Cargo.lock b/Cargo.lock
index 831a091..5d0d1f1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -789,6 +789,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "libz-sys"
+version = "1.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -996,6 +1008,7 @@ dependencies = [
  "fs4",
  "highway",
  "indicatif",
+ "libz-sys",
  "once_cell",
  "os_pipe",
  "rand",
@@ -1556,6 +1569,12 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
diff --git a/Cargo.toml b/Cargo.toml
index e422c7b..806ddb9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,10 +21,10 @@ os_pipe = "1.1.5"
 reqwest = { version = "0.12.4", features = ["blocking", "rustls-tls"], default-features = false }
 tar = "0.4.40"
 tempfile = "3.10.1"
-# Remove dependence on CMake by avoiding libz-ng-sys, see:
-# https://github.com/rust-lang/libz-sys/pull/174
-zip = { version = "2.1.0", features = ["aes-crypto", "bzip2", "deflate", "deflate64", "deflate-zopfli", "lzma", "time", "zstd"], default-features = false }
+zip = "2.1.0"
 zstd = "0.13.1"
+# Use the fastest implementation (libz-ng) but remove dependence on CMake
+libz-sys = { version = "1.1.18", features = ["zlib-ng-no-cmake-experimental-community-maintained"], default-features = false }
 
 [build-dependencies]
 base64 = "0.22.1"
@@ -34,9 +34,9 @@ rand = "0.8.5"
 regex = "1.8.1"
 reqwest = { version = "0.12.4", features = ["blocking", "rustls-tls"], default-features = false }
 tar = "0.4.40"
-# Remove dependence on CMake by avoiding libz-ng-sys, see:
-# https://github.com/rust-lang/libz-sys/pull/174
-zip = { version = "2.1.0", features = ["aes-crypto", "bzip2", "deflate", "deflate64", "deflate-zopfli", "lzma", "time", "zstd"], default-features = false }
+zip = "2.1.0"
+# Use the fastest implementation (libz-ng) but remove dependence on CMake
+libz-sys = { version = "1.1.18", features = ["zlib-ng-no-cmake-experimental-community-maintained"], default-features = false }
 
 [profile.release]
 panic = "abort"