From 769283eb4e8b95dead55a860c16ed431090ec4fb Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 4 May 2021 15:48:53 +0000
Subject: [PATCH] exim: add a patch from maintainer to workaround API change in
 opendmarc

---
 mail/exim/Makefile                  |  3 ++-
 mail/exim/patches/patch-src_dmarc_c | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 mail/exim/patches/patch-src_dmarc_c

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 751f3333678..86c299bf9d0 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.134 2021/05/04 13:49:04 sthen Exp $
+# $OpenBSD: Makefile,v 1.135 2021/05/04 15:48:53 sthen Exp $
 
 COMMENT-main =		flexible mail transfer agent
 COMMENT-eximon =	X11 monitor tool for Exim MTA
@@ -8,6 +8,7 @@ DISTNAME =		exim-${VERSION}
 PKGNAME-main =		exim-${VERSION}
 FULLPKGNAME-eximon =	exim-eximon-${VERSION}
 FULLPKGPATH-eximon =	${PKGPATH},-eximon
+REVISION-main =		0
 
 CATEGORIES =		mail
 
diff --git a/mail/exim/patches/patch-src_dmarc_c b/mail/exim/patches/patch-src_dmarc_c
new file mode 100644
index 00000000000..272658cb22a
--- /dev/null
+++ b/mail/exim/patches/patch-src_dmarc_c
@@ -0,0 +1,17 @@
+$OpenBSD: patch-src_dmarc_c,v 1.1 2021/05/04 15:48:53 sthen Exp $
+
+patch around opendmarc API change introduced in
+https://github.com/trusteddomainproject/OpenDMARC/commit/dbd87868f2ca9c2ef11529cd757d1cc5ab228833
+
+Index: src/dmarc.c
+--- src/dmarc.c.orig
++++ src/dmarc.c
+@@ -446,7 +446,7 @@ if (!dmarc_abort && !sender_host_authenticated)
+ 		  vs == PDKIM_VERIFY_INVALID ? DMARC_POLICY_DKIM_OUTCOME_TMPFAIL :
+ 		  DMARC_POLICY_DKIM_OUTCOME_NONE;
+     libdm_status = opendmarc_policy_store_dkim(dmarc_pctx, US sig->domain,
+-					       dkim_result, US"");
++					       sig->selector, dkim_result, US"");
+     DEBUG(D_receive)
+       debug_printf("DMARC adding DKIM sender domain = %s\n", sig->domain);
+     if (libdm_status != DMARC_PARSE_OKAY)