From: Stuart Henderson <stu@spacehopper.org>
Subject: mail/opendkim upstream development restarted, test diff if there are any users?
To: ports <ports@openbsd.org>
Date: Thu, 28 May 2026 17:10:41 +0100

if anyone's interested in ports/mail/opendkim (milter, etc) you might
like to give this a spin, Dan Mahoney has been hacking on the upstream
code recently. with the last upstream commit (OPENSSL_thread_stop
fallback for libressl), build and make test is happy (at least on
amd64/aarch64).

Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/opendkim/Makefile,v
diff -u -p -r1.10 Makefile
--- Makefile	28 May 2026 11:20:31 -0000	1.10
+++ Makefile	28 May 2026 15:57:47 -0000
@@ -1,14 +1,13 @@
 COMMENT=	library and milter for DKIM (Domain Keys Identified Mail)
 
 # should be able to switch back to proper tarballs for new releases
-V=		2.10.3
+V=		2.11.0pre20260528
 GH_ACCOUNT=	trusteddomainproject
 GH_PROJECT=	OpenDKIM
-GH_TAGNAME=	rel-opendkim-${V:S/./-/g}
-PKGNAME=	opendkim-${V}
-REVISION=	4
+GH_COMMIT=	f179aa51e806fc2d4a97a40b40dae802f2af7d0f
+DISTNAME=	opendkim-${V}
 
-SHARED_LIBS +=	opendkim             0.0      # 10.3
+SHARED_LIBS +=	opendkim             1.0      # 11.0
 
 CATEGORIES=	mail
 
@@ -25,8 +24,8 @@ TEST_FLAGS=	COV_LIBADD=-pthread
 
 SEPARATE_BUILD=	Yes
 
-AUTOCONF_VERSION= 2.69
-AUTOMAKE_VERSION= 1.13
+AUTOCONF_VERSION= 2.72
+AUTOMAKE_VERSION= 1.18
 CONFIGURE_STYLE= autoreconf
 CONFIGURE_ARGS=	--enable-replace_rules
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/opendkim/distinfo,v
diff -u -p -r1.2 distinfo
--- distinfo	28 May 2026 11:20:31 -0000	1.2
+++ distinfo	28 May 2026 15:57:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (OpenDKIM-rel-opendkim-2-10-3.tar.gz) = r12he2M5su1ag0DNkZCRkSG3wg0PF2V4MnMtJCvuNLk=
-SIZE (OpenDKIM-rel-opendkim-2-10-3.tar.gz) = 655324
+SHA256 (opendkim-2.11.0pre20260528-f179aa51.tar.gz) = SBJzSXJt7kN8cLPSJ5lNq/magGvqRtY7mZFwqxmggJU=
+SIZE (opendkim-2.11.0pre20260528-f179aa51.tar.gz) = 836128
Index: patches/patch-opendkim_opendkim-config_h
===================================================================
RCS file: patches/patch-opendkim_opendkim-config_h
diff -N patches/patch-opendkim_opendkim-config_h
--- patches/patch-opendkim_opendkim-config_h	11 Mar 2022 19:34:43 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-https://sourceforge.net/p/opendkim/bugs/257/
-
-Index: opendkim/opendkim-config.h
---- opendkim/opendkim-config.h.orig
-+++ opendkim/opendkim-config.h
-@@ -144,6 +144,7 @@ struct configdef dkimf_config[] =
- 	{ "RemoveARFrom",		CONFIG_TYPE_STRING,	FALSE },
- 	{ "RemoveOldSignatures",	CONFIG_TYPE_BOOLEAN,	FALSE },
- #ifdef _FFR_REPLACE_RULES
-+	{ "ReplaceHeaders",		CONFIG_TYPE_STRING,	FALSE },
- 	{ "ReplaceRules",		CONFIG_TYPE_STRING,	FALSE },
- #endif /* _FFR_REPLACE_RULES */
- 	{ "ReportAddress",		CONFIG_TYPE_STRING,	FALSE },
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/opendkim/pkg/PLIST,v
diff -u -p -r1.6 PLIST
--- pkg/PLIST	8 Nov 2022 11:14:50 -0000	1.6
+++ pkg/PLIST	28 May 2026 15:57:47 -0000
@@ -42,6 +42,7 @@ share/doc/opendkim/dkim_canon_t.html
 share/doc/opendkim/dkim_cbstat.html
 share/doc/opendkim/dkim_chunk.html
 share/doc/opendkim/dkim_close.html
+share/doc/opendkim/dkim_code_to_name.html
 share/doc/opendkim/dkim_diffheaders.html
 share/doc/opendkim/dkim_dns_close.html
 share/doc/opendkim/dkim_dns_config.html
@@ -82,12 +83,18 @@ share/doc/opendkim/dkim_getsslbuf.html
 share/doc/opendkim/dkim_getuser.html
 share/doc/opendkim/dkim_header.html
 share/doc/opendkim/dkim_init.html
+share/doc/opendkim/dkim_iter_ctx.html
+share/doc/opendkim/dkim_iter_ctx_free.html
 share/doc/opendkim/dkim_key_syntax.html
 share/doc/opendkim/dkim_lib.html
 share/doc/opendkim/dkim_libfeature.html
 share/doc/opendkim/dkim_libversion.html
 share/doc/opendkim/dkim_mail_parse.html
 share/doc/opendkim/dkim_minbody.html
+share/doc/opendkim/dkim_name_to_code.html
+share/doc/opendkim/dkim_nametable.html
+share/doc/opendkim/dkim_nametable_first.html
+share/doc/opendkim/dkim_nametable_next.html
 share/doc/opendkim/dkim_ohdrs.html
 share/doc/opendkim/dkim_options.html
 share/doc/opendkim/dkim_param_t.html