aboutsummaryrefslogtreecommitdiff
path: root/mail/sendmail-devel/files
diff options
context:
space:
mode:
Diffstat (limited to 'mail/sendmail-devel/files')
-rw-r--r--mail/sendmail-devel/files/patch-mail.local.c8
-rw-r--r--mail/sendmail-devel/files/patch-readcf.c8
-rw-r--r--mail/sendmail-devel/files/patch-sendmail.h4
-rw-r--r--mail/sendmail-devel/files/patch-srvrsmtp.c24
-rw-r--r--mail/sendmail-devel/files/patch-usersmtp.c6
5 files changed, 25 insertions, 25 deletions
diff --git a/mail/sendmail-devel/files/patch-mail.local.c b/mail/sendmail-devel/files/patch-mail.local.c
index 191f53fb637d..d9aabc7cc080 100644
--- a/mail/sendmail-devel/files/patch-mail.local.c
+++ b/mail/sendmail-devel/files/patch-mail.local.c
@@ -1,4 +1,4 @@
---- mail.local/mail.local.c.orig 2023-04-27 10:39:42 UTC
+--- mail.local/mail.local.c.orig 2025-06-27 17:57:30 UTC
+++ mail.local/mail.local.c
@@ -154,6 +154,8 @@ bool BounceQuota = false; /* permanent error when ove
bool HoldErrs = false; /* Hold errors in ErrBuf */
@@ -83,8 +83,8 @@
notifybiff(biffmsg);
if (
-@@ -1618,9 +1630,9 @@ usage()
- ExitVal = EX_USAGE;
+@@ -1617,9 +1629,9 @@ usage()
+ {
/* XXX add U to options for USE_EAI */
#if _FFR_SPOOL_PATH
- mailerr(NULL, "usage: mail.local [-7] [-b] [-d] [-l] [-f from|-r from] [-h filename] [-p path] user ...");
@@ -93,5 +93,5 @@
- mailerr(NULL, "usage: mail.local [-7] [-b] [-d] [-l] [-f from|-r from] [-h filename] user ...");
+ mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-f from|-r from] [-h filename] user ...");
#endif
- sm_exit(ExitVal);
+ sm_exit(EX_USAGE);
}
diff --git a/mail/sendmail-devel/files/patch-readcf.c b/mail/sendmail-devel/files/patch-readcf.c
index 8fb1dbefc2c8..f388cec6b827 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 2025-04-09 08:39:43 UTC
+--- sendmail/readcf.c.orig 2025-10-23 19:33:31 UTC
+++ sendmail/readcf.c
-@@ -3206,6 +3206,10 @@ static struct optioninfo
- { "CipherSuites", O_CIPHERSUITES, OI_NONE },
+@@ -3213,6 +3213,10 @@ static struct optioninfo
+ { "SameDomainOnly", O_SAMEDOMAINONLY, OI_NONE },
#endif
+#if USE_BLACKLIST
@@ -11,7 +11,7 @@
{ NULL, '\0', OI_NONE }
};
-@@ -4941,6 +4945,12 @@ setoption(opt, val, safe, sticky, e)
+@@ -4944,6 +4948,12 @@ setoption(opt, val, safe, sticky, e)
#if _FFR_MTA_STS
case O_MTASTS:
StrictTransportSecurity = atobool(val);
diff --git a/mail/sendmail-devel/files/patch-sendmail.h b/mail/sendmail-devel/files/patch-sendmail.h
index 28ed8ba7b790..5f47cd90fcbb 100644
--- a/mail/sendmail-devel/files/patch-sendmail.h
+++ b/mail/sendmail-devel/files/patch-sendmail.h
@@ -1,4 +1,4 @@
---- sendmail/sendmail.h.orig 2025-02-05 18:32:59 UTC
+--- sendmail/sendmail.h.orig 2025-10-23 19:33:31 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>
-@@ -2781,6 +2785,10 @@ EXTERN int ConnectionRateWindowSize;
+@@ -2807,6 +2811,10 @@ EXTERN int ConnectionRateWindowSize;
#endif
EXTERN int ConnectionRateWindowSize;
diff --git a/mail/sendmail-devel/files/patch-srvrsmtp.c b/mail/sendmail-devel/files/patch-srvrsmtp.c
index 0516f9b40ca7..96f217110007 100644
--- a/mail/sendmail-devel/files/patch-srvrsmtp.c
+++ b/mail/sendmail-devel/files/patch-srvrsmtp.c
@@ -1,6 +1,6 @@
---- sendmail/srvrsmtp.c.orig 2025-04-09 08:39:43 UTC
+--- sendmail/srvrsmtp.c.orig 2025-10-20 19:09:43 UTC
+++ sendmail/srvrsmtp.c
-@@ -972,6 +972,9 @@ do \
+@@ -953,6 +953,9 @@ do \
# define SHOWCMDINREPLY(inp) inp
# define SHOWSHRTCMDINREPLY(inp) shortenstring(inp, MAXSHORTSTR)
#endif
@@ -10,7 +10,7 @@
void
smtp(nullserver, d_flags, e)
-@@ -1562,6 +1565,8 @@ smtp(nullserver, d_flags, e)
+@@ -1546,6 +1549,8 @@ smtp(nullserver, d_flags, e)
/* check if data is on the socket during the pause */
if ((tp = channel_readable(InChannel, msecs)) != NULL)
{
@@ -19,7 +19,7 @@
greetcode = "554";
nullserver = "Command rejected";
sm_syslog(LOG_INFO, e->e_id,
-@@ -1571,6 +1576,8 @@ smtp(nullserver, d_flags, e)
+@@ -1555,6 +1560,8 @@ smtp(nullserver, d_flags, e)
(int) tp->tv_sec +
(tp->tv_usec >= 500000 ? 1 : 0)
);
@@ -28,7 +28,7 @@
}
}
}
-@@ -1690,6 +1697,10 @@ smtp(nullserver, d_flags, e)
+@@ -1674,6 +1681,10 @@ smtp(nullserver, d_flags, e)
SmtpPhase = "server cmd read";
sm_setproctitle(true, e, "server %s cmd read", CurSmtpClient);
@@ -39,7 +39,7 @@
/* handle errors */
if (sm_io_error(OutChannel) ||
(p = sfgets(inp, sizeof(inp), InChannel,
-@@ -2005,8 +2016,11 @@ smtp(nullserver, d_flags, e)
+@@ -1989,8 +2000,11 @@ smtp(nullserver, d_flags, e)
#define LOGAUTHFAIL \
do \
{ \
@@ -51,7 +51,7 @@
if (LogLevel >= 9) \
sm_syslog(LOG_WARNING, e->e_id, \
"AUTH failure (%s): %s (%d) %s%s%.*s, relay=%.100s", \
-@@ -2105,6 +2119,13 @@ smtp(nullserver, d_flags, e)
+@@ -2089,6 +2103,13 @@ smtp(nullserver, d_flags, e)
case CMDEHLO:
case CMDNOOP:
case CMDRSET:
@@ -65,7 +65,7 @@
case CMDERROR:
/* process normally */
break;
-@@ -2132,6 +2153,11 @@ smtp(nullserver, d_flags, e)
+@@ -2116,6 +2137,11 @@ smtp(nullserver, d_flags, e)
#endif /* MAXBADCOMMANDS > 0 */
if (nullserver != NULL)
{
@@ -77,7 +77,7 @@
if (ISSMTPREPLY(nullserver))
{
/* Can't use ("%s", ...) due to usrerr() requirements */
-@@ -2156,6 +2182,9 @@ smtp(nullserver, d_flags, e)
+@@ -2140,6 +2166,9 @@ smtp(nullserver, d_flags, e)
DELAY_CONN("AUTH");
if (!sasl_ok || n_mechs <= 0)
{
@@ -87,7 +87,7 @@
message("503 5.3.3 AUTH not available");
break;
}
-@@ -3908,10 +3937,17 @@ smtp(nullserver, d_flags, e)
+@@ -3929,10 +3958,17 @@ smtp(nullserver, d_flags, e)
** timeouts for the same connection.
*/
@@ -105,7 +105,7 @@
if (tTd(93, 100))
{
/* return to handle next connection */
-@@ -3993,7 +4029,10 @@ smtp(nullserver, d_flags, e)
+@@ -4014,7 +4050,10 @@ smtp(nullserver, d_flags, e)
#if MAXBADCOMMANDS > 0
if (++n_badcmds > MAXBADCOMMANDS)
{
@@ -116,7 +116,7 @@
message("421 4.7.0 %s Too many bad commands; closing connection",
MyHostName);
-@@ -4047,6 +4086,9 @@ smtp(nullserver, d_flags, e)
+@@ -4068,6 +4107,9 @@ smtp(nullserver, d_flags, e)
}
#if SASL
}
diff --git a/mail/sendmail-devel/files/patch-usersmtp.c b/mail/sendmail-devel/files/patch-usersmtp.c
index c4d44cd62aed..f875ed25b342 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 2025-02-05 06:35:18 UTC
+--- sendmail/usersmtp.c.orig 2025-10-27 17:06:50 UTC
+++ sendmail/usersmtp.c
-@@ -1896,6 +1896,9 @@ attemptauth(m, mci, e, sai)
+@@ -1946,6 +1946,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),
-@@ -2041,9 +2044,11 @@ smtpauth(m, mci, e)
+@@ -2091,9 +2094,11 @@ smtpauth(m, mci, e)
do
{
result = attemptauth(m, mci, e, &(mci->mci_sai));
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-28 09:10:27 +0000