Squash changes containing private information

There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository

2 files changed, 42 insertions, 0 deletions

diff --git a/flakes/mypackages/pkgs/dovecot/plugins/deleted_to_trash/default.nix b/flakes/mypackages/pkgs/dovecot/plugins/deleted_to_trash/default.nix
new file mode 100644
index 0000000..f270032
--- /dev/null
+++ b/flakes/mypackages/pkgs/dovecot/plugins/deleted_to_trash/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, dovecot, fetchFromGitHub, fetchpatch }:
+
+stdenv.mkDerivation ({
+  pname = "dovecot-deleted_to_trash";
+  version = "81b0754-master";
+  src = fetchFromGitHub {
+    owner = "lexbrugman";
+    repo = "dovecot_deleted_to_trash";
+    rev = "81b07549accfc36467bf8527a53c295c7a02dbb9";
+    sha256 = "1b3k31g898s4fa0a9l4kvjsdyds772waaay84sjdxv09jw6mqs0f";
+    fetchSubmodules = true;
+  };
+  buildInputs = [ dovecot ];
+  patches = [
+    (fetchpatch {
+      name = "fix-dovecot-2.3.diff";
+      url = "https://github.com/lexbrugman/dovecot_deleted_to_trash/commit/c52a3799a96104a603ade33404ef6aa1db647b2f.diff";
+      sha256 = "0pld3rdcjp9df2qxbp807k6v4f48lyk0xy5q508ypa57d559y6dq";
+    })
+    ./fix_mbox.patch
+  ];
+  preConfigure = ''
+    substituteInPlace Makefile --replace \
+      "/usr/include/dovecot" \
+      "${dovecot}/include/dovecot"
+    substituteInPlace Makefile --replace \
+      "/usr/lib/dovecot/modules" \
+      "$out/lib/dovecot"
+    '';
+})
diff --git a/flakes/mypackages/pkgs/dovecot/plugins/deleted_to_trash/fix_mbox.patch b/flakes/mypackages/pkgs/dovecot/plugins/deleted_to_trash/fix_mbox.patch
new file mode 100644
index 0000000..0060fb4
--- /dev/null
+++ b/flakes/mypackages/pkgs/dovecot/plugins/deleted_to_trash/fix_mbox.patch
@@ -0,0 +1,12 @@
+diff --git a/src/deleted-to-trash-plugin.c b/src/deleted-to-trash-plugin.c
+index bb4cc78..66bad53 100644
+--- a/src/deleted-to-trash-plugin.c
++++ b/src/deleted-to-trash-plugin.c
+@@ -82,6 +82,7 @@ static struct mailbox *mailbox_open_or_create(struct mailbox_list *list, const c
+        *error_r = mail_storage_get_last_error(mailbox_get_storage(box), &error);
+        if (error != MAIL_ERROR_NOTFOUND)
+        {
++               i_error("%s", *error_r);
+                mailbox_free(&box);
+                return NULL;
+        }