mail/sendmail: Update to 8.17.2

5 files changed, 4 insertions, 53 deletions

diff --git a/mail/sendmail/files/patch-Makefile.m4 b/mail/sendmail/files/patch-Makefile.m4
index 7f14fa5534f9..e0fe7f6b64da 100644
--- a/mail/sendmail/files/patch-Makefile.m4
+++ b/mail/sendmail/files/patch-Makefile.m4
@@ -1,9 +1,9 @@
---- sendmail/Makefile.m4.orig	2020-06-08 08:35:03 UTC
+--- sendmail/Makefile.m4.orig	2023-02-09 18:24:38 UTC
 +++ sendmail/Makefile.m4
 @@ -7,14 +7,14 @@ bldPRODUCT_START(`executable', `sendmail')
  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 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 ')
+ 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')
diff --git a/mail/sendmail/files/patch-alias.c b/mail/sendmail/files/patch-alias.c
deleted file mode 100644
index 7f4a9a1f3dfd..000000000000
--- a/mail/sendmail/files/patch-alias.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- sendmail/alias.c.orig	2021-06-09 08:27:53 UTC
-+++ sendmail/alias.c
-@@ -817,10 +817,13 @@ readaliases(map, af, announcestats, logstats)
- 				(void) sm_io_ungetc(af, SM_TIME_DEFAULT, c);
- 			if (c != ' ' && c != '\t')
- 				break;
-+#if _FFR_8BITENVADDR
-+			syserr("554 5.3.5 Continuation line currently not supported for USE_EAI nor _FFR_EIGHT_BIT_ADDR_OK");
-+#endif
- 
- 			/* read continuation line */
- 			if (sm_io_fgets(af, SM_TIME_DEFAULT, p,
--					sizeof(line) - (p-line)) < 0)
-+					sizeof(lbuf) - (p-line)) < 0)
- 				break;
- 			LineNumber++;
- 
diff --git a/mail/sendmail/files/patch-doc-op-Makefile b/mail/sendmail/files/patch-doc-op-Makefile
index 1e75f91c0c09..0bbc747360eb 100644
--- a/mail/sendmail/files/patch-doc-op-Makefile
+++ b/mail/sendmail/files/patch-doc-op-Makefile
@@ -1,4 +1,4 @@
---- doc/op/Makefile.orig	2014-03-05 00:59:45 UTC
+--- doc/op/Makefile.orig	2023-02-09 18:24:38 UTC
 +++ doc/op/Makefile
 @@ -12,7 +12,7 @@ PS2PDF_CMD=	ps2pdf
  PIC=		${PIC_CMD} -C
@@ -6,6 +6,6 @@
  EQNPS=		${EQN_CMD} -C -Tps
 -ROFFASCII=	${ROFF_CMD} -Tascii ${MACROS}
 +ROFFASCII=	${ROFF_CMD} -P-c -Tascii ${MACROS}
+ ROFFNOSGR=	GROFF_NO_SGR=1 ${ROFFASCII}
  ROFFPS=		${ROFF_CMD} -Tps -mps ${MACROS}
  ULASCII=	${UL_CMD} -t dumb
- PS2PDF=		${PS2PDF_CMD}
diff --git a/mail/sendmail/files/patch-tls.c b/mail/sendmail/files/patch-tls.c
deleted file mode 100644
index a69a34e004f8..000000000000
--- a/mail/sendmail/files/patch-tls.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- sendmail/tls.c.orig	2021-07-14 05:34:51 UTC
-+++ sendmail/tls.c
-@@ -35,7 +35,7 @@ SM_RCSID("@(#)$Id: tls.c,v 8.127 2013-11-27 02:51:11 g
- **  LibreSSL 2.0 (0x20000000L - part of "These will never change")
- */
- 
--# if (OPENSSL_VERSION_NUMBER >= 0x10100000L && OPENSSL_VERSION_NUMBER < 0x20000000L) || OPENSSL_VERSION_NUMBER >= 0x30000000L
-+# if (OPENSSL_VERSION_NUMBER >= 0x10100000L && OPENSSL_VERSION_NUMBER < 0x20000000L) || OPENSSL_VERSION_NUMBER >= 0x30000000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- #  define MTA_HAVE_DH_set0_pqg 1
- #  define MTA_HAVE_DSA_GENERATE_EX	1
- 
diff --git a/mail/sendmail/files/patch-zsasl2 b/mail/sendmail/files/patch-zsasl2
deleted file mode 100644
index 2701fc3499cd..000000000000
--- a/mail/sendmail/files/patch-zsasl2
+++ /dev/null
@@ -1,21 +0,0 @@
---- sendmail/sendmail.h.orig	2022-04-19 21:07:42 UTC
-+++ sendmail/sendmail.h
-@@ -760,7 +760,7 @@ extern bool	filesys_free __P((long));
- # define SASL_IS_AUTH	2		/* authenticated */
- 
- /* SASL options */
--# define SASL_AUTH_AUTH	0x1000		/* use auth= only if authenticated */
-+# define SASL_AUTH_AUTH	0x10000		/* use auth= only if authenticated */
- # if SASL >= 20101
- #  define SASL_SEC_MASK	SASL_SEC_MAXIMUM /* mask for SASL_SEC_* values: sasl.h */
- # else /* SASL >= 20101 */
-@@ -775,6 +775,9 @@ extern bool	filesys_free __P((long));
- #  endif /* SASL_SEC_NOPLAINTEXT & SASL_SEC_MASK) == 0 ... */
- # endif /* SASL >= 20101 */
- # define MAXOUTLEN 8192	/* length of output buffer, should be 2^n */
-+# if (SASL_AUTH_AUTH & SASL_SEC_MASK) != 0
-+#  ERROR "change SASL_AUTH_AUTH notify sendmail.org!"
-+# endif
- 
- /* functions */
- extern char	*intersect __P((char *, char *, SM_RPOOL_T *));