mail/sendmail-devel: fix UseBlacklist

3 files changed, 22 insertions, 46 deletions

diff --git a/mail/sendmail-devel/files/patch-cfproto.m4 b/mail/sendmail-devel/files/patch-cfproto.m4
deleted file mode 100644
index be4f25c23264..000000000000
--- a/mail/sendmail-devel/files/patch-cfproto.m4
+++ /dev/null
@@ -1,24 +0,0 @@
---- cf/m4/proto.m4.orig	2023-10-27 05:47:26 UTC
-+++ cf/m4/proto.m4
-@@ -2912,10 +2912,6 @@ R$* $| $#$*		$#$2
- 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
-@@ -2923,6 +2919,10 @@ R$*		$: $1 $| $>D <$&{server_name}> <?> <! TLS_SRV_TAG
- 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-devel/files/patch-readcf.c b/mail/sendmail-devel/files/patch-readcf.c
index 2318f6a19842..c777f3c55f1e 100644
--- a/mail/sendmail-devel/files/patch-readcf.c
+++ b/mail/sendmail-devel/files/patch-readcf.c
@@ -1,26 +1,26 @@
---- sendmail/readcf.c.orig	2023-12-19 05:29:19 UTC
+--- sendmail/readcf.c.orig	2024-01-25 05:27:02 UTC
 +++ sendmail/readcf.c
 @@ -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	}
  };
  
-@@ -4946,6 +4950,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-devel/files/patch-srvrsmtp.c b/mail/sendmail-devel/files/patch-srvrsmtp.c
index e4abbbf00a57..4abe95e30b78 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	2023-12-05 09:53:22 UTC
+--- sendmail/srvrsmtp.c.orig	2024-01-25 05:27:02 UTC
 +++ sendmail/srvrsmtp.c
-@@ -921,6 +921,9 @@ do								\
+@@ -940,6 +940,9 @@ do								\
  # define SHOWCMDINREPLY(inp) inp
  # define SHOWSHRTCMDINREPLY(inp) shortenstring(inp, MAXSHORTSTR)
  #endif
@@ -10,7 +10,7 @@
  
  void
  smtp(nullserver, d_flags, e)
-@@ -1504,6 +1507,8 @@ 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)
  			{
@@ -19,7 +19,7 @@
  				greetcode = "554";
  				nullserver = "Command rejected";
  				sm_syslog(LOG_INFO, e->e_id,
-@@ -1513,6 +1518,8 @@ smtp(nullserver, d_flags, e)
+@@ -1537,6 +1542,8 @@ smtp(nullserver, d_flags, e)
  					  (int) tp->tv_sec +
  						(tp->tv_usec >= 500000 ? 1 : 0)
  					 );
@@ -28,7 +28,7 @@
  			}
  		}
  	}
-@@ -1631,6 +1638,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);
  
@@ -39,7 +39,7 @@
  		/* handle errors */
  		if (sm_io_error(OutChannel) ||
  		    (p = sfgets(inp, sizeof(inp), InChannel,
-@@ -1944,8 +1955,11 @@ smtp(nullserver, d_flags, e)
+@@ -1965,8 +1976,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",	\
-@@ -2095,6 +2109,9 @@ smtp(nullserver, d_flags, e)
+@@ -2116,6 +2130,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;
  			}
-@@ -3836,10 +3853,17 @@ smtp(nullserver, d_flags, e)
+@@ -3841,10 +3858,17 @@ smtp(nullserver, d_flags, e)
  				**  timeouts for the same connection.
  				*/
  
@@ -79,7 +79,7 @@
  			if (tTd(93, 100))
  			{
  				/* return to handle next connection */
-@@ -3921,7 +3945,10 @@ smtp(nullserver, d_flags, e)
+@@ -3926,7 +3950,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);
  
-@@ -3975,6 +4002,9 @@ smtp(nullserver, d_flags, e)
+@@ -3980,6 +4007,9 @@ smtp(nullserver, d_flags, e)
  		}
  #if SASL
  		}