From nobody Fri Dec 29 22:27:39 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 4T20PS1RzWz55PkF; Fri, 29 Dec 2023 22:27:40 +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 4T20PS0zzdz3gV8; Fri, 29 Dec 2023 22:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703888860; 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=5GHHZWhCdpbFKBHKXdfU/cjABSyLMOvtgzE5tvb1vqs=; b=Ygq6meHGX8zmYznkwhbhHZs3eGEiRTCWMUIu09Ci2PsKZ5YO62YAWF2mK4rH6XW+9CKLz3 gkT+HOBKHJ6jgecnj71tx4HZkx/UQo1XdW+oTrZJRtoxdKw4pEa3NXl0CyI/q4xtrA6Dki OROxXdLM+u1LFhw82sKldp6VWBHP2k/GaARb6miaIfb76KSKqLY/aL87oetH7MON6YXhCX 3VtdcWsCZu5eN3XRk7FotT3t6PpeP26oVndH45y54jETvmjTbkOu3QQ7755xftgyLzWguO pKJv+PhiyhLdCSBzqHoRRFW9g6cPp1zm5UKcmck+jvyIWSLw6Z8xirUKzTX0xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703888860; a=rsa-sha256; cv=none; b=s0Dtu5DlD17fuLSaugnoCm5BPrbzOeL0Sidqx2BSnS09F9F+xwPDvV4QDF3+JkJMuJxC/C 3k9/6lwW+O3mRYndJWxqKMrKEMRp8T1keG5/3wNj7E2K4golPfKb0wFoD7hh7pR28TDVJB vypIvlFx41SiVahXBx/9EJEoAXcGXdZZMhOhUpN2PGBBPQ5X2WbKToMyS8v4ZLLQadDlCY mHXVvabWtrC+xEqtrweoGFY0UEmGfgouNo1ithAmi00P8nubT50iYQMAiX3e4IRYV5GPTz lTe3Ve6R9pTLcoWpRl2CIBD5vqz6mLdJhq0uitLP+rAmgXqjn3zAiMggGil6Zg== 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=1703888860; 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=5GHHZWhCdpbFKBHKXdfU/cjABSyLMOvtgzE5tvb1vqs=; b=sK8gW6BO26Qa/YDpU23BAVc0Gp6AFRBzAqNJoRX2ge7oU53ZjGWEN97DNzjFVMseamTYkd oYlYFJHBFunuP+i4wcggUemfR89vKECR9goikhXDhOb2BysIcuIMI9j9St3XGalNeNOkMD /NQa3IOscSNYH06SKF608WcMyv6fNtgw1nEu7oJdIzudpdWYStSi8k8BPaBH6ZySUM/QRV 60Jl24Mj58I7upGFcOd0m6luClGADoviqwhqCI65ROYJlw3JIfP7CttVW+7VHLEJKolvgh FwUcHiQCC/5ZtpSR8aePLnbcFKULVgWv11k0yI2aJRvbf1uJ2fTT+pJyrWmm3A== 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 4T20PR72R9z8dW; Fri, 29 Dec 2023 22:27:39 +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 3BTMRdji007231; Fri, 29 Dec 2023 22:27:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTMRdt1007228; Fri, 29 Dec 2023 22:27:39 GMT (envelope-from git) Date: Fri, 29 Dec 2023 22:27:39 GMT Message-Id: <202312292227.3BTMRdt1007228@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: 4281b33b63ee - main - l/sendmaili-devel: 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: 4281b33b63ee7666da9177cefd1c55e08a74e034 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=4281b33b63ee7666da9177cefd1c55e08a74e034 commit 4281b33b63ee7666da9177cefd1c55e08a74e034 Author: Dirk Meyer AuthorDate: 2023-12-29 22:23:07 +0000 Commit: Dirk Meyer CommitDate: 2023-12-29 22:27:29 +0000 l/sendmaili-devel: Fix MTA-STS support, to local-deliverable with MTA-STS enabled PR: 275996 Submitted by: Hiroki Sato Submitted by: Norikatsu Shigemura --- mail/sendmail-devel/Makefile | 2 +- mail/sendmail-devel/files/patch-cfproto.m4 | 24 ++++++++++++++++++++++++ mail/sendmail-devel/files/patch-cfsts.m4 | 6 +++--- mail/sendmail-devel/files/patch-daemon.c | 4 ++-- mail/sendmail-devel/files/patch-makeinfo.sh | 4 ++-- mail/sendmail-devel/files/patch-readcf.c | 8 ++++---- mail/sendmail-devel/files/patch-sendmail.8 | 8 ++++---- mail/sendmail-devel/files/patch-smrsh.8 | 4 ++-- mail/sendmail-devel/files/patch-usersmtp.c | 6 +++--- 9 files changed, 45 insertions(+), 21 deletions(-) diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile index b314b26062e2..cba3642cc08a 100644 --- a/mail/sendmail-devel/Makefile +++ b/mail/sendmail-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail PORTVERSION= 8.18.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/ PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2} diff --git a/mail/sendmail-devel/files/patch-cfproto.m4 b/mail/sendmail-devel/files/patch-cfproto.m4 new file mode 100644 index 000000000000..be4f25c23264 --- /dev/null +++ b/mail/sendmail-devel/files/patch-cfproto.m4 @@ -0,0 +1,24 @@ +--- cf/m4/proto.m4.orig 2023-10-27 05:47:26 UTC ++++ cf/m4/proto.m4 +@@ -2912,10 +2912,6 @@ R$* $| $#$* $#$2 + 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 +@@ -2923,6 +2919,10 @@ R$* $: $1 $| $>D <$&{server_name}> $* $: $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 diff --git a/mail/sendmail-devel/files/patch-cfsts.m4 b/mail/sendmail-devel/files/patch-cfsts.m4 index d72176c43a21..e19862f44f67 100644 --- a/mail/sendmail-devel/files/patch-cfsts.m4 +++ b/mail/sendmail-devel/files/patch-cfsts.m4 @@ -1,6 +1,6 @@ ---- cf/feature/sts.m4.orig 2021-06-08 04:03:56.000000000 +0900 -+++ cf/feature/sts.m4 2022-02-24 21:30:48.072162000 +0900 -@@ -15,5 +15,5 @@ +--- cf/feature/sts.m4.orig 2023-02-09 18:24:38 UTC ++++ cf/feature/sts.m4 +@@ -15,5 +15,5 @@ ifelse(_ARG2_,`NO_SAN_TST',`',`define(`_STS_SAN', `1') LOCAL_CONFIG O StrictTransportSecurity=true ifelse(_ARG2_,`NO_SAN_TST',`',`O SetCertAltnames=true') diff --git a/mail/sendmail-devel/files/patch-daemon.c b/mail/sendmail-devel/files/patch-daemon.c index e734caee8c77..6b5cdca95e77 100644 --- a/mail/sendmail-devel/files/patch-daemon.c +++ b/mail/sendmail-devel/files/patch-daemon.c @@ -1,6 +1,6 @@ ---- sendmail/daemon.c.orig 2021-06-22 08:24:43 UTC +--- sendmail/daemon.c.orig 2023-10-27 05:47:26 UTC +++ sendmail/daemon.c -@@ -775,6 +775,8 @@ getrequests(e) +@@ -782,6 +782,8 @@ getrequests(e) anynet_ntoa(&RealHostAddr)); } diff --git a/mail/sendmail-devel/files/patch-makeinfo.sh b/mail/sendmail-devel/files/patch-makeinfo.sh index c3a668f80c76..e42244545186 100644 --- a/mail/sendmail-devel/files/patch-makeinfo.sh +++ b/mail/sendmail-devel/files/patch-makeinfo.sh @@ -1,4 +1,4 @@ ---- cf/sh/makeinfo.sh.orig 2014-03-05 00:59:45 UTC +--- cf/sh/makeinfo.sh.orig 2023-02-09 18:24:38 UTC +++ cf/sh/makeinfo.sh @@ -52,7 +52,7 @@ then else @@ -8,4 +8,4 @@ +echo '#####' built by $user@$host on `LC_TIME=C date` echo '#####' in `pwd` | sed 's/\/tmp_mnt//' echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//' - echo "define(\`__HOST__', $host)dnl" + echo "define(\`__HOST__', \`$host')dnl" diff --git a/mail/sendmail-devel/files/patch-readcf.c b/mail/sendmail-devel/files/patch-readcf.c index 2753468c16d7..2318f6a19842 100644 --- a/mail/sendmail-devel/files/patch-readcf.c +++ b/mail/sendmail-devel/files/patch-readcf.c @@ -1,7 +1,7 @@ ---- sendmail/readcf.c.orig 2019-02-15 10:30:19 UTC +--- sendmail/readcf.c.orig 2023-12-19 05:29:19 UTC +++ sendmail/readcf.c -@@ -2988,6 +2988,10 @@ static struct optioninfo - { "ClientCACertPath", O_CLTCACERTPATH, OI_NONE }, +@@ -3208,6 +3208,10 @@ static struct optioninfo + { "CipherSuites", O_CIPHERSUITES, OI_NONE }, #endif +#if USE_BLACKLIST @@ -11,7 +11,7 @@ { NULL, '\0', OI_NONE } }; -@@ -4661,6 +4665,12 @@ setoption(opt, val, safe, sticky, e) +@@ -4946,6 +4950,12 @@ setoption(opt, val, safe, sticky, e) break; #endif diff --git a/mail/sendmail-devel/files/patch-sendmail.8 b/mail/sendmail-devel/files/patch-sendmail.8 index 447c4dd7cdb5..c7e070611c92 100644 --- a/mail/sendmail-devel/files/patch-sendmail.8 +++ b/mail/sendmail-devel/files/patch-sendmail.8 @@ -1,7 +1,7 @@ ---- sendmail/sendmail.8.orig 2014-06-13 14:57:59 UTC +--- sendmail/sendmail.8.orig 2023-02-09 18:24:38 UTC +++ sendmail/sendmail.8 -@@ -537,6 +537,11 @@ for this amount of time, - failed messages will be returned to the sender. +@@ -552,6 +552,11 @@ for this amount of time, + failed messages will be returned to the sender. The default is five days. .TP +UseBlacklist @@ -11,4 +11,4 @@ +.TP .RI UserDatabaseSpec= userdatabase If set, a user database is consulted to get forwarding information. - You can consider this an adjunct to the aliasing mechanism, + You can consider this an adjunct to the aliasing mechanism, diff --git a/mail/sendmail-devel/files/patch-smrsh.8 b/mail/sendmail-devel/files/patch-smrsh.8 index 5ca6c4c08f98..d4061efd46c8 100644 --- a/mail/sendmail-devel/files/patch-smrsh.8 +++ b/mail/sendmail-devel/files/patch-smrsh.8 @@ -1,4 +1,4 @@ ---- smrsh/smrsh.8.orig 2014-03-05 00:59:45 UTC +--- smrsh/smrsh.8.orig 2023-02-09 18:24:38 UTC +++ smrsh/smrsh.8 @@ -39,7 +39,7 @@ Briefly, .I smrsh @@ -9,7 +9,7 @@ allowing the system administrator to choose the set of acceptable commands, and to the shell builtin commands ``exec'', ``exit'', and ``echo''. It also rejects any commands with the characters -@@ -50,13 +50,12 @@ It allows ``||'' and ``&&'' to enable co +@@ -50,13 +50,12 @@ It allows ``||'' and ``&&'' to enable commands like: ``"|exec /usr/local/bin/filter || exit 75"'' .PP Initial pathnames on programs are stripped, diff --git a/mail/sendmail-devel/files/patch-usersmtp.c b/mail/sendmail-devel/files/patch-usersmtp.c index a50a11f3787e..8fff657c2384 100644 --- a/mail/sendmail-devel/files/patch-usersmtp.c +++ b/mail/sendmail-devel/files/patch-usersmtp.c @@ -1,6 +1,6 @@ ---- sendmail/usersmtp.c.orig 2014-12-05 15:42:28 UTC +--- sendmail/usersmtp.c.orig 2023-07-27 07:12:46 UTC +++ sendmail/usersmtp.c -@@ -1825,6 +1825,9 @@ attemptauth(m, mci, e, sai) +@@ -1875,6 +1875,9 @@ attemptauth(m, mci, e, sai) if (saslresult != SASL_OK && saslresult != SASL_CONTINUE) { @@ -10,7 +10,7 @@ if (tTd(95, 5)) sm_dprintf("AUTH FAIL=%s (%d)\n", sasl_errstring(saslresult, NULL, NULL), -@@ -1970,9 +1973,11 @@ smtpauth(m, mci, e) +@@ -2020,9 +2023,11 @@ smtpauth(m, mci, e) do { result = attemptauth(m, mci, e, &(mci->mci_sai));