1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-15 03:14:23 +00:00

mail/exim: unbreak after mail/opendmarc update (+)

Last update for mail/opendmarc to 1.4.2  changes required params for
opendmarc_policy_store_dkim subroutine by introducing *dkim_selector
as pair for *domain.

Adjust exim' dmarc routines by pass NULL string as *dkim_selector to
force opendmarc subroutine go thru autodetect required selector on the fly.

This dirt'n'ugly hack will be dropped as soon as functionality will be
adjusted upstream in proper way.

Bump PORTREVISION to force rebuild.

Reported by:	ler, poudriere failure
PR:		260678
This commit is contained in:
Dima Panov 2021-12-25 23:28:18 +03:00
parent 6ba80078ea
commit ed253c0553
2 changed files with 20 additions and 1 deletions

View File

@ -2,7 +2,7 @@
PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
PORTREVISION?= 1
PORTREVISION?= 2
CATEGORIES= mail
MASTER_SITES= EXIM:exim
MASTER_SITE_SUBDIR= /exim4/:exim \

View File

@ -0,0 +1,19 @@
--- src/dmarc.c.orig 2021-04-30 12:08:21 UTC
+++ src/dmarc.c
@@ -37,6 +37,7 @@ uschar *spf_human_readable = NULL;
u_char *header_from_sender = NULL;
int history_file_status = DMARC_HIST_OK;
uschar *dkim_history_buffer= NULL;
+uschar *dkim_selector = NULL;
typedef struct dmarc_exim_p {
uschar *name;
@@ -446,7 +447,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"");
+ dkim_selector, dkim_result, US"");
DEBUG(D_receive)
debug_printf("DMARC adding DKIM sender domain = %s\n", sig->domain);
if (libdm_status != DMARC_PARSE_OKAY)