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}.
86 lines
2.9 KiB
TOML
86 lines
2.9 KiB
TOML
[package]
|
|
name = "inbuxa"
|
|
description = "inbuxa mail and collaboration server, a fork of Stalwart"
|
|
authors = [ "Stalwart Labs LLC <[email protected]>"]
|
|
homepage = "https://inbuxa.org"
|
|
keywords = ["imap", "jmap", "smtp", "email", "mail", "webdav", "server"]
|
|
categories = ["email"]
|
|
# Upstream offers AGPL-3.0-only OR LicenseRef-SEL; inbuxa takes the AGPL only.
|
|
license = "AGPL-3.0-only"
|
|
version = "0.16.24"
|
|
edition = "2024"
|
|
|
|
[[bin]]
|
|
name = "inbuxa"
|
|
path = "src/main.rs"
|
|
|
|
[dependencies]
|
|
store = { path = "../store" }
|
|
coordinator = { path = "../coordinator" }
|
|
jmap = { path = "../jmap" }
|
|
types = { path = "../types" }
|
|
smtp = { path = "../smtp" }
|
|
smtp-proto = { version = "0.2", features = ["rkyv", "serde"] }
|
|
imap = { path = "../imap" }
|
|
pop3 = { path = "../pop3" }
|
|
spam-filter = { path = "../spam-filter" }
|
|
managesieve = { path = "../managesieve" }
|
|
common = { path = "../common" }
|
|
email = { path = "../email" }
|
|
directory = { path = "../directory" }
|
|
http = { path = "../http" }
|
|
scim = { path = "../scim" }
|
|
dav = { path = "../dav" }
|
|
groupware = { path = "../groupware" }
|
|
services = { path = "../services" }
|
|
trc = { path = "../trc" }
|
|
utils = { path = "../utils" }
|
|
registry = { path = "../registry" }
|
|
http_proto = { path = "../http-proto" }
|
|
migration = { path = "../migration" }
|
|
tokio = { version = "1.53", features = ["full"] }
|
|
rustls = { version = "0.23.43", default-features = false, features = ["std", "aws_lc_rs", "tls12"] }
|
|
|
|
[target.'cfg(not(any(target_env = "msvc", target_os = "freebsd")))'.dependencies]
|
|
tikv-jemallocator = "0.7"
|
|
|
|
[features]
|
|
#default = ["sqlite", "postgres", "mysql", "rocks", "s3", "redis", "azure", "nats", "enterprise", "zenoh", "kafka"]
|
|
#default = ["sqlite", "postgres", "mysql", "rocks", "s3", "redis", "azure", "nats", "enterprise"]
|
|
default = ["rocks"]
|
|
sqlite = ["store/sqlite", "directory/sqlite"]
|
|
foundationdb = ["store/foundation", "common/foundation"]
|
|
postgres = ["store/postgres", "directory/postgres"]
|
|
mysql = ["store/mysql", "directory/mysql"]
|
|
rocks = ["store/rocks"]
|
|
s3 = ["store/s3"]
|
|
redis = ["store/redis", "coordinator/redis"]
|
|
azure = ["store/azure"]
|
|
nats = ["coordinator/nats"]
|
|
zenoh = ["coordinator/zenoh"]
|
|
kafka = ["coordinator/kafka"]
|
|
enterprise = [ "jmap/enterprise",
|
|
"smtp/enterprise",
|
|
"common/enterprise",
|
|
"store/enterprise",
|
|
"managesieve/enterprise",
|
|
"directory/enterprise",
|
|
"email/enterprise",
|
|
"spam-filter/enterprise",
|
|
"http/enterprise",
|
|
"scim/enterprise",
|
|
"dav/enterprise",
|
|
"groupware/enterprise",
|
|
"trc/enterprise",
|
|
"services/enterprise",
|
|
"migration/enterprise" ]
|
|
dev_mode = [ "common/dev_mode",
|
|
"trc/dev_mode",
|
|
"dav/dev_mode",
|
|
"http/dev_mode",
|
|
"http_proto/dev_mode",
|
|
"jmap/dev_mode" ]
|
|
|
|
[lints]
|
|
workspace = true
|