From d99c9e88a9ae2272a9f1bbaf04005afd058d6b25 Mon Sep 17 00:00:00 2001
From: lolpro11 <lolpro11lolx@gmail.com>
Date: Fri, 26 Jan 2024 12:51:46 -0800
Subject: [PATCH 1/2] add rs versions of libs in order to pass static compiles
---
Cargo.toml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 510df9ca..a6e3018b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ rust-version = "1.59.0"
[dependencies]
aes = { version = "0.8.2", optional = true }
byteorder = "1.4.3"
-bzip2 = { version = "0.4.3", optional = true }
+bzip2-rs = { version = "0.1.2", optional = true }
constant_time_eq = { version = "0.1.5", optional = true }
crc32fast = "1.3.2"
flate2 = { version = "1.0.23", default-features = false, optional = true }
@@ -22,7 +22,7 @@ hmac = { version = "0.12.1", optional = true, features = ["reset"] }
pbkdf2 = {version = "0.11.0", optional = true }
sha1 = {version = "0.10.1", optional = true }
time = { version = "0.3.7", optional = true, default-features = false, features = ["std"] }
-zstd = { version = "0.11.2", optional = true }
+zstud-sys = { version = "0.1.3", optional = true }
[target.'cfg(any(all(target_arch = "arm", target_pointer_width = "32"), target_arch = "mips", target_arch = "powerpc"))'.dependencies]
crossbeam-utils = "0.8.8"
@@ -39,7 +39,7 @@ deflate = ["flate2/rust_backend"]
deflate-miniz = ["flate2/default"]
deflate-zlib = ["flate2/zlib"]
unreserved = []
-default = ["aes-crypto", "bzip2", "deflate", "time", "zstd"]
+default = ["aes-crypto", "bzip2-rs", "deflate", "time", "zstud-sys"]
[[bench]]
name = "read_entry"
From 94ac6ab68b88f6b07eccbb463b52faea9fa11482 Mon Sep 17 00:00:00 2001
From: lolpro11 <lolpro11lolx@gmail.com>
Date: Mon, 29 Jan 2024 09:58:08 -0800
Subject: [PATCH 2/2] add back zstd without default features
---
Cargo.toml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index a6e3018b..5924d212 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ hmac = { version = "0.12.1", optional = true, features = ["reset"] }
pbkdf2 = {version = "0.11.0", optional = true }
sha1 = {version = "0.10.1", optional = true }
time = { version = "0.3.7", optional = true, default-features = false, features = ["std"] }
-zstud-sys = { version = "0.1.3", optional = true }
+zstd = { version = "0.11.2", default-features = false, optional = true }
[target.'cfg(any(all(target_arch = "arm", target_pointer_width = "32"), target_arch = "mips", target_arch = "powerpc"))'.dependencies]
crossbeam-utils = "0.8.8"
@@ -39,7 +39,7 @@ deflate = ["flate2/rust_backend"]
deflate-miniz = ["flate2/default"]
deflate-zlib = ["flate2/zlib"]
unreserved = []
-default = ["aes-crypto", "bzip2-rs", "deflate", "time", "zstud-sys"]
+default = ["aes-crypto", "bzip2-rs", "deflate", "time", "zstd"]
[[bench]]
name = "read_entry"