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}.
57 lines
1.9 KiB
TOML
57 lines
1.9 KiB
TOML
[package]
|
|
name = "smtp"
|
|
description = "inbuxa SMTP server"
|
|
authors = [ "Stalwart Labs LLC <[email protected]>"]
|
|
homepage = "https://inbuxa.org"
|
|
keywords = ["smtp", "email", "mail", "server"]
|
|
categories = ["email"]
|
|
license = "AGPL-3.0-only OR LicenseRef-SEL"
|
|
version = "0.16.24"
|
|
edition = "2024"
|
|
|
|
[dependencies]
|
|
store = { path = "../store" }
|
|
types = { path = "../types" }
|
|
utils = { path = "../utils" }
|
|
directory = { path = "../directory" }
|
|
common = { path = "../common" }
|
|
email = { path = "../email" }
|
|
registry = { path = "../registry" }
|
|
inbuxa-features = { path = "../features" }
|
|
spam-filter = { path = "../spam-filter" }
|
|
trc = { path = "../trc" }
|
|
mail-auth = { version = "0.13", features = ["rkyv"] }
|
|
mail-parser = { version = "0.11", features = ["full_encoding"] }
|
|
mail-builder = { version = "1.0" }
|
|
smtp-proto = { version = "0.2.3", features = ["rkyv", "serde"] }
|
|
sieve-rs = { version = "0.7", features = ["rkyv"] }
|
|
ahash = { version = "0.8" }
|
|
rustls = { version = "0.23.43", default-features = false, features = ["std", "aws_lc_rs", "tls12"] }
|
|
rustls-pki-types = { version = "1", features = ["std"] }
|
|
rustls-webpki = { version = "0.103", default-features = false, features = ["std", "aws-lc-rs"] }
|
|
tokio = { version = "1.53", features = ["full"] }
|
|
tokio-rustls = { version = "0.26", default-features = false, features = ["aws_lc_rs", "tls12"] }
|
|
sha2 = "0.11"
|
|
parking_lot = "0.12"
|
|
blake3 = "1.8"
|
|
rand = "0.10.2"
|
|
x509-parser = { version = "0.18", features = ["verify-aws"] }
|
|
reqwest = { version = "0.13", default-features = false, features = ["rustls", "http2"] }
|
|
serde = { version = "1.0", features = ["derive", "rc"] }
|
|
serde_json = "1.0"
|
|
rkyv = { version = "0.8.18", features = ["little_endian"] }
|
|
compact_str = "0.10.0"
|
|
hashify = { version = "0.2" }
|
|
base64 = "0.23"
|
|
|
|
[features]
|
|
test_mode = ["mail-auth/test"]
|
|
enterprise = []
|
|
|
|
#[[bench]]
|
|
#name = "hash"
|
|
#harness = false
|
|
|
|
[lints]
|
|
workspace = true
|