Attachment #248773 for bug #277319

Lines 1-6 Link Here

(-)b/mail/opendkim/Makefile (-2 / +2 lines)
1	PORTNAME= opendkim	1	PORTNAME= opendkim
2	PORTVERSION= 2.10.3	2	PORTVERSION= 2.10.3
3	PORTREVISION= 16	3	PORTREVISION= 17
4	CATEGORIES= mail security	4	CATEGORIES= mail security
5	MASTER_SITES= SF/${PORTNAME} \	5	MASTER_SITES= SF/${PORTNAME} \
6	SF/${PORTNAME}/Previous%20Releases \	6	SF/${PORTNAME}/Previous%20Releases \
Lines 70-76 LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb Link Here
70		70
71	LUA_DESC= Describe filter policy with lua	71	LUA_DESC= Describe filter policy with lua
72	LUA_CONFIGURE_WITH= lua	72	LUA_CONFIGURE_WITH= lua
73	LUA_USES= lua	73	LUA_USES= lua:-53
74		74
75	MEMCACHED_DESC= Use memcached as a data set	75	MEMCACHED_DESC= Use memcached as a data set
76	MEMCACHED_CONFIGURE_WITH= libmemcached	76	MEMCACHED_CONFIGURE_WITH= libmemcached




commit 7c70ee7c86da1cecc621182355cc950d3b193314
Author: David Bürgin <dbuergin@gluet.ch>
Date:   Sat Oct 14 09:19:37 2023 +0200

    Delete Authentication-Results headers in reverse

diff --git opendkim/opendkim.c opendkim/opendkim.c
index 803f37b0..cfa5f018 100644
--- opendkim/opendkim.c
+++ opendkim/opendkim.c
@@ -13653,8 +13653,15 @@ mlfi_eom(SMFICTX *ctx)
 			return SMFIS_TEMPFAIL;
 		}
 
-		c = 0;
+		c = 1;
+
 		for (hdr = dfc->mctx_hqhead; hdr != NULL; hdr = hdr->hdr_next)
+		{
+			if (strcasecmp(hdr->hdr_hdr, AUTHRESULTSHDR) == 0)
+				c++;
+		}
+
+		for (hdr = dfc->mctx_hqtail; hdr != NULL; hdr = hdr->hdr_prev)
 		{
 			memset(ares, '\0', sizeof(struct authres));
 
@@ -13666,7 +13673,7 @@ mlfi_eom(SMFICTX *ctx)
 				char *slash;
 
 				/* remember index */
-				c++;
+				c--;
 
 				/* parse the header */
 				arstat = ares_parse((u_char *) hdr->hdr_val,

Return to bug 277319

Added Link Here

(-)b/mail/opendkim/files/patch-opendkim_opendkim.c (+36 lines)
1	commit 7c70ee7c86da1cecc621182355cc950d3b193314
2	Author: David Bürgin <dbuergin@gluet.ch>
3	Date: Sat Oct 14 09:19:37 2023 +0200
4
5	Delete Authentication-Results headers in reverse
6
7	diff --git opendkim/opendkim.c opendkim/opendkim.c
8	index 803f37b0..cfa5f018 100644
9	--- opendkim/opendkim.c
10	+++ opendkim/opendkim.c
11	@@ -13653,8 +13653,15 @@ mlfi_eom(SMFICTX *ctx)
12	return SMFIS_TEMPFAIL;
13	}
14
15	- c = 0;
16	+ c = 1;
17	+
18	for (hdr = dfc->mctx_hqhead; hdr != NULL; hdr = hdr->hdr_next)
19	+ {
20	+ if (strcasecmp(hdr->hdr_hdr, AUTHRESULTSHDR) == 0)
21	+ c++;
22	+ }
23	+
24	+ for (hdr = dfc->mctx_hqtail; hdr != NULL; hdr = hdr->hdr_prev)
25	{
26	memset(ares, '\0', sizeof(struct authres));
27
28	@@ -13666,7 +13673,7 @@ mlfi_eom(SMFICTX *ctx)
29	char *slash;
30
31	/* remember index */
32	- c++;
33	+ c--;
34
35	/* parse the header */
36	arstat = ares_parse((u_char *) hdr->hdr_val,