From 797599b2969a86c914e66b0c329a337522891d7d Mon Sep 17 00:00:00 2001
From: Gonne <gonne@mathebau.de>
Date: Mon, 17 Mar 2025 15:59:16 +0100
Subject: [PATCH 1/2] Include stalwart's patch for redirect to sender instead
 of our own

---
 flake-module.nix       | 2 +-
 patches/sieve-rs.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake-module.nix b/flake-module.nix
index 789d7b8..1c9cbd3 100644
--- a/flake-module.nix
+++ b/flake-module.nix
@@ -88,7 +88,7 @@
                             ./patches/sieve-rs.patch
                           ];
                           # Replace the string with `lib.fakeHash` after version changes in order to get the new hash value.
-                          cargoHash = "sha256-gb2oFlVA/vE6DoWWW8SCFA3l7rtV2RuosPUY+6IcKNM=";
+                          cargoHash = "sha256-0U0Z13a2vRxMFnaaHeXBjvYDjKStgqmuDboUVssVMQw=";
                         }
                       );
                   };
diff --git a/patches/sieve-rs.patch b/patches/sieve-rs.patch
index b706d03..b0882f4 100644
--- a/patches/sieve-rs.patch
+++ b/patches/sieve-rs.patch
@@ -8,7 +8,7 @@ index be36759b..b4316639 100644
  version = "0.6.0"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "15ac54053752c25a0e545dd1953de716abcc80b12cfe0b6c2f2c1c73759d4f45"
-+source = "git+https://gitea.mathebau.de/fachschaft/sieve-rs.git#71324550504c0f84fe3e814d05cbe22f90a3b228"
++source = "git+https://github.com/stalwartlabs/sieve.git#56450c6ccdf76f1de95931db24896599159efc53"
  dependencies = [
   "ahash 0.8.11",
   "bincode",
@@ -23,5 +23,5 @@ index f055474f..2b64c9ac 100644
 +
 +
 +[patch.crates-io]
-+sieve-rs = { git = 'https://gitea.mathebau.de/fachschaft/sieve-rs.git' }
++sieve-rs = { git = 'https://github.com/stalwartlabs/sieve.git' }
 

From 23d85d5364a3ef0505e35a9f5b9c3ca8a2c1eba9 Mon Sep 17 00:00:00 2001
From: Gonne <gonne@mathebau.de>
Date: Tue, 18 Mar 2025 09:44:02 +0100
Subject: [PATCH 2/2] Increase limits for our redirect script to be higher than
 our number of aliases

---
 nixos/modules/mail.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/mail.nix b/nixos/modules/mail.nix
index 24d144c..f36995f 100644
--- a/nixos/modules/mail.nix
+++ b/nixos/modules/mail.nix
@@ -1,6 +1,6 @@
 /*
 * Building: We patch our version of stalwart and thus need to built it locally.
-*   Be aware that this needs some hours, about 12Gb RAM and a few Gb free space in /tmp.
+*   Be aware that this needs some hours, about 20Gb RAM and a few Gb free space in /tmp.
 *   If you only want to deploy configuration changes and no software updates, consider building on the target VM.
 *   It has stalwart in its nix store and does not need to rebuild it.
 * Forwarding mails: Update the Sops-secrets in the machine directory, rebuild on the VM and deploy.
@@ -225,8 +225,8 @@ in {
               {"else" = false;}
             ];
             limits = {
-              redirects = 50;
-              out-messages = 50;
+              redirects = 500;
+              out-messages = 500;
             };
           };
           # See https://stalw.art/docs/smtp/authentication/dkim/sign