jcoffey-dev
b2453d066b
Eight conflicted files resolved, plus the lock file and the schema:
- crates/services/src/task_manager/spam_classifier.rs: upstream's rules
update now replaces existing rules, DNSBL servers, lookups and file
extensions, keeping only whether each is on. Taken, with one difference:
an object an admin edited is kept as it is. Every object an update writes
is fingerprinted (content without `enable`, SHA-256, stored under
SUBSPACE_INBUXA "Sf"), and only one that still matches is replaced.
Scores are never replaced, as upstream has it. The AU-1.10 summary record
now names what was added, replaced and kept, and the bundled rules are
marked applied only when the update fully succeeded, so a failure runs
again on the next start. The marker becomes "3.0.2+2", which runs the
update once on upgrade to fingerprint every rule still as bundled.
- crates/common/src/network/autoconfig/autodiscover.rs: upstream's rewrite
(implicit TLS first, labeled SSL), with the per-protocol switches (LP-7,
LP-14a) passed in as a filter.
- crates/store/src/backend/mysql/{search,write}.rs: upstream's chunked
deletes (no unbounded first DELETE, stop on a short chunk, halve the
chunk on the new chunk-too-large errors) inside the fork's query timeout.
- crates/smtp/src/lib.rs: the fork's queue spawn kept. It already fixed the
stall upstream fixes here (a node without outboundMta stops accepting
mail at about 1024 queued messages), and follows role changes live.
- crates/jmap/src/registry/mapping/bootstrap.rs: the log path stays
/var/log/inbuxa/; upstream's PowerDNS mapping taken.
- crates/main/Cargo.toml: the AGPL-only license kept, version 0.16.24.
- tests/src/jmap/principal/get.rs: the fork's capabilities kept.
- resources/schema/schema.json.gz: merged as JSON; upstream relabeled the
vendor Sieve extensions "(Stalwart)", kept as "(vnd.inbuxa)".
- Cargo.lock: upstream's, with the fork's crates added by Cargo.
Also:
- tests/src/smtp/inbound/spam_rules_kept.rs: an edited rule survives an
update, an unedited one is updated, rules from before fingerprints are
handled, and the audit summary says so. Upstream's own spam_rules test
passes unchanged.
- tests/src/smtp/reporting/reschedule.rs moves to port 19058; upstream's
new spam_rules test took 19057.
- tools/fork/renames.py renames the "(Stalwart)" labels and the default
log path, so neither conflicts again.
- tools/fork/notice-check.py compares against the newest snapshot in the
checked-out history instead of the upstream branch head, so moving the
branch no longer fails other open pull requests.
- tests/src/directory/issuer.rs (since v0.16.23) stays out, and is on the
build check's known list: it tests issuer-based directory routing, which
the fork doesn't have (DIR-2).
- Strip report: docs/fork/strip-reports/v0.16.24.{md,json}.
79 lines
3.6 KiB
TOML
79 lines
3.6 KiB
TOML
[package]
|
|
name = "store"
|
|
version = "0.16.24"
|
|
edition = "2024"
|
|
|
|
[dependencies]
|
|
utils = { path = "../utils" }
|
|
types = { path = "../types" }
|
|
nlp = { path = "../nlp" }
|
|
trc = { path = "../trc" }
|
|
registry = { path = "../registry" }
|
|
rocksdb = { version = "0.25", optional = true, features = ["multi-threaded-cf"] }
|
|
foundationdb = { version = "0.11", features = ["embedded-fdb-include", "fdb-7_4"], optional = true }
|
|
rusqlite = { version = "0.40", features = ["bundled"], optional = true }
|
|
rust-s3 = { version = "0.37", default-features = false, features = ["tokio-rustls-tls"], optional = true }
|
|
reqwest_s3 = { package = "reqwest", version = "0.12", default-features = false, features = ["rustls-tls-native-roots"], optional = true }
|
|
azure_core = { version = "0.21.0", optional = true }
|
|
azure_storage = { version = "0.21.0", default-features = false, features = ["enable_reqwest_rustls", "hmac_rust"], optional = true }
|
|
azure_storage_blobs = { version = "0.21.0", default-features = false, features = ["enable_reqwest_rustls", "hmac_rust"], optional = true }
|
|
reqwest = { version = "0.13", default-features = false, features = ["rustls", "http2", "stream"]}
|
|
tokio = { version = "1.53", features = ["sync", "fs", "io-util"] }
|
|
r2d2 = { version = "0.8.10", optional = true }
|
|
futures = { version = "0.3", optional = true }
|
|
rand = "0.10.2"
|
|
roaring = "0.11"
|
|
rayon = { version = "1.12", optional = true }
|
|
serde = { version = "1.0", features = ["derive"]}
|
|
ahash = { version = "0.8.12", features = ["serde"] }
|
|
xxhash-rust = { version = "0.8.18", features = ["xxh3"] }
|
|
parking_lot = "0.12"
|
|
lru-cache = { version = "0.1.2", optional = true }
|
|
num_cpus = { version = "1.17", optional = true }
|
|
blake3 = "1.8"
|
|
lz4_flex = { version = "0.14", features = ["alloc"], default-features = false }
|
|
deadpool-postgres = { version = "0.14", optional = true }
|
|
tokio-postgres = { version = "0.7.18", features = ["with-serde_json-1"], optional = true }
|
|
tokio-rustls = { version = "0.26", optional = true, default-features = false, features = ["aws_lc_rs", "tls12"] }
|
|
rustls = { version = "0.23.43", optional = true, default-features = false, features = ["std", "aws_lc_rs", "tls12"] }
|
|
rustls-pki-types = { version = "1", optional = true }
|
|
aws-lc-rs = { version = "1", optional = true }
|
|
x509-parser = { version = "0.18", optional = true }
|
|
bytes = { version = "1.12", optional = true }
|
|
mysql_async = { version = "0.37", default-features = false, features = ["default-rustls", "minimal"], optional = true }
|
|
serde_json = { version = "1.0.151" }
|
|
flate2 = "1.1"
|
|
redis = { version = "1.6", features = [ "tokio-comp", "tokio-rustls-comp", "tls-rustls-insecure", "tls-rustls", "cluster-async", "sentinel"], optional = true }
|
|
deadpool = { version = "0.13", features = ["managed"], optional = true }
|
|
arc-swap = "1.9.2"
|
|
bitpacking = "0.9.3"
|
|
rkyv = { version = "0.8.18", features = ["little_endian"] }
|
|
compact_str = "0.10.0"
|
|
gethostname = "1.1.0"
|
|
radsort = "0.1.1"
|
|
|
|
[dev-dependencies]
|
|
tokio = { version = "1.53", features = ["full"] }
|
|
|
|
[features]
|
|
# Data Stores
|
|
rocks = ["rocksdb", "rayon", "num_cpus"]
|
|
sqlite = ["rusqlite", "rayon", "r2d2", "num_cpus", "lru-cache"]
|
|
postgres = ["tokio-postgres", "deadpool", "deadpool-postgres", "tokio-rustls", "rustls", "aws-lc-rs", "rustls-pki-types", "x509-parser", "futures", "bytes"]
|
|
mysql = ["mysql_async", "futures"]
|
|
foundation = ["foundationdb", "futures"]
|
|
fdb-chunked-bm = []
|
|
|
|
# Blob stores
|
|
s3 = ["rust-s3", "dep:reqwest_s3"]
|
|
azure = ["azure_core", "azure_storage", "azure_storage_blobs", "futures"]
|
|
|
|
# In-memory stores
|
|
redis = ["dep:redis", "deadpool", "deadpool/rt_tokio_1", "futures"]
|
|
|
|
enterprise = []
|
|
test_mode = []
|
|
|
|
[lints]
|
|
workspace = true
|