From c34f80c4f9cd634dcd775d40cf35492959554a5c Mon Sep 17 00:00:00 2001 From: mdecimus Date: Sun, 29 Dec 2024 16:46:40 +0100 Subject: [PATCH] v0.11.0-pre-release --- Cargo.lock | 38 +++++++++++++------------- crates/cli/Cargo.toml | 2 +- crates/common/Cargo.toml | 2 +- crates/directory/Cargo.toml | 2 +- crates/imap-proto/Cargo.toml | 2 +- crates/imap/Cargo.toml | 2 +- crates/jmap-proto/Cargo.toml | 2 +- crates/jmap/Cargo.toml | 2 +- crates/jmap/src/api/management/spam.rs | 21 +------------- crates/main/Cargo.toml | 2 +- crates/managesieve/Cargo.toml | 2 +- crates/nlp/Cargo.toml | 2 +- crates/pop3/Cargo.toml | 2 +- crates/smtp/Cargo.toml | 2 +- crates/spam-filter/Cargo.toml | 2 +- crates/store/Cargo.toml | 2 +- crates/trc/Cargo.toml | 2 +- crates/trc/event-macro/Cargo.toml | 2 +- crates/utils/Cargo.toml | 2 +- crates/utils/proc-macros/Cargo.toml | 2 +- tests/Cargo.toml | 2 +- 21 files changed, 39 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d006e6c0..ddf6e225 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1203,7 +1203,7 @@ dependencies = [ [[package]] name = "common" -version = "0.10.7" +version = "0.11.0" dependencies = [ "aes-gcm-siv", "ahash 0.8.11", @@ -1812,7 +1812,7 @@ dependencies = [ [[package]] name = "directory" -version = "0.10.7" +version = "0.11.0" dependencies = [ "ahash 0.8.11", "argon2", @@ -2136,7 +2136,7 @@ dependencies = [ [[package]] name = "event_macro" -version = "0.10.7" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -3220,7 +3220,7 @@ checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "imap" -version = "0.10.7" +version = "0.11.0" dependencies = [ "ahash 0.8.11", "common", @@ -3246,7 +3246,7 @@ dependencies = [ [[package]] name = "imap_proto" -version = "0.10.7" +version = "0.11.0" dependencies = [ "ahash 0.8.11", "chrono", @@ -3470,7 +3470,7 @@ dependencies = [ [[package]] name = "jmap" -version = "0.10.7" +version = "0.11.0" dependencies = [ "aes", "aes-gcm", @@ -3552,7 +3552,7 @@ dependencies = [ [[package]] name = "jmap_proto" -version = "0.10.7" +version = "0.11.0" dependencies = [ "ahash 0.8.11", "fast-float", @@ -3926,7 +3926,7 @@ dependencies = [ [[package]] name = "mail-server" -version = "0.10.7" +version = "0.11.0" dependencies = [ "common", "directory", @@ -3946,7 +3946,7 @@ dependencies = [ [[package]] name = "managesieve" -version = "0.10.7" +version = "0.11.0" dependencies = [ "ahash 0.8.11", "bincode", @@ -4224,7 +4224,7 @@ dependencies = [ [[package]] name = "nlp" -version = "0.10.7" +version = "0.11.0" dependencies = [ "ahash 0.8.11", "bincode", @@ -4783,7 +4783,7 @@ dependencies = [ [[package]] name = "pop3" -version = "0.10.7" +version = "0.11.0" dependencies = [ "common", "directory", @@ -4941,7 +4941,7 @@ dependencies = [ [[package]] name = "proc_macros" -version = "0.10.7" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -6435,7 +6435,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smtp" -version = "0.10.7" +version = "0.11.0" dependencies = [ "ahash 0.8.11", "bincode", @@ -6524,7 +6524,7 @@ dependencies = [ [[package]] name = "spam-filter" -version = "0.10.7" +version = "0.11.0" dependencies = [ "common", "decancer", @@ -6578,7 +6578,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stalwart-cli" -version = "0.10.7" +version = "0.11.0" dependencies = [ "clap", "console", @@ -6609,7 +6609,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "store" -version = "0.10.7" +version = "0.11.0" dependencies = [ "ahash 0.8.11", "arc-swap", @@ -6818,7 +6818,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.10.7" +version = "0.11.0" dependencies = [ "ahash 0.8.11", "async-trait", @@ -7256,7 +7256,7 @@ dependencies = [ [[package]] name = "trc" -version = "0.10.7" +version = "0.11.0" dependencies = [ "ahash 0.8.11", "base64 0.22.1", @@ -7503,7 +7503,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "utils" -version = "0.10.7" +version = "0.11.0" dependencies = [ "ahash 0.8.11", "base64 0.22.1", diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 8a363637..3cd25ea5 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Stalwart Labs Ltd. "] license = "AGPL-3.0-only OR LicenseRef-SEL" repository = "https://github.com/stalwartlabs/cli" homepage = "https://github.com/stalwartlabs/cli" -version = "0.10.7" +version = "0.11.0" edition = "2021" readme = "README.md" resolver = "2" diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index d10f77d0..0aca2f94 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "common" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/directory/Cargo.toml b/crates/directory/Cargo.toml index 9005b68c..87b69f93 100644 --- a/crates/directory/Cargo.toml +++ b/crates/directory/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "directory" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/imap-proto/Cargo.toml b/crates/imap-proto/Cargo.toml index 878c5d5a..cee8b94b 100644 --- a/crates/imap-proto/Cargo.toml +++ b/crates/imap-proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "imap_proto" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/imap/Cargo.toml b/crates/imap/Cargo.toml index 7370c32b..09e720b7 100644 --- a/crates/imap/Cargo.toml +++ b/crates/imap/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "imap" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/jmap-proto/Cargo.toml b/crates/jmap-proto/Cargo.toml index f65c0a5e..ff094c76 100644 --- a/crates/jmap-proto/Cargo.toml +++ b/crates/jmap-proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "jmap_proto" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/jmap/Cargo.toml b/crates/jmap/Cargo.toml index b4463cb8..386870b3 100644 --- a/crates/jmap/Cargo.toml +++ b/crates/jmap/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "jmap" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/jmap/src/api/management/spam.rs b/crates/jmap/src/api/management/spam.rs index c32831b6..9bae89e8 100644 --- a/crates/jmap/src/api/management/spam.rs +++ b/crates/jmap/src/api/management/spam.rs @@ -6,9 +6,7 @@ use std::{net::IpAddr, sync::Arc}; -use common::{ - auth::AccessToken, config::spamfilter::SpamFilterAction, scripts::ScriptModification, Server, -}; +use common::{auth::AccessToken, config::spamfilter::SpamFilterAction, Server}; use directory::{ backend::internal::manage::{self, ManageDirectory}, Permission, @@ -36,23 +34,6 @@ use super::{ troubleshoot::{AuthResult, DmarcPolicy}, }; -#[derive(Debug, serde::Serialize)] -#[serde(tag = "action")] -#[serde(rename_all = "lowercase")] -pub enum Response { - Accept { - modifications: Vec, - }, - Replace { - message: String, - modifications: Vec, - }, - Reject { - reason: String, - }, - Discard, -} - pub trait ManageSpamHandler: Sync + Send { fn handle_manage_spam( &self, diff --git a/crates/main/Cargo.toml b/crates/main/Cargo.toml index 2ff0c730..264d902d 100644 --- a/crates/main/Cargo.toml +++ b/crates/main/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://stalw.art" keywords = ["imap", "jmap", "smtp", "email", "mail", "server"] categories = ["email"] license = "AGPL-3.0-only OR LicenseRef-SEL" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/managesieve/Cargo.toml b/crates/managesieve/Cargo.toml index 4c7ddaf2..080357a7 100644 --- a/crates/managesieve/Cargo.toml +++ b/crates/managesieve/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "managesieve" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/nlp/Cargo.toml b/crates/nlp/Cargo.toml index 7d88c7c0..f2cfdec8 100644 --- a/crates/nlp/Cargo.toml +++ b/crates/nlp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nlp" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/pop3/Cargo.toml b/crates/pop3/Cargo.toml index a8fec7e0..6c6975f6 100644 --- a/crates/pop3/Cargo.toml +++ b/crates/pop3/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pop3" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/smtp/Cargo.toml b/crates/smtp/Cargo.toml index d665c212..9b6d1fd8 100644 --- a/crates/smtp/Cargo.toml +++ b/crates/smtp/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://stalw.art/smtp" keywords = ["smtp", "email", "mail", "server"] categories = ["email"] license = "AGPL-3.0-only OR LicenseRef-SEL" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/spam-filter/Cargo.toml b/crates/spam-filter/Cargo.toml index 8266237e..a1215ac7 100644 --- a/crates/spam-filter/Cargo.toml +++ b/crates/spam-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spam-filter" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml index a14df1b7..537ab805 100644 --- a/crates/store/Cargo.toml +++ b/crates/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "store" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/trc/Cargo.toml b/crates/trc/Cargo.toml index 197afd64..d6536a50 100644 --- a/crates/trc/Cargo.toml +++ b/crates/trc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trc" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/trc/event-macro/Cargo.toml b/crates/trc/event-macro/Cargo.toml index ed2ebe34..fe8f95d2 100644 --- a/crates/trc/event-macro/Cargo.toml +++ b/crates/trc/event-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "event_macro" -version = "0.10.7" +version = "0.11.0" edition = "2021" [lib] diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index edbde294..1596c929 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "utils" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2" diff --git a/crates/utils/proc-macros/Cargo.toml b/crates/utils/proc-macros/Cargo.toml index 80eedf3a..c40cd4c3 100644 --- a/crates/utils/proc-macros/Cargo.toml +++ b/crates/utils/proc-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proc_macros" -version = "0.10.7" +version = "0.11.0" edition = "2021" [lib] diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 714a62e0..938381c2 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tests" -version = "0.10.7" +version = "0.11.0" edition = "2021" resolver = "2"