Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Aug 2021 09:52:37 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: 7a1aa2b266a3 - main - mail/sendmail-devel: Update to 8.17.1
Message-ID:  <202108190952.17J9qb20015714@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=7a1aa2b266a3b4e48e6278297a3e771f8b3c949c

commit 7a1aa2b266a3b4e48e6278297a3e771f8b3c949c
Author:     Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2021-08-19 09:52:11 +0000
Commit:     Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2021-08-19 09:52:11 +0000

    mail/sendmail-devel: Update to 8.17.1
---
 mail/sendmail/Makefile                      |  4 +-
 mail/sendmail/distinfo                      |  6 +--
 mail/sendmail/files/patch-daemon.c          |  4 +-
 mail/sendmail/files/patch-mail.local.8      |  4 +-
 mail/sendmail/files/patch-mail.local.c      | 60 ++++++++++++++---------------
 mail/sendmail/files/patch-notify.c          | 26 -------------
 mail/sendmail/files/patch-readcf.c          | 16 ++++----
 mail/sendmail/files/patch-sendmail.8        |  8 ++--
 mail/sendmail/files/patch-sendmail.h        |  8 ++--
 mail/sendmail/files/patch-srvrsmtp.c        | 18 ++++-----
 mail/sendmail/files/patch-usersmtp.c        |  6 +--
 mail/sendmail/files/site.config.m4.smtputf8 |  4 +-
 12 files changed, 69 insertions(+), 95 deletions(-)

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 55d2588df2c5..f28c8155c635 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sendmail
-PORTVERSION=	8.16.1
-PORTREVISION=	4
+PORTVERSION=	8.17.1
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index 3d9052cba9a7..cc56819d26a9 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593954526
-SHA256 (sendmail.8.16.1.tar.gz) = 7886d5dc4b436b86175f32b5b9c7305c80787749847e2909bf99123ecc4e64ba
-SIZE (sendmail.8.16.1.tar.gz) = 2236402
+TIMESTAMP = 1629273011
+SHA256 (sendmail.8.17.1.tar.gz) = 04bc76b6c886e6d111be7fd8daa32b8ce00128a288b6b52e067bc29f3854a6e6
+SIZE (sendmail.8.17.1.tar.gz) = 2284027
diff --git a/mail/sendmail/files/patch-daemon.c b/mail/sendmail/files/patch-daemon.c
index a0a223365692..4d1a8cd58f89 100644
--- a/mail/sendmail/files/patch-daemon.c
+++ b/mail/sendmail/files/patch-daemon.c
@@ -1,6 +1,6 @@
---- sendmail/daemon.c.orig	2015-02-28 00:50:03 UTC
+--- sendmail/daemon.c.orig	2021-07-14 05:34:51 UTC
 +++ sendmail/daemon.c
-@@ -754,6 +754,8 @@ getrequests(e)
+@@ -788,6 +788,8 @@ getrequests(e)
  						anynet_ntoa(&RealHostAddr));
  			}
  
diff --git a/mail/sendmail/files/patch-mail.local.8 b/mail/sendmail/files/patch-mail.local.8
index f8cbe1618c06..422b593ef7b2 100644
--- a/mail/sendmail/files/patch-mail.local.8
+++ b/mail/sendmail/files/patch-mail.local.8
@@ -1,4 +1,4 @@
---- mail.local/mail.local.8.orig	2014-03-05 00:59:45 UTC
+--- mail.local/mail.local.8.orig	2021-04-05 08:49:42 UTC
 +++ mail.local/mail.local.8
 @@ -16,9 +16,9 @@ mail.local
  \- store mail in a mailbox
@@ -38,7 +38,7 @@
  .TP 
  .BI \-r " from"
  Specify the sender's name (for backward compatibility).
-@@ -120,7 +132,7 @@ Used to set the appropriate time zone on
+@@ -120,7 +132,7 @@ Used to set the appropriate time zone on the timestamp
  .SH FILES
  .PD 0.2v
  .TP 2.2i
diff --git a/mail/sendmail/files/patch-mail.local.c b/mail/sendmail/files/patch-mail.local.c
index dc0870d26581..3691f145e977 100644
--- a/mail/sendmail/files/patch-mail.local.c
+++ b/mail/sendmail/files/patch-mail.local.c
@@ -1,6 +1,6 @@
---- mail.local/mail.local.c.orig	2020-04-30 11:52:48 UTC
+--- mail.local/mail.local.c.orig	2021-06-22 08:24:43 UTC
 +++ mail.local/mail.local.c
