Date: Wed, 31 Jan 2024 19:20:56 GMT From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1ad5a28c0771 - main - mail/sendmail: Update to 8.18.1 Message-ID: <202401311920.40VJKuCk040789@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ad5a28c07710f83274137278d924c7368e11c41 commit 1ad5a28c07710f83274137278d924c7368e11c41 Author: Dirk Meyer <dinoex@FreeBSD.org> AuthorDate: 2024-01-31 19:20:14 +0000 Commit: Dirk Meyer <dinoex@FreeBSD.org> CommitDate: 2024-01-31 19:20:51 +0000 mail/sendmail: Update to 8.18.1 --- mail/sendmail/Makefile | 5 +++-- mail/sendmail/distinfo | 6 +++--- mail/sendmail/files/patch-cfhead.m4 | 4 ++-- mail/sendmail/files/patch-cfproto.m4 | 24 --------------------- mail/sendmail/files/patch-daemon.c | 4 ++-- mail/sendmail/files/patch-makeinfo.sh | 4 ++-- mail/sendmail/files/patch-readcf.c | 26 +++++++++++------------ mail/sendmail/files/patch-sendmail.h | 4 ++-- mail/sendmail/files/patch-srvrsmtp.c | 40 ++++++++++++++++++++++------------- mail/sendmail/files/patch-usersmtp.c | 6 +++--- 10 files changed, 55 insertions(+), 68 deletions(-) diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index a1d607b86886..429054c70871 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail -PORTVERSION= 8.17.2 -PORTREVISION= 3 +PORTVERSION= 8.18.1 +PORTREVISION= 0 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ DISTNAME= ${PORTNAME}.${PORTVERSION} @@ -218,6 +218,7 @@ post-build: pre-install: ${MKDIR} ${STAGEDIR}/etc/mail \ + ${STAGEDIR}${PREFIX}/share/man/cat1 \ ${STAGEDIR}${PREFIX}/share/man/cat5 \ ${STAGEDIR}${PREFIX}/share/man/cat8 @${CAT} ${PKGDIR}/pkg-plist >${PLIST} diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo index 712e3b995c2e..a078e037b045 100644 --- a/mail/sendmail/distinfo +++ b/mail/sendmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685791197 -SHA256 (sendmail.8.17.2.tar.gz) = 90f5ae74c35a84808861933ba094201b901b70c6b2903684dcf39bdae8a5a1a2 -SIZE (sendmail.8.17.2.tar.gz) = 2313458 +TIMESTAMP = 1706725980 +SHA256 (sendmail.8.18.1.tar.gz) = cbf1f309c38e4806f7cf3ead24260f17d1fe8fb63256d13edb3cdd1a098f0770 +SIZE (sendmail.8.18.1.tar.gz) = 2401566 diff --git a/mail/sendmail/files/patch-cfhead.m4 b/mail/sendmail/files/patch-cfhead.m4 index 4d24bce603ea..f6c5c298072a 100644 --- a/mail/sendmail/files/patch-cfhead.m4 +++ b/mail/sendmail/files/patch-cfhead.m4 @@ -1,6 +1,6 @@ ---- cf/m4/cfhead.m4.orig 2020-05-19 19:54:31 UTC +--- cf/m4/cfhead.m4.orig 2024-01-31 06:38:32 UTC +++ cf/m4/cfhead.m4 -@@ -278,7 +278,8 @@ define(`_REC_AUTH_', `$.$?{auth_type}(authenticated') +@@ -284,7 +284,8 @@ define(`_REC_AUTH_', `$.$?{auth_type}(authenticated') define(`_REC_FULL_AUTH_', `$.$?{auth_type}(user=${auth_authen} $?{auth_author}author=${auth_author} $.mech=${auth_type}') define(`_REC_HDR_', `$?sfrom $s $.$?_($?s$|from $.$_)') define(`_REC_END_', `for $u; $|; diff --git a/mail/sendmail/files/patch-cfproto.m4 b/mail/sendmail/files/patch-cfproto.m4 deleted file mode 100644 index 7ee522401c00..000000000000 --- a/mail/sendmail/files/patch-cfproto.m4 +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 diff --git a/mail/sendmail/files/patch-daemon.c b/mail/sendmail/files/patch-daemon.c index 4d1a8cd58f89..21edf8ff4383 100644 --- a/mail/sendmail/files/patch-daemon.c +++ b/mail/sendmail/files/patch-daemon.c @@ -1,6 +1,6 @@ ---- sendmail/daemon.c.orig 2021-07-14 05:34:51 UTC +--- sendmail/daemon.c.orig 2024-01-31 06:38:32 UTC +++ sendmail/daemon.c -@@ -788,6 +788,8 @@ getrequests(e) +@@ -782,6 +782,8 @@ getrequests(e) anynet_ntoa(&RealHostAddr)); } diff --git a/mail/sendmail/files/patch-makeinfo.sh b/mail/sendmail/files/patch-makeinfo.sh index c3a668f80c76..57e13e650b76 100644 --- a/mail/sendmail/files/patch-makeinfo.sh +++ b/mail/sendmail/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 2024-01-31 06:38:32 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/files/patch-readcf.c b/mail/sendmail/files/patch-readcf.c index 67ce57ab7d99..c777f3c55f1e 100644 --- a/mail/sendmail/files/patch-readcf.c +++ b/mail/sendmail/files/patch-readcf.c @@ -1,26 +1,26 @@ ---- sendmail/readcf.c.orig 2021-07-14 05:34:51 UTC +--- sendmail/readcf.c.orig 2024-01-25 05:27:02 UTC +++ sendmail/readcf.c -@@ -3056,6 +3056,10 @@ static struct optioninfo +@@ -3208,6 +3208,10 @@ static struct optioninfo { "CipherSuites", O_CIPHERSUITES, OI_NONE }, #endif +#if USE_BLACKLIST -+# define O_BLACKLIST 0xf2 ++# define O_BLACKLIST 0xfb + { "UseBlacklist", O_BLACKLIST, OI_NONE }, +#endif { NULL, '\0', OI_NONE } }; -@@ -4795,6 +4799,12 @@ setoption(opt, val, safe, sticky, e) - break; - #endif - -+#if USE_BLACKLIST -+ case O_BLACKLIST: -+ UseBlacklist = atobool(val); +@@ -4943,6 +4947,12 @@ setoption(opt, val, safe, sticky, e) + #if _FFR_MTA_STS + case O_MTASTS: + MTASTS = atobool(val); + break; +#endif + - default: - if (tTd(37, 1)) - { ++#if USE_BLACKLIST ++ case O_BLACKLIST: ++ UseBlacklist = atobool(val); + break; + #endif + diff --git a/mail/sendmail/files/patch-sendmail.h b/mail/sendmail/files/patch-sendmail.h index 8d247ed47782..9f0c0bf3cf11 100644 --- a/mail/sendmail/files/patch-sendmail.h +++ b/mail/sendmail/files/patch-sendmail.h @@ -1,4 +1,4 @@ ---- sendmail/sendmail.h.orig 2021-07-14 05:34:51 UTC +--- sendmail/sendmail.h.orig 2024-01-31 06:38:32 UTC +++ sendmail/sendmail.h @@ -73,6 +73,10 @@ SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail. #endif @@ -11,7 +11,7 @@ #include "timers.h" #include <sm/exc.h> #include <sm/gen.h> -@@ -2655,6 +2659,10 @@ EXTERN int Hacks; /* bit field of run-time enabled "ha +@@ -2734,6 +2738,10 @@ EXTERN int Hacks; /* bit field of run-time enabled "ha #endif EXTERN int ConnectionRateWindowSize; diff --git a/mail/sendmail/files/patch-srvrsmtp.c b/mail/sendmail/files/patch-srvrsmtp.c index a20d84e3cd3e..b2d019c6f386 100644 --- a/mail/sendmail/files/patch-srvrsmtp.c +++ b/mail/sendmail/files/patch-srvrsmtp.c @@ -1,24 +1,34 @@ ---- sendmail/srvrsmtp.c.orig 2021-08-03 10:35:09 UTC +--- sendmail/srvrsmtp.c.orig 2024-01-31 06:38:32 UTC +++ sendmail/srvrsmtp.c -@@ -940,6 +940,9 @@ smtp(nullserver, d_flags, e) - #if _FFR_BADRCPT_SHUTDOWN - int n_badrcpts_adj; +@@ -940,6 +940,9 @@ do \ + # define SHOWCMDINREPLY(inp) inp + # define SHOWSHRTCMDINREPLY(inp) shortenstring(inp, MAXSHORTSTR) #endif +#ifdef USE_BLACKLIST + int saved_bl_fd; +#endif - RESET_AUTH_FAIL_LOG_USER; - SevenBitInput_Saved = SevenBitInput; -@@ -1442,6 +1445,7 @@ smtp(nullserver, d_flags, e) - (int) tp.tv_sec + - (tp.tv_usec >= 500000 ? 1 : 0) + void + smtp(nullserver, d_flags, e) +@@ -1528,6 +1531,8 @@ smtp(nullserver, d_flags, e) + /* check if data is on the socket during the pause */ + if ((tp = channel_readable(InChannel, msecs)) != NULL) + { ++ int fd; ++ + greetcode = "554"; + nullserver = "Command rejected"; + sm_syslog(LOG_INFO, e->e_id, +@@ -1537,6 +1542,8 @@ smtp(nullserver, d_flags, e) + (int) tp->tv_sec + + (tp->tv_usec >= 500000 ? 1 : 0) ); ++ fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL); + BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, fd, "pre-greeting traffic"); } } } -@@ -1544,6 +1548,10 @@ smtp(nullserver, d_flags, e) +@@ -1655,6 +1662,10 @@ smtp(nullserver, d_flags, e) SmtpPhase = "server cmd read"; sm_setproctitle(true, e, "server %s cmd read", CurSmtpClient); @@ -29,7 +39,7 @@ /* handle errors */ if (sm_io_error(OutChannel) || (p = sfgets(inp, sizeof(inp), InChannel, -@@ -1860,8 +1868,11 @@ smtp(nullserver, d_flags, e) +@@ -1965,8 +1976,11 @@ smtp(nullserver, d_flags, e) #define LOGAUTHFAIL \ do \ { \ @@ -41,7 +51,7 @@ if (LogLevel >= 9) \ sm_syslog(LOG_WARNING, e->e_id, \ "AUTH failure (%s): %s (%d) %s%s%.*s, relay=%.100s", \ -@@ -2011,6 +2022,9 @@ smtp(nullserver, d_flags, e) +@@ -2116,6 +2130,9 @@ smtp(nullserver, d_flags, e) DELAY_CONN("AUTH"); if (!sasl_ok || n_mechs <= 0) { @@ -51,7 +61,7 @@ message("503 5.3.3 AUTH not available"); break; } -@@ -3704,10 +3718,17 @@ doquit: +@@ -3841,10 +3858,17 @@ smtp(nullserver, d_flags, e) ** timeouts for the same connection. */ @@ -69,7 +79,7 @@ if (tTd(93, 100)) { /* return to handle next connection */ -@@ -3789,7 +3810,10 @@ doquit: +@@ -3926,7 +3950,10 @@ smtp(nullserver, d_flags, e) #if MAXBADCOMMANDS > 0 if (++n_badcmds > MAXBADCOMMANDS) { @@ -80,7 +90,7 @@ message("421 4.7.0 %s Too many bad commands; closing connection", MyHostName); -@@ -3843,6 +3867,9 @@ doquit: +@@ -3980,6 +4007,9 @@ smtp(nullserver, d_flags, e) } #if SASL } diff --git a/mail/sendmail/files/patch-usersmtp.c b/mail/sendmail/files/patch-usersmtp.c index 5c63c03bab75..8fff657c2384 100644 --- a/mail/sendmail/files/patch-usersmtp.c +++ b/mail/sendmail/files/patch-usersmtp.c @@ -1,6 +1,6 @@ ---- sendmail/usersmtp.c.orig 2021-07-14 05:34:51 UTC +--- sendmail/usersmtp.c.orig 2023-07-27 07:12:46 UTC +++ sendmail/usersmtp.c -@@ -1870,6 +1870,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), -@@ -2015,9 +2018,11 @@ smtpauth(m, mci, e) +@@ -2020,9 +2023,11 @@ smtpauth(m, mci, e) do { result = attemptauth(m, mci, e, &(mci->mci_sai));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401311920.40VJKuCk040789>