From bbe8991fbf5f5e0a26326f9def1b659195e99bf2 Mon Sep 17 00:00:00 2001
From: Alwin Berger <alwin.berger@tu-dortmund.de>
Date: Wed, 4 Sep 2024 23:24:29 +0200
Subject: [PATCH] drop bzip2 dependency

---
 Cargo.lock | 25 +------------------------
 Cargo.toml | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0ab45bd..7094587 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -230,27 +230,6 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
-[[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 = "cc"
 version = "1.1.15"
@@ -2111,12 +2090,10 @@ dependencies = [
 [[package]]
 name = "zip"
 version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
+source = "git+https://github.com/alwinber/zip2.git#39f1ca8dffb60c2193720452a15e0f92031ea386"
 dependencies = [
  "aes",
  "arbitrary",
- "bzip2",
  "constant_time_eq",
  "crc32fast",
  "crossbeam-utils",
diff --git a/Cargo.toml b/Cargo.toml
index 358ccb3..810c2b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,6 +13,17 @@ clap = { version = "4.5.16", features = ["derive"] }
 imap = { version = "2.4.1", default-features = false }
 mail-parser = "0.9.4"
 mail-send = "0.4.9"
-rustls = { version = "0.23", default-features = false, features = ["std", "ring"] }
-rustls-connector = { version = "0.21.4", default-features = false, features = ["native-certs", "rustls--ring"] }
+rustls = { version = "0.23", default-features = false, features = [
+    "std",
+    "ring",
+] }
+rustls-connector = { version = "0.21.4", default-features = false, features = [
+    "native-certs",
+    "rustls--ring",
+] }
 tokio = { version = "1.40.0", features = ["net", "io-util", "time", "macros"] }
+
+[patch.crates-io]
+# zip version 2.2.0 without bzip2 by default
+# bzip2 limits portability and cross-compilation
+zip = { git = "https://github.com/alwinber/zip2.git" }