From nobody Fri Dec 29 22:28:47 2023 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 4T20Qm1bGjz55PhH; Fri, 29 Dec 2023 22:28:48 +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 4T20Ql66vpz3gXx; Fri, 29 Dec 2023 22:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703888927; 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=kTpcQC5JnjVn12YAo3OrB6hqmJzMHeMJnNXXRCiyKrI=; b=ArSjvlOzukoXcmYgSUdcIOGdNhfhHEWBSZqUzlEw8CpsHArNg//vOaY72G4fdC3jtSXLFZ CAbLz5pw8FMIbVikM9IPqzHhirWi4c6nEEPvN/DzU+OXe6J31Zv9RDLl9NxrvV3rRF+u/O ybAZhewHAzZ2clZhoE3PrRCV5QxIsht4BCTgxGU7XlH4L5h2ZnPFvb3Whtddp5oam/G2NH KsNCv79sOJyNKOBdZlo5ovH0W8wRgJtz/OqLxxFrvkhRE22GSfFqeqVW6JqzRBKJW8As3K 20KrmzyZZF/8nBYZ24OiFk5vv5PodzA+NdkOD3YjicEiOtEMEIfSiOIPS8DAxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703888927; a=rsa-sha256; cv=none; b=FrG6LVJ/lltrl0UpWSRf4IFuckyouiHVbepE6Savz4xfcG7zjmuJp35y9AOxiur7xg7XZf nJTGu+Syzr91tlZbZbFEKMhCJNXo+mmOpMRQ5X0+o1nMD8qVGjGcm2dLVGryPXDBsvd2wS FWPHcCBniyao02yI4m8Kb4pLiP48w55oBWGBvUltW4TITrhGjJtI4AzkHOTN0KH1IkPMx5 uhuBfDy3NH1AFm4JAK6iCMw/YKVuBHtFFJjpdsU0ZEvtmvSExGNrjDPx/LFZHvKJnLxQGn lCTEnijeYwQRAryQpLTETCS1gMS91BI6EalL8HdGiTPP5eJOpVNUvTTC/39Gwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703888927; 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=kTpcQC5JnjVn12YAo3OrB6hqmJzMHeMJnNXXRCiyKrI=; b=bttEtqTsx4UiInyidt3xoigzpwLSTqM2twV65WBqXK3trjzCgRXkfyWCAxmiMdPYl60JJ0 bcBjpWG7KB8ucw2RrOXoKkNESMsLg01/h2/U7VOuomuHL3hyhB1xCWBx6cSo5/KwEYb4rJ cDlMpcHhVCGaMzPVon3WyxJnjQz0tdaJVv7tkfRqKGWp6pPh0nKfRhZRhjtSCkqLLs6HiH 5qZygUiO3+pMu1Gxj84CPxLp4zPFKugCVQW8cZuIT3B0utVnNbfHiiRL72sT/XNZXtMX8M uIyhCA5BYjaTIDajoFFBvPX+N0EdZqajpDRUjkh5ndLwxFWNDfppRBcFqBERRw== 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 4T20Ql5C56z8pX; Fri, 29 Dec 2023 22:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTMSlEW007526; Fri, 29 Dec 2023 22:28:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTMSlXr007523; Fri, 29 Dec 2023 22:28:47 GMT (envelope-from git) Date: Fri, 29 Dec 2023 22:28:47 GMT Message-Id: <202312292228.3BTMSlXr007523@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: cbe669b1f9b1 - main - mail/sendmail: Fix MTA-STS support, to local-deliverable with MTA-STS enabled 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: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbe669b1f9b1c617680b20b7a3ecb1d853b75982 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbe669b1f9b1c617680b20b7a3ecb1d853b75982 commit cbe669b1f9b1c617680b20b7a3ecb1d853b75982 Author: Dirk Meyer AuthorDate: 2023-12-29 22:28:22 +0000 Commit: Dirk Meyer CommitDate: 2023-12-29 22:28:22 +0000 mail/sendmail: Fix MTA-STS support, to local-deliverable with MTA-STS enabled PR: 275996 Submitted by: Hiroki Sato Submitted by: Norikatsu Shigemura --- mail/sendmail/Makefile | 2 +- mail/sendmail/files/patch-cfproto.m4 | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index a07b2f6c3654..aa413a611cae 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail PORTVERSION= 8.17.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ DISTNAME= ${PORTNAME}.${PORTVERSION} diff --git a/mail/sendmail/files/patch-cfproto.m4 b/mail/sendmail/files/patch-cfproto.m4 new file mode 100644 index 000000000000..7ee522401c00 --- /dev/null +++ b/mail/sendmail/files/patch-cfproto.m4 @@ -0,0 +1,24 @@ +--- cf/m4/proto.m4.orig 2023-02-09 18:24:38 UTC ++++ cf/m4/proto.m4 +@@ -2888,10 +2888,6 @@ R$* $: $(macro {saved_verify} $@ $1 $) $1') + R$* $| $* $: $1', `dnl') + ifdef(`_TLS_FAILURES_',`dnl + R$* $: $(macro {saved_verify} $@ $1 $) $1') +-ifdef(`_MTA_STS_', `dnl +-R$* $: $1 $| $>"STS_secure" $1 +-R$* $| $#$* $#$2 +-R$* $| $* $: $1', `dnl') + ifdef(`_ACCESS_TABLE_', `dnl + dnl store name of other side + R$* $: $(macro {TLS_Name} $@ $&{server_name} $) $1 +@@ -2899,6 +2895,10 @@ R$* $| $* $: $1 $| <$(access TLS_SRV_TAG`'_TAG_DELI + R$* $| $* $: $1 $| $>A <$&{server_addr}> <> + dnl do a default lookup: just TLS_SRV_TAG + R$* $| $* $: $1 $| <$(access TLS_SRV_TAG`'_TAG_DELIM_ $: ? $)> ++ifdef(`_MTA_STS_', `dnl ++R$* $: $1 $| $>"STS_secure" $1 ++R$* $| $#$* $#$2 ++R$* $| $* $: $1', `dnl') + ifdef(`_ATMPF_', `dnl tempfail? + R$* $| <$* _ATMPF_> $#error $@ 4.3.0 $: _TMPFMSG_(`TS')', `dnl') + R$* $@ $>"TLS_connection" $1', `dnl