jcoffey-dev
b2ded0a776
Five conflicts, resolved: - crates/common/src/auth/authentication.rs: upstream's get_directory_for_token and JwtClaims replace extract_jwt_domain; the per-domain directory code (DIR-1, DIR-5 to DIR-7) is kept, and the token lookup routes through it. The release's one new Enterprise snippet was the body of get_directory_for_issuer, which stays returning None: a token naming no address gets the server default, as DIR-2 specifies and as v0.16.22 did. - crates/common/src/manager/application.rs: upstream's rewrite of the tests, with the temp directory names renamed again, and the 5(a) notice the name-purge change should have added. - crates/common/src/network/mta.rs: both sides' imports. - crates/main/Cargo.toml: the AGPL-only license kept, version 0.16.23. - Cargo.lock: upstream's, with the fork's crates added by Cargo.
46 lines
1.2 KiB
TOML
46 lines
1.2 KiB
TOML
[package]
|
|
name = "services"
|
|
version = "0.16.23"
|
|
edition = "2024"
|
|
|
|
[dependencies]
|
|
store = { path = "../store" }
|
|
nlp = { path = "../nlp" }
|
|
common = { path = "../common" }
|
|
utils = { path = "../utils" }
|
|
trc = { path = "../trc" }
|
|
email = { path = "../email" }
|
|
smtp = { path = "../smtp" }
|
|
groupware = { path = "../groupware" }
|
|
spam-filter = { path = "../spam-filter" }
|
|
types = { path = "../types" }
|
|
jmap_proto = { path = "../jmap-proto" }
|
|
jmap-tools = { version = "0.1" }
|
|
registry = { path = "../registry" }
|
|
inbuxa-features = { path = "../features" }
|
|
smtp-proto = { version = "0.2", features = ["rkyv", "serde"] }
|
|
tokio = { version = "1.53", features = ["rt"] }
|
|
mail-parser = { version = "0.11", features = ["full_encoding", "rkyv"] }
|
|
mail-builder = { version = "1.0" }
|
|
aho-corasick = { version = "1.1" }
|
|
calcard = { version = "0.3", features = ["rkyv"] }
|
|
serde_json = "1.0"
|
|
memory-stats = "1.2.0"
|
|
aes-gcm = "0.11.1"
|
|
p256 = { version = "0.13", features = ["ecdh"] }
|
|
hkdf = "0.13"
|
|
sha2 = "0.11"
|
|
reqwest = { version = "0.13", default-features = false, features = ["rustls", "http2"]}
|
|
base64 = "0.23"
|
|
dns-update = { version = "0.5" }
|
|
psl = "2"
|
|
|
|
[dev-dependencies]
|
|
|
|
[features]
|
|
test_mode = []
|
|
enterprise = []
|
|
|
|
[lints]
|
|
workspace = true
|