From 7f8a2834f194d2f9312adfa82701d0d2a2a07880 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 12 Jun 2026 17:25:13 +0200
Subject: [PATCH] Release: 2.1.0

---
 ChangeLog     | 15 +++++++++++++++
 configure.def |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fecc2fb1..85df0932 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2.1.0
+ o New $disarmedfrom$ variable for control/customheaders. Expands to
+   the original From: header value with '<', '>', '@' replaced by
+   '(', ')', '=' for safe use in display names ("me@here.com" ->
+   "me=here.com"). Complements $posteraddr$ (raw email address).
+ o mlmmj-sub: batch subscribe via stdin with -a -. Reads one address
+   per line, skips empty lines and '#' comments.
+ o MIME type detection and rejection in mlmmj-receive. Prevent
+   multipart/alternative or multipart/mixed messages from being posted
+   to the list (control/mimedeny).
+ o Fix: fdopendir UB by using dirfd() instead of raw fd
+ o Various code simplifications (send_digest, bouncemail, do_access, initsmtp)
+ o Many new unit tests and test fixes
+ o README: document DKIM/From munging with $posteraddr$ and $disarmedfrom$
+ o README.sendmail.md: update documentation
 2.0.1
  o configure: fix --mandir
  o configure: fix toolchain override
diff --git a/configure.def b/configure.def
index 34c1ac02..75be4e35 100644
--- a/configure.def
+++ b/configure.def
@@ -2,7 +2,7 @@
 #
 
 _packagename=mlmmj
-_version=2.0.1
+_version=2.1.0
 define PACKAGE_NAME $_packagename
 define VERSION $_version
 define PACKAGE_STRING "$_packagename $_version"
-- 
2.47.3