Skip to content

Commit

Permalink
mail/sendmail: Fix MTA-STS support, to local-deliverable with MTA-STS…
Browse files Browse the repository at this point in the history
… enabled

PR: 275996
Submitted by: Hiroki Sato
Submitted by: Norikatsu Shigemura
  • Loading branch information
Dirk Meyer authored and Dirk Meyer committed Dec 29, 2023
1 parent 4281b33 commit cbe669b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
2 changes: 1 addition & 1 deletion 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}
Expand Down
24 changes: 24 additions & 0 deletions 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}> <?> <! TLS_SRV_TAG> <>
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

0 comments on commit cbe669b

Please sign in to comment.