From nobody Sat Dec 25 20:37:05 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8F34C1913DFF; Sat, 25 Dec 2021 20:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JLwhd25x3z3ChV; Sat, 25 Dec 2021 20:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 27BB01DC03; Sat, 25 Dec 2021 20:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BPKb5iQ000563; Sat, 25 Dec 2021 20:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BPKb5Jj000562; Sat, 25 Dec 2021 20:37:05 GMT (envelope-from git) Date: Sat, 25 Dec 2021 20:37:05 GMT Message-Id: <202112252037.1BPKb5Jj000562@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: ed253c0553af - main - mail/exim: unbreak after mail/opendmarc update (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed253c0553af2883c5d4d4d28d5cf9740f768459 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640464625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2B+rxioBofMd1IMPpljImKYi6073wG+Rq/pH5GPFR90=; b=D8528zWhX6YPZ7Kp9pVZTpUNyRxELZ62yEuafDszLqz61vIp/+qoboMbBBbvzBI/mluerA 1E1LzahPimOYClceAXoQKnOfjljaxbDWmOohOYRP3L6QtmyB3OWXklrRxCzMyD1fwgLeX4 v7ZYGV7/hLxB2nRev5Do9RRw5IktQSYf/mMViQlUArub+uYPqXiPjV0fAyUvHm/HGtTSY+ BbJwl4T/MVzmqxRf2lijSqgN/YD+zNLT6JqOh1ViFLDDcOy/Ib1Puy8Q6srSY+TOV6pcm3 3SStnPRWAW/Pql62GaKr5AkJDyeryGAJDo6y/P8XcdQZ6XQYG4Cfy1suIOT0Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640464625; a=rsa-sha256; cv=none; b=HVdp8ImmprUWaP28vFYwqnx5U6VlUMBzscTt8JxRGyFwxAWkNruQazaIDifJrDeoKd0nUn 3I01h/J2PBkqlymdsv/RCqdBZxzdj29mW4EZFlKeCp7mwpa0H755718YpbKzyWzdF/REGQ 1+RO43Bbpbn+NhgLH59dGgaSmMizqEzy3S0+K4hIxdzfghfppNi1DWKMSN6F+jTT/S2P2h fzNzJE3+KHjXY3/b4NJS0RFyD/NWOEKKGR+ZTGJ4aYBHJI5MoAxZQvZSJshPRjonzvN47m Uhtks71jrbqGOnI1mTqgaiyElbLX1GWuAMlfyrKCUtGs7YZ/fhia8HUr9jYNyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed253c0553af2883c5d4d4d28d5cf9740f768459 commit ed253c0553af2883c5d4d4d28d5cf9740f768459 Author: Dima Panov AuthorDate: 2021-12-25 20:28:18 +0000 Commit: Dima Panov CommitDate: 2021-12-25 20:28:18 +0000 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 --- mail/exim/Makefile | 2 +- mail/exim/files/patch-src-dmarc.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 3c7030a0499b..874f352e5ae3 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -2,7 +2,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= mail MASTER_SITES= EXIM:exim MASTER_SITE_SUBDIR= /exim4/:exim \ diff --git a/mail/exim/files/patch-src-dmarc.c b/mail/exim/files/patch-src-dmarc.c new file mode 100644 index 000000000000..c0054446458c --- /dev/null +++ b/mail/exim/files/patch-src-dmarc.c @@ -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)