-@@ -153,6 +153,8 @@ int	ExitVal = EX_OK;		/* sysexits.h error value. */
+@@ -154,6 +154,8 @@ int	ExitVal = EX_OK;		/* sysexits.h error value. */
  bool	HoldErrs = false;		/* Hold errors in ErrBuf */
  bool	LMTPMode = false;
  bool	BounceQuota = false;		/* permanent error when over quota */
@@ -9,23 +9,23 @@
  bool	CloseMBDB = false;
  char	*HomeMailFile = NULL;		/* store mail in homedir */
  
-@@ -234,12 +236,12 @@ main(argc, argv)
- 		sm_exit(EX_CONFIG);
- 	}
+@@ -237,12 +239,12 @@ main(argc, argv)
+ 
+ 	/* HACK: add U to all options - this should be only for USE_EAI */
  #if HASHSPOOL
--	while ((ch = getopt(argc, argv, "7bdD:f:h:r:lH:p:n")) != -1)
-+	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lsH:p:n")) != -1)
+-	while ((ch = getopt(argc, argv, "7bdD:f:h:r:lH:p:nUV")) != -1)
++	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lH:p:nUV")) != -1)
  #else /* HASHSPOOL */
- #  if _FFR_SPOOL_PATH
--	while ((ch = getopt(argc, argv, "7bdD:f:h:r:lp:")) != -1)
-+	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lsp:")) != -1)
- #  else
--	while ((ch = getopt(argc, argv, "7bdD:f:h:r:l")) != -1)
-+	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:ls")) != -1)
- #  endif
+ # if _FFR_SPOOL_PATH
+-	while ((ch = getopt(argc, argv, "7bdD:f:h:r:lp:UV")) != -1)
++	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lp:UV")) != -1)
+ # else
+-	while ((ch = getopt(argc, argv, "7bdD:f:h:r:lUV")) != -1)
++	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lUV")) != -1)
+ # endif
  #endif /* HASHSPOOL */
  	{
-@@ -249,6 +251,10 @@ main(argc, argv)
+@@ -252,6 +254,10 @@ main(argc, argv)
  			EightBitMime = false;
  			break;
  
@@ -36,9 +36,9 @@
  		  case 'b':		/* bounce mail when over quota. */
  			BounceQuota = true;
  			break;
-@@ -342,6 +348,10 @@ main(argc, argv)
+@@ -361,6 +367,10 @@ main(argc, argv)
+ #endif
  			break;
- #endif /* HASHSPOOL || _FFR_SPOOL_PATH */
  
 +		  case 's':
 +			NoFsync = true;
@@ -47,7 +47,7 @@
  		  case '?':
  		  default:
  			usage();
-@@ -351,7 +361,8 @@ main(argc, argv)
+@@ -370,7 +380,8 @@ main(argc, argv)
  	argv += optind;
  
  	/* initialize biff structures */
@@ -57,7 +57,7 @@
  
  	err = sm_mbdb_initialize(mbdbname);
  	if (err != EX_OK)
-@@ -1273,6 +1284,7 @@ tryagain:
+@@ -1300,6 +1311,7 @@ tryagain:
  
  	/* Get the starting offset of the new message */
  	curoff = lseek(mbfd, (off_t) 0, SEEK_END);
@@ -65,16 +65,16 @@
  	(void) sm_snprintf(biffmsg, sizeof(biffmsg), "%s@%lld\n",
  			   name, (LONGLONG_T) curoff);
  
-@@ -1335,7 +1347,7 @@ tryagain:
+@@ -1362,7 +1374,7 @@ tryagain:
  	}
  
  	/* Flush to disk, don't wait for update. */
 -	if (fsync(mbfd) < 0)
 +	if (!NoFsync && fsync(mbfd) < 0)
  	{
- 		mailerr("450 4.2.0", "%s: %s", path, sm_errstring(errno));
+ 		mailerr("450 4.2.0", "Sync %s: %s", path, sm_errstring(errno));
  err3:
-@@ -1402,7 +1414,7 @@ err0:		(void) setreuid(0, 0);
+@@ -1433,7 +1445,7 @@ err0:
  		/* Attempt to truncate back to pre-write size */
  		goto err3;
  	}
@@ -82,16 +82,16 @@
 +	else if (!NoBiff)
  		notifybiff(biffmsg);
  
