Update to sendmail 8.12.11. I've been runninga beta version of this for

some time without problems.  See the RELEASE_NOTES for the change log.

4 files changed, 19 insertions, 9 deletions

diff --git a/gnu/usr.sbin/sendmail/include/libmilter/mfapi.h b/gnu/usr.sbin/sendmail/include/libmilter/mfapi.h
index e433477f0d9..a385012566e 100644
--- a/gnu/usr.sbin/sendmail/include/libmilter/mfapi.h
+++ b/gnu/usr.sbin/sendmail/include/libmilter/mfapi.h
@@ -7,7 +7,7 @@
  * the sendmail distribution.
  *
  *
- *	$Sendmail: mfapi.h,v 8.44.2.3 2002/12/19 02:10:09 ca Exp $
+ *	$Sendmail: mfapi.h,v 8.44.2.4 2003/10/20 21:51:49 msk Exp $
  */
 
 /*
@@ -108,7 +108,7 @@ struct smfiDesc
 };
 
 #if _FFR_SMFI_OPENSOCKET
-LIBMILTER_API int smfi_opensocket __P((void));
+LIBMILTER_API int smfi_opensocket __P((bool));
 #endif /* _FFR_SMFI_OPENSOCKET */
 LIBMILTER_API int smfi_register __P((struct smfiDesc));
 LIBMILTER_API int smfi_main __P((void));
diff --git a/gnu/usr.sbin/sendmail/include/libmilter/milter.h b/gnu/usr.sbin/sendmail/include/libmilter/milter.h
index 2c871d445df..832096de886 100644
--- a/gnu/usr.sbin/sendmail/include/libmilter/milter.h
+++ b/gnu/usr.sbin/sendmail/include/libmilter/milter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2003 Sendmail, Inc. and its suppliers.
  *	All rights reserved.
  *
  * By using this file, you agree to the terms and conditions set
@@ -7,7 +7,7 @@
  * the sendmail distribution.
  *
  *
- *	$Sendmail: milter.h,v 8.37.2.1 2002/12/19 02:10:09 ca Exp $
+ *	$Sendmail: milter.h,v 8.37.2.3 2003/12/02 00:19:51 msk Exp $
  */
 
 /*
@@ -25,7 +25,11 @@
 typedef pthread_t	sthread_t;
 typedef int		socket_t;
 
+#if _FFR_MILTER_MACROS_EOM
+# define MAX_MACROS_ENTRIES	5	/* max size of macro pointer array */
+#else /* _FFR_MILTER_MACROS_EOM */
 # define MAX_MACROS_ENTRIES	4	/* max size of macro pointer array */
+#endif /* _FFR_MILTER_MACROS_EOM */
 
 /*
 **  context for milter
diff --git a/gnu/usr.sbin/sendmail/include/sm/cdefs.h b/gnu/usr.sbin/sendmail/include/sm/cdefs.h
index d4dce9ba8ea..76a95e84670 100644
--- a/gnu/usr.sbin/sendmail/include/sm/cdefs.h
+++ b/gnu/usr.sbin/sendmail/include/sm/cdefs.h
@@ -6,7 +6,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Sendmail: cdefs.h,v 1.15 2002/01/16 18:30:11 ca Exp $
+ *	$Sendmail: cdefs.h,v 1.15.2.1 2003/12/05 22:44:17 ca Exp $
  */
 
 /*
@@ -67,11 +67,14 @@
 #  if __GNUC__ >= 2
 #   if __GNUC__ == 2 && __GNUC_MINOR__ < 5
 #    define SM_DEAD(proto) volatile proto
+#    define SM_DEAD_D volatile
 #   else /* __GNUC__ == 2 && __GNUC_MINOR__ < 5 */
 #    define SM_DEAD(proto) proto __attribute__((__noreturn__))
+#    define SM_DEAD_D
 #   endif /* __GNUC__ == 2 && __GNUC_MINOR__ < 5 */
 #  else /* __GNUC__ >= 2 */
 #   define SM_DEAD(proto) proto
+#   define SM_DEAD_D
 #  endif /* __GNUC__ >= 2 */
 # endif /* SM_DEAD */
 
diff --git a/gnu/usr.sbin/sendmail/include/sm/conf.h b/gnu/usr.sbin/sendmail/include/sm/conf.h
index a2f790a324f..15158df10b6 100644
--- a/gnu/usr.sbin/sendmail/include/sm/conf.h
+++ b/gnu/usr.sbin/sendmail/include/sm/conf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
  *	All rights reserved.
  * Copyright (c) 1983, 1995-1997 Eric P. Allman.  All rights reserved.
  * Copyright (c) 1988, 1993
@@ -10,7 +10,7 @@
  * the sendmail distribution.
  *
  *
- *	$Sendmail: conf.h,v 1.90.2.18 2003/08/20 22:27:44 ca Exp $
+ *	$Sendmail: conf.h,v 1.90.2.20 2004/01/07 00:52:16 ca Exp $
  */
 
 /*
@@ -437,6 +437,9 @@ typedef int		pid_t;
 #   if SOLARIS >= 20900 || (SOLARIS < 10000 && SOLARIS >= 209)
 #    define HASURANDOMDEV	1	/* /dev/[u]random added in S9 */
 #   endif /* SOLARIS >= 20900 || (SOLARIS < 10000 && SOLARIS >= 209) */
+#   if SOLARIS >= 21000 || (SOLARIS < 10000 && SOLARIS >= 210)
+#    define HASUNSETENV 1       /* unsetenv() added in S10 */
+#   endif /* SOLARIS >= 21000 || (SOLARIS < 10000 && SOLARIS >= 210) */
 #   ifndef HASGETUSERSHELL
 #    define HASGETUSERSHELL 0	/* getusershell(3) causes core dumps pre-2.7 */
 #   endif /* ! HASGETUSERSHELL */
@@ -2254,8 +2257,8 @@ typedef struct msgb		mblk_t;
 #  undef HAVE_SYS_ERRLIST
 #  define sys_errlist		__sys_errlist
 #  define sys_nerr		__sys_nerr
-#  define major(dev)		((int)(((dev) >> 8) & 0xff)
-#  define minor(dev)		((int)((dev) & 0xff)
+#  define major(dev)		((int)(((dev) >> 8) & 0xff))
+#  define minor(dev)		((int)((dev) & 0xff))
 # endif /* defined(__INTERIX) */