git: 94cd0af4ecc5 - main - mail/sendmail-devel: Update to 8.18.1.9
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 27 Feb 2025 06:16:01 UTC
The branch main has been updated by dinoex:
URL: https://cgit.FreeBSD.org/ports/commit/?id=94cd0af4ecc53d2ed7126d73ea634eb1f9d91998
commit 94cd0af4ecc53d2ed7126d73ea634eb1f9d91998
Author: Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2025-02-27 06:15:52 +0000
Commit: Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2025-02-27 06:15:52 +0000
mail/sendmail-devel: Update to 8.18.1.9
---
mail/sendmail-devel/Makefile | 4 ++--
mail/sendmail-devel/distinfo | 6 +++---
mail/sendmail-devel/files/patch-FreeBSD | 4 ++--
mail/sendmail-devel/files/patch-Makefile.m4 | 11 ++++++-----
mail/sendmail-devel/files/patch-mail.local.8 | 8 ++++----
mail/sendmail-devel/files/patch-mail.local.c | 4 ++--
mail/sendmail-devel/files/patch-sendmail.8 | 4 ++--
mail/sendmail-devel/files/patch-sendmail.h | 4 ++--
mail/sendmail-devel/files/patch-smrsh.8 | 4 ++--
mail/sendmail-devel/files/patch-srvrsmtp.c | 20 ++++++++++----------
mail/sendmail-devel/files/patch-usersmtp.c | 6 +++---
11 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile
index 0c1625babf05..1e1bd2fac092 100644
--- a/mail/sendmail-devel/Makefile
+++ b/mail/sendmail-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= sendmail
-PORTVERSION= 8.18.0.9
-PORTREVISION= 1
+PORTVERSION= 8.18.1.9
+PORTREVISION= 0
CATEGORIES= mail
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/
PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2}
diff --git a/mail/sendmail-devel/distinfo b/mail/sendmail-devel/distinfo
index e3e4bebdbe34..abad3668fbcd 100644
--- a/mail/sendmail-devel/distinfo
+++ b/mail/sendmail-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1706429457
-SHA256 (sendmail.8.18.0.9.tar.gz) = 01a483f54479deef2ea8150ae8c10f126d639d1613bde73681fe0aafbe8e65d7
-SIZE (sendmail.8.18.0.9.tar.gz) = 2401014
+TIMESTAMP = 1740492424
+SHA256 (sendmail.8.18.1.9.tar.gz) = 3e8b517f222d688b332999c42ed76756e8083dd107e77a82cf4a5595683bb7a2
+SIZE (sendmail.8.18.1.9.tar.gz) = 2365426
diff --git a/mail/sendmail-devel/files/patch-FreeBSD b/mail/sendmail-devel/files/patch-FreeBSD
index 291926f75d3d..8c36b92f9d51 100644
--- a/mail/sendmail-devel/files/patch-FreeBSD
+++ b/mail/sendmail-devel/files/patch-FreeBSD
@@ -1,6 +1,6 @@
---- devtools/OS/FreeBSD.orig 2021-04-05 08:49:42 UTC
+--- devtools/OS/FreeBSD.orig 2023-02-09 18:24:38 UTC
+++ devtools/OS/FreeBSD
-@@ -6,7 +6,7 @@ dnl Place personal settings in devtools/Site/site.conf
+@@ -6,7 +6,7 @@ define(`confLIBS', `-lutil')
define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
define(`confLIBS', `-lutil')
diff --git a/mail/sendmail-devel/files/patch-Makefile.m4 b/mail/sendmail-devel/files/patch-Makefile.m4
index 20c229c3fbcb..515b01ec7142 100644
--- a/mail/sendmail-devel/files/patch-Makefile.m4
+++ b/mail/sendmail-devel/files/patch-Makefile.m4
@@ -1,20 +1,21 @@
---- sendmail/Makefile.m4.orig 2021-10-27 09:01:40 UTC
+--- sendmail/Makefile.m4.orig 2025-02-05 06:35:18 UTC
+++ sendmail/Makefile.m4
-@@ -7,14 +7,15 @@ bldPRODUCT_START(`executable', `sendmail')
+@@ -7,6 +7,7 @@ define(`bldSOURCES', `main.c alias.c arpadate.c bf.c c
define(`bldBIN_TYPE', `G')
define(`bldINSTALL_DIR', `')
define(`bldSOURCES', `main.c alias.c arpadate.c bf.c collect.c conf.c control.c convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c macro.c map.c mci.c milter.c mime.c parseaddr.c queue.c ratectrl.c readcf.c recipient.c sasl.c savemail.c sched.c sfsasl.c shmticklib.c sm_resolve.c srvrsmtp.c stab.c stats.c sysexits.c timers.c tlsh.c tls.c trace.c udb.c usersmtp.c util.c version.c ')
+APPENDDEF(`bldSOURCES',`blacklist.c ')
PREPENDDEF(`confENVDEF', `confMAPDEF')
- bldPUSH_SMLIB(`sm')
- bldPUSH_SMLIB(`smutil')
+ PUSHDIVERT(3)
+ ldap.c:
+@@ -18,8 +19,8 @@ dnl hack: /etc/mail is not defined as "location of .cf
dnl hack: /etc/mail is not defined as "location of .cf" in the build system
-define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
-`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
+define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP'))
-+
++dnl
define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
`${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
)dnl
diff --git a/mail/sendmail-devel/files/patch-mail.local.8 b/mail/sendmail-devel/files/patch-mail.local.8
index 422b593ef7b2..9927785ef9aa 100644
--- a/mail/sendmail-devel/files/patch-mail.local.8
+++ b/mail/sendmail-devel/files/patch-mail.local.8
@@ -1,4 +1,4 @@
---- mail.local/mail.local.8.orig 2021-04-05 08:49:42 UTC
+--- mail.local/mail.local.8.orig 2023-02-09 18:24:38 UTC
+++ mail.local/mail.local.8
@@ -16,9 +16,9 @@ mail.local
\- store mail in a mailbox
@@ -12,7 +12,7 @@
\fIfrom\fR|\fB\-r\fR
.IR from ]
.RB [ \-h
-@@ -38,6 +38,11 @@ The options are as follows:
+@@ -38,6 +38,11 @@ Do not advertise 8BITMIME support in LMTP mode.
.B \-7
Do not advertise 8BITMIME support in LMTP mode.
.TP
@@ -24,7 +24,7 @@
.B \-b
Return a permanent error instead of a temporary error
if a mailbox exceeds quota.
-@@ -56,6 +61,13 @@ Specify the sender's name.
+@@ -56,6 +61,13 @@ Turn on LMTP mode.
.TP
.B \-l
Turn on LMTP mode.
@@ -47,7 +47,7 @@
temporary files
.TP
/var/mail/user
-@@ -131,7 +143,6 @@ lock file for a user's default mailbox
+@@ -131,7 +143,6 @@ mail(1),
.PD
.SH SEE ALSO
mail(1),
diff --git a/mail/sendmail-devel/files/patch-mail.local.c b/mail/sendmail-devel/files/patch-mail.local.c
index 3691f145e977..191f53fb637d 100644
--- a/mail/sendmail-devel/files/patch-mail.local.c
+++ b/mail/sendmail-devel/files/patch-mail.local.c
@@ -1,6 +1,6 @@
---- mail.local/mail.local.c.orig 2021-06-22 08:24:43 UTC
+--- mail.local/mail.local.c.orig 2023-04-27 10:39:42 UTC
+++ mail.local/mail.local.c
-@@ -154,6 +154,8 @@ int ExitVal = EX_OK; /* sysexits.h error value. */
+@@ -154,6 +154,8 @@ bool BounceQuota = false; /* permanent error when ove
bool HoldErrs = false; /* Hold errors in ErrBuf */
bool LMTPMode = false;
bool BounceQuota = false; /* permanent error when over quota */
diff --git a/mail/sendmail-devel/files/patch-sendmail.8 b/mail/sendmail-devel/files/patch-sendmail.8
index c7e070611c92..b3d24e22bb7b 100644
--- a/mail/sendmail-devel/files/patch-sendmail.8
+++ b/mail/sendmail-devel/files/patch-sendmail.8
@@ -1,6 +1,6 @@
---- sendmail/sendmail.8.orig 2023-02-09 18:24:38 UTC
+--- sendmail/sendmail.8.orig 2024-01-24 17:09:22 UTC
+++ sendmail/sendmail.8
-@@ -552,6 +552,11 @@ for this amount of time,
+@@ -552,6 +552,11 @@ The default is five days.
failed messages will be returned to the sender.
The default is five days.
.TP
diff --git a/mail/sendmail-devel/files/patch-sendmail.h b/mail/sendmail-devel/files/patch-sendmail.h
index 89a33cfff8a2..28ed8ba7b790 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 2023-12-05 09:53:22 UTC
+--- sendmail/sendmail.h.orig 2025-02-05 18:32:59 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>
-@@ -2734,6 +2738,10 @@ EXTERN int Hacks; /* bit field of run-time enabled "ha
+@@ -2781,6 +2785,10 @@ EXTERN int ConnectionRateWindowSize;
#endif
EXTERN int ConnectionRateWindowSize;
diff --git a/mail/sendmail-devel/files/patch-smrsh.8 b/mail/sendmail-devel/files/patch-smrsh.8
index d4061efd46c8..ab2e151a5935 100644
--- a/mail/sendmail-devel/files/patch-smrsh.8
+++ b/mail/sendmail-devel/files/patch-smrsh.8
@@ -1,6 +1,6 @@
--- smrsh/smrsh.8.orig 2023-02-09 18:24:38 UTC
+++ smrsh/smrsh.8
-@@ -39,7 +39,7 @@ Briefly,
+@@ -39,7 +39,7 @@ by default
.I smrsh
limits programs to be in a single directory,
by default
@@ -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 commands like:
+@@ -50,13 +50,12 @@ Initial pathnames on programs are stripped,
``"|exec /usr/local/bin/filter || exit 75"''
.PP
Initial pathnames on programs are stripped,
diff --git a/mail/sendmail-devel/files/patch-srvrsmtp.c b/mail/sendmail-devel/files/patch-srvrsmtp.c
index 4abe95e30b78..1bc9071e43b4 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 2024-01-25 05:27:02 UTC
+--- sendmail/srvrsmtp.c.orig 2025-02-05 06:35:18 UTC
+++ sendmail/srvrsmtp.c
-@@ -940,6 +940,9 @@ do \
+@@ -972,6 +972,9 @@ do \
# define SHOWCMDINREPLY(inp) inp
# define SHOWSHRTCMDINREPLY(inp) shortenstring(inp, MAXSHORTSTR)
#endif
@@ -10,7 +10,7 @@
void
smtp(nullserver, d_flags, e)
-@@ -1528,6 +1531,8 @@ smtp(nullserver, d_flags, e)
+@@ -1563,6 +1566,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,
-@@ -1537,6 +1542,8 @@ smtp(nullserver, d_flags, e)
+@@ -1572,6 +1577,8 @@ smtp(nullserver, d_flags, e)
(int) tp->tv_sec +
(tp->tv_usec >= 500000 ? 1 : 0)
);
@@ -28,7 +28,7 @@
}
}
}
-@@ -1655,6 +1662,10 @@ smtp(nullserver, d_flags, e)
+@@ -1691,6 +1698,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,
-@@ -1965,8 +1976,11 @@ smtp(nullserver, d_flags, e)
+@@ -2006,8 +2017,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", \
-@@ -2116,6 +2130,9 @@ smtp(nullserver, d_flags, e)
+@@ -2157,6 +2171,9 @@ smtp(nullserver, d_flags, e)
DELAY_CONN("AUTH");
if (!sasl_ok || n_mechs <= 0)
{
@@ -61,7 +61,7 @@
message("503 5.3.3 AUTH not available");
break;
}
-@@ -3841,10 +3858,17 @@ smtp(nullserver, d_flags, e)
+@@ -3894,10 +3911,17 @@ smtp(nullserver, d_flags, e)
** timeouts for the same connection.
*/
@@ -79,7 +79,7 @@
if (tTd(93, 100))
{
/* return to handle next connection */
-@@ -3926,7 +3950,10 @@ smtp(nullserver, d_flags, e)
+@@ -3979,7 +4003,10 @@ smtp(nullserver, d_flags, e)
#if MAXBADCOMMANDS > 0
if (++n_badcmds > MAXBADCOMMANDS)
{
@@ -90,7 +90,7 @@
message("421 4.7.0 %s Too many bad commands; closing connection",
MyHostName);
-@@ -3980,6 +4007,9 @@ smtp(nullserver, d_flags, e)
+@@ -4033,6 +4060,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 8fff657c2384..c4d44cd62aed 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 2023-07-27 07:12:46 UTC
+--- sendmail/usersmtp.c.orig 2025-02-05 06:35:18 UTC
+++ sendmail/usersmtp.c
-@@ -1875,6 +1875,9 @@ attemptauth(m, mci, e, sai)
+@@ -1896,6 +1896,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),
-@@ -2020,9 +2023,11 @@ smtpauth(m, mci, e)
+@@ -2041,9 +2044,11 @@ smtpauth(m, mci, e)
do
{
result = attemptauth(m, mci, e, &(mci->mci_sai));