- 	if (setreuid(0, 0) < 0)
-@@ -1582,9 +1594,9 @@ usage()
- {
+ 	if (
+@@ -1618,9 +1630,9 @@ usage()
  	ExitVal = EX_USAGE;
- # if _FFR_SPOOL_PATH
+ 	/* 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 ...");
-+	mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-s] [-f from|-r from] [-h filename] [-p path] user ...");
- # else
++	mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-f from|-r from] [-h filename] [-p path] user ...");
+ #else
 -	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] [-s] [-f from|-r from] [-h filename] user ...");
- # endif
++	mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-f from|-r from] [-h filename] user ...");
+ #endif
  	sm_exit(ExitVal);
  }
diff --git a/mail/sendmail/files/patch-notify.c b/mail/sendmail/files/patch-notify.c
deleted file mode 100644
index 49bdc25fe130..000000000000
--- a/mail/sendmail/files/patch-notify.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- libsm/notify.c.orig	2020-05-19 19:54:32 UTC
-+++ libsm/notify.c
-@@ -10,11 +10,6 @@
- 
- #include <sm/gen.h>
- 
--#include <sm/conf.h>	/* FDSET_CAST */
--#include <sm/fdset.h>
--#include <sm/assert.h>
--#include <sm/notify.h>
--
- #include <sys/types.h>
- #include <signal.h>
- #include <stdio.h>
-@@ -24,6 +19,11 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <string.h>	/* for memset() */
-+
-+#include <sm/conf.h>	/* FDSET_CAST */
-+#include <sm/fdset.h>
-+#include <sm/assert.h>
-+#include <sm/notify.h>
- 
- #if SM_NOTIFY_DEBUG
- #define SM_DBG(p)	fprintf p
diff --git a/mail/sendmail/files/patch-readcf.c b/mail/sendmail/files/patch-readcf.c
index 3eb727ec8127..67ce57ab7d99 100644
--- a/mail/sendmail/files/patch-readcf.c
+++ b/mail/sendmail/files/patch-readcf.c
@@ -1,7 +1,7 @@
---- sendmail/readcf.c.orig	2020-06-02 09:41:43 UTC
+--- sendmail/readcf.c.orig	2021-07-14 05:34:51 UTC
 +++ sendmail/readcf.c
-@@ -2979,6 +2979,10 @@ static struct optioninfo
- 	{ "SetCertAltnames",			O_CHECKALTNAMES, OI_NONE },
+@@ -3056,6 +3056,10 @@ static struct optioninfo
+ 	{ "CipherSuites",		O_CIPHERSUITES,	OI_NONE	},
  #endif
  
 +#if USE_BLACKLIST
@@ -11,16 +11,16 @@
  	{ NULL,				'\0',		OI_NONE	}
  };
  
-@@ -4678,6 +4682,12 @@ setoption(opt, val, safe, sticky, e)
- 		SetCertAltnames = atobool(val);
+@@ -4795,6 +4799,12 @@ setoption(opt, val, safe, sticky, e)
  		break;
- # endif
-+
+ #endif
+ 
 +#if USE_BLACKLIST
 +	  case O_BLACKLIST:
 +		UseBlacklist = atobool(val);
 +		break;
 +#endif
- 
++
  	  default:
  		if (tTd(37, 1))
+ 		{
diff --git a/mail/sendmail/files/patch-sendmail.8 b/mail/sendmail/files/patch-sendmail.8
index 447c4dd7cdb5..57d6bf42590c 100644
--- a/mail/sendmail/files/patch-sendmail.8
+++ b/mail/sendmail/files/patch-sendmail.8
@@ -1,7 +1,7 @@
---- sendmail/sendmail.8.orig	2014-06-13 14:57:59 UTC
+--- sendmail/sendmail.8.orig	2021-07-14 05:34:51 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/files/patch-sendmail.h b/mail/sendmail/files/patch-sendmail.h
index 311efa6e5e43..8d247ed47782 100644
--- a/mail/sendmail/files/patch-sendmail.h
+++ b/mail/sendmail/files/patch-sendmail.h
@@ -1,6 +1,6 @@
---- sendmail/sendmail.h.orig	2020-07-02 05:00:37 UTC
+--- sendmail/sendmail.h.orig	2021-07-14 05:34:51 UTC
 +++ sendmail/sendmail.h
-@@ -63,6 +63,10 @@ SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail.
+@@ -73,6 +73,10 @@ SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail.
  #endif
  
  #include "bf.h"
@@ -10,8 +10,8 @@
 +#include "blacklist_client.h"
  #include "timers.h"
  #include <sm/exc.h>
- #include <sm/heap.h>
-@@ -2575,6 +2579,10 @@ EXTERN int Hacks;	/* bit field of run-time enabled "ha
+ #include <sm/gen.h>
+@@ -2655,6 +2659,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 68a6cc63e15f..a20d84e3cd3e 100644
--- a/mail/sendmail/files/patch-srvrsmtp.c
+++ b/mail/sendmail/files/patch-srvrsmtp.c
@@ -1,6 +1,6 @@
---- sendmail/srvrsmtp.c.orig	2020-06-08 08:35:03 UTC
+--- sendmail/srvrsmtp.c.orig	2021-08-03 10:35:09 UTC
 +++ sendmail/srvrsmtp.c
-@@ -906,6 +906,9 @@ smtp(nullserver, d_flags, e)
+@@ -940,6 +940,9 @@ smtp(nullserver, d_flags, e)
  #if _FFR_BADRCPT_SHUTDOWN
  	int n_badrcpts_adj;
  #endif
@@ -10,7 +10,7 @@
  
  	RESET_AUTH_FAIL_LOG_USER;
  	SevenBitInput_Saved = SevenBitInput;
-@@ -1408,6 +1411,7 @@ smtp(nullserver, d_flags, e)
+@@ -1442,6 +1445,7 @@ smtp(nullserver, d_flags, e)
  					  (int) tp.tv_sec +
  						(tp.tv_usec >= 500000 ? 1 : 0)
  					 );
@@ -18,7 +18,7 @@
  			}
  		}
  	}
-@@ -1510,6 +1514,10 @@ smtp(nullserver, d_flags, e)
+@@ -1544,6 +1548,10 @@ smtp(nullserver, d_flags, e)
  		SmtpPhase = "server cmd read";
  		sm_setproctitle(true, e, "server %s cmd read", CurSmtpClient);
  
@@ -29,7 +29,7 @@
  		/* handle errors */
  		if (sm_io_error(OutChannel) ||
  		    (p = sfgets(inp, sizeof(inp), InChannel,
-@@ -1823,8 +1831,11 @@ smtp(nullserver, d_flags, e)
+@@ -1860,8 +1868,11 @@ smtp(nullserver, d_flags, e)
  #define LOGAUTHFAIL	\
  	do	\
  	{	\
@@ -41,7 +41,7 @@
  		if (LogLevel >= 9)	\
  			sm_syslog(LOG_WARNING, e->e_id,	\
  				  "AUTH failure (%s): %s (%d) %s%s%.*s, relay=%.100s",	\
-@@ -1974,6 +1985,9 @@ smtp(nullserver, d_flags, e)
+@@ -2011,6 +2022,9 @@ smtp(nullserver, d_flags, e)
  			DELAY_CONN("AUTH");
  			if (!sasl_ok || n_mechs <= 0)
  			{
@@ -51,7 +51,7 @@
  				message("503 5.3.3 AUTH not available");
  				break;
  			}
-@@ -3602,10 +3616,17 @@ doquit:
+@@ -3704,10 +3718,17 @@ doquit:
  				**  timeouts for the same connection.
  				*/
  
@@ -69,7 +69,7 @@
  			if (tTd(93, 100))
  			{
  				/* return to handle next connection */
-@@ -3663,7 +3684,10 @@ doquit:
+@@ -3789,7 +3810,10 @@ doquit:
  #if MAXBADCOMMANDS > 0
  			if (++n_badcmds > MAXBADCOMMANDS)
  			{
@@ -80,7 +80,7 @@
  				message("421 4.7.0 %s Too many bad commands; closing connection",
  					MyHostName);
  
-@@ -3714,6 +3738,9 @@ doquit:
+@@ -3843,6 +3867,9 @@ doquit:
  		}
  #if SASL
  		}
diff --git a/mail/sendmail/files/patch-usersmtp.c b/mail/sendmail/files/patch-usersmtp.c
index 30898406c1b6..5c63c03bab75 100644
--- a/mail/sendmail/files/patch-usersmtp.c
+++ b/mail/sendmail/files/patch-usersmtp.c
@@ -1,6 +1,6 @@
---- sendmail/usersmtp.c.orig	2020-06-03 05:48:46 UTC
+--- sendmail/usersmtp.c.orig	2021-07-14 05:34:51 UTC
 +++ sendmail/usersmtp.c
-@@ -1842,6 +1842,9 @@ attemptauth(m, mci, e, sai)
+@@ -1870,6 +1870,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),
-@@ -1987,9 +1990,11 @@ smtpauth(m, mci, e)
+@@ -2015,9 +2018,11 @@ smtpauth(m, mci, e)
  	do
  	{
  		result = attemptauth(m, mci, e, &(mci->mci_sai));
diff --git a/mail/sendmail/files/site.config.m4.smtputf8 b/mail/sendmail/files/site.config.m4.smtputf8
index 0668f6dfb941..e4a517848db3 100644
--- a/mail/sendmail/files/site.config.m4.smtputf8
+++ b/mail/sendmail/files/site.config.m4.smtputf8
@@ -1,2 +1,2 @@
-APPENDDEF(`confLIBS', `-licui18n -licuuc -licudata')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_EAI')
+APPENDDEF(`confLIBS', `-licuuc')
+APPENDDEF(`confENVDEF',`-DUSE_EAI')



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108190952.17J9qb20015714>