Merge pull request #1003 from chatmail/feld/crypt-r

fix: crypt-r dependency was declared for wrong Python version
2026-06-09 21:21:09 +00:00 · 2026-06-09 12:38:45 -07:00 · 2026-06-09 12:38:07 -07:00 · 2026-06-08 16:28:21 +02:00 · 2026-06-05 22:28:16 +02:00 · 2026-06-05 09:39:27 +02:00
6 changed files with 12 additions and 37 deletions
@@ -9,8 +9,7 @@ dependencies = [
  "iniconfig",
  "filelock",
  "requests",
-  "crypt-r >= 3.13.1 ; python_version >= '3.11'",
-  "domain-validator",
+  "crypt-r >= 3.13.1 ; python_version >= '3.13'",
 ]

 [tool.setuptools]
@@ -2,7 +2,6 @@ import ipaddress
 from pathlib import Path

 import iniconfig
-from domain_validator import DomainValidator

 from chatmaild.user import User

@@ -25,7 +24,6 @@ class Config:
            self.mail_domain = f"[{raw_domain}]"
            self.postfix_myhostname = ipaddress.IPv4Address(raw_domain).reverse_pointer
        else:
-            DomainValidator().validate_domain_re(raw_domain)
            self.ipv4_relay = None
            self.mail_domain = raw_domain
            self.postfix_myhostname = raw_domain
@@ -1,2 +1,2 @@
 "acme-enter-email": "{{ email }}"
-"acme-agreement:https://letsencrypt.org/documents/LE-SA-v1.6-August-18-2025.pdf": true
+"acme-agreement:https://letsencrypt.org/documents/LE-SA-v1.7-June-04-2026.pdf": true
@@ -19,12 +19,12 @@ DOVECOT_ARCHIVE_VERSION = "2.3.21+dfsg1-3"
 DOVECOT_PACKAGE_VERSION = f"1:{DOVECOT_ARCHIVE_VERSION}"

 DOVECOT_SHA256 = {
-    ("core", "amd64"): "b24dcb26eee8fe2f769290fe4cdb665df3a017811eae972840c54dbc74936aad",
-    ("core", "arm64"): "42afe5e00e136c8f8513a2c321a29566811a0c8805aeca4302252604f00e3433",
-    ("imapd", "amd64"): "d13c486e7e19c68f316bae4836d9e94db54892a6eb56260d0d2914aa4babe1b6",
-    ("imapd", "arm64"): "537840c4a3d7cdd529ce611481dd38c7ee41246fb8a678d9abeb4fd843f0f88d",
-    ("lmtpd", "amd64"): "2dd43f8860ee2152b0dffe5e29104add8d6134d9bccf10a21ab1b369b8aa0490",
-    ("lmtpd", "arm64"): "ed26f31fe52eb8cb2104aa877c919443670a0ae42aa832eccc3f70bc497291ba",
+    ("core", "amd64"): "dd060706f52a306fa863d874717210b9fe10536c824afe1790eec247ded5b27d",
+    ("core", "arm64"): "e7548e8a82929722e973629ecc40fcfa886894cef3db88f23535149e7f730dc9",
+    ("imapd", "amd64"): "8d8dc6fc00bbb6cdb25d345844f41ce2f1c53f764b79a838eb2a03103eebfa86",
+    ("imapd", "arm64"): "178fa877ddd5df9930e8308b518f4b07df10e759050725f8217a0c1fb3fd707f",
+    ("lmtpd", "amd64"): "2f69ba5e35363de50962d42cccbfe4ed8495265044e244007d7ccddad77513ab",
+    ("lmtpd", "arm64"): "89f52fb36524f5877a177dff4a713ba771fd3f91f22ed0af7238d495e143b38f",
 }


@@ -119,7 +119,7 @@ def _download_dovecot_package(package: str, arch: str) -> tuple[str | None, bool

    url_version = DOVECOT_ARCHIVE_VERSION.replace("+", "%2B")
    deb_base = f"{pkg_name}_{url_version}_{arch}.deb"
-    primary_url = f"https://download.delta.chat/dovecot/staging-matrix-trixie-trixie/{deb_base}"
+    primary_url = f"https://download.delta.chat/dovecot/{deb_base}"
    fallback_url = f"https://github.com/chatmail/dovecot/releases/download/upstream%2F{url_version}/{deb_base}"
    url = _pick_url(primary_url, fallback_url)
    deb_filename = f"/root/{deb_base}"
@@ -1,23 +1,3 @@
-# List of headers for incoming messages 
-# that must be retained for functionality and compatibility reasons 
-/^From:/            DUNNO
-/^Message-Id:/      DUNNO
-/^Chat-/            DUNNO
-/^Content-Type:/    DUNNO
-
-# For receiving clear-text messages (still supported in May 2026)
-/^Subject:/         DUNNO
-/^Date:/            DUNNO
-/^To:/              DUNNO
-/^CC:/              DUNNO
-/^References:/      DUNNO
-/^In-Reply-To:/     DUNNO
-
-# Senders might support Autocrypt 1 but not RFC9788 (Header Protection) 
-/^Autocrypt:/       DUNNO
-
-# SecureJoin V2 protocol headers (for backward compatibility) 
-/^Secure-Join/      DUNNO
-
-# Ignore all other headers
-/.*/                IGNORE
+/^DKIM-Signature:/            IGNORE
+/^Authentication-Results:/            IGNORE
+/^Received:/            IGNORE
@@ -10,13 +10,11 @@ from pathlib import Path

 import pytest
 from chatmaild.config import is_valid_ipv4, read_config
-from domain_validator import DomainValidator


 def format_mail_domain(raw_domain: str) -> str:
    if is_valid_ipv4(raw_domain):
        return f"[{raw_domain}]"
-    DomainValidator().validate_domain_re(raw_domain)
    return raw_domain
Author	SHA1	Message	Date
feld	f596d4b56d	Merge pull request #1003 from chatmail/feld/crypt-r fix: crypt-r dependency was declared for wrong Python version	2026-06-09 12:38:45 -07:00
Mark Felder	8e3c18019b	fix: crypt-r dependency was declared for wrong Python version The original crypt library was last supported in Python 3.12, so it's not needed until Python 3.13 is default (Trixie) > The crypt_r module is a renamed copy of the crypt module as it was present in Python 3.12 before it was removed.	2026-06-09 12:38:07 -07:00
missytake	9da3f5c235	fix(acmetool): update let's encrypt ToS link	2026-06-08 16:28:21 +02:00
feld	6def189d16	Revert "Aggressive LMTP header cleanup (#816 )" This reverts commit `921080125f`.	2026-06-05 22:28:16 +02:00
Mark Felder	24612e9121	fix(deps): Remove domain-validator dependency It is broken in multiple ways	2026-06-05 09:39:27 +02:00