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.
44 lines
1.2 KiB
TOML
44 lines
1.2 KiB
TOML
[package]
|
|
name = "email"
|
|
version = "0.16.23"
|
|
edition = "2024"
|
|
|
|
[dependencies]
|
|
utils = { path = "../utils" }
|
|
nlp = { path = "../nlp" }
|
|
store = { path = "../store" }
|
|
trc = { path = "../trc" }
|
|
types = { path = "../types" }
|
|
jmap_proto = { path = "../jmap-proto" }
|
|
jmap-tools = { version = "0.1" }
|
|
common = { path = "../common" }
|
|
groupware = { path = "../groupware" }
|
|
registry = { path = "../registry" }
|
|
inbuxa-features = { path = "../features" }
|
|
mail-parser = { version = "0.11", features = ["full_encoding"] }
|
|
mail-builder = { version = "1.0" }
|
|
sieve-rs = { version = "0.7", features = ["rkyv"] }
|
|
tokio = { version = "1.53", features = ["net", "macros"] }
|
|
aes = "0.9"
|
|
aes-gcm = "0.11.1"
|
|
chacha20poly1305 = "0.11"
|
|
cbc = { version = "0.2", features = ["alloc"] }
|
|
rasn = "0.28"
|
|
rasn-cms = "0.28"
|
|
rasn-pkix = "0.28"
|
|
rsa = { version = "0.9.10", features = ["sha2"] }
|
|
rand = "0.8"
|
|
sequoia-openpgp = { version = "2.4", default-features = false, features = ["crypto-rust", "allow-experimental-crypto", "allow-variable-time-crypto"] }
|
|
hashify = "0.2"
|
|
rkyv = { version = "0.8.18", features = ["little_endian"] }
|
|
|
|
[features]
|
|
test_mode = []
|
|
enterprise = []
|
|
|
|
[dev-dependencies]
|
|
tokio = { version = "1.53", features = ["full"] }
|
|
|
|
[lints]
|
|
workspace = true
|