update sendmail

laffer1 · laffer1 · commit 8b9e735625a5 · 2024-04-11T13:27:50.000-04:00
diff --git a/UPDATING b/UPDATING
@@ -1,6 +1,8 @@
 Updating Information for MidnightBSD users.
 
 20240411:
+	sendmail 8.18.1
+
 	libarchive 3.7.2
 
 20240410:
diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile
@@ -39,3 +39,5 @@ sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
+
+CWARNFLAGS+= ${NO_WDEPRECATED_NON_PROTOTYPE}
diff --git a/lib/libmilter/Makefile.depend b/lib/libmilter/Makefile.depend
@@ -7,6 +7,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile
@@ -1,3 +1,4 @@
+
 .include <src.opts.mk>
 
 PACKAGE=sendmail
@@ -40,3 +41,5 @@ sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
+
+CWARNFLAGS+= ${NO_WDEPRECATED_NON_PROTOTYPE}
diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile
@@ -1,3 +1,4 @@
+
 .include <src.opts.mk>
 
 PACKAGE=lib${LIB}
@@ -29,3 +30,5 @@ sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
+
+CWARNFLAGS+= ${NO_WDEPRECATED_NON_PROTOTYPE}
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile
@@ -1,5 +1,4 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD: stable/11/libexec/mail.local/Makefile 321269 2017-07-20 00:58:19Z ngie $
 
 PACKAGE=sendmail
 SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
@@ -28,3 +27,5 @@ sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 .include <bsd.prog.mk>
+
+CWARNFLAGS+= ${NO_WDEPRECATED_NON_PROTOTYPE}
diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile
@@ -1,5 +1,4 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/2/95
-# $FreeBSD: stable/11/libexec/smrsh/Makefile 321269 2017-07-20 00:58:19Z ngie $
 
 PACKAGE=sendmail
 SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
@@ -27,3 +26,5 @@ sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 .include <bsd.prog.mk>
+
+CWARNFLAGS+= ${NO_WDEPRECATED_NON_PROTOTYPE}
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
@@ -87,6 +87,15 @@ CWARNFLAGS.clang+=	-Wno-unused-const-variable
 .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 130000
 CWARNFLAGS.clang+=	-Wno-error=unused-but-set-variable
 .endif
+.endif
+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 140000
+NO_WBITWISE_INSTEAD_OF_LOGICAL= -Wno-bitwise-instead-of-logical
+.endif
+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000
+NO_WARRAY_PARAMETER=    -Wno-array-parameter
+NO_WSTRICT_PROTOTYPES=  -Wno-strict-prototypes
+NO_WDEPRECATED_NON_PROTOTYPE=-Wno-deprecated-non-prototype
+.endif
 .endif # WARNS <= 6
 .if ${WARNS} <= 3
 CWARNFLAGS.clang+=	-Wno-tautological-compare -Wno-unused-value\
diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
 #
 # Doing a make install builds /usr/share/sendmail/
 
diff --git a/share/sendmail/Makefile.depend b/share/sendmail/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
@@ -16,7 +16,7 @@ MLINKS+=sendmail.8 purgestat.8
 SRCS=	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 main.c map.c mci.c milter.c mime.c parseaddr.c queue.c \
-	ratectrl.c readcf.c recipient.c savemail.c sasl.c sfsasl.c \
+	ratectrl.c readcf.c recipient.c savemail.c sasl.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
 BINOWN=	root
@@ -61,6 +61,8 @@ CFLAGS+=	-DTCPWRAPPERS
 LIBADD+=	wrap
 .endif
 
+CFLAGS+=	${NO_WDEPRECATED_NON_PROTOTYPE}
+
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
 DPADD+=${SENDMAIL_DPADD}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# $FreeBSD$`
`2`	`1`	`#`
`3`	`2`	`# Doing a make install builds /usr/share/sendmail/`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# $FreeBSD$`
`2`	`1`	`# Autogenerated - do NOT edit!`
`3`	`2`
`4`	`3`	`DIRDEPS = \`