From f848909f8f794d90c34bfc14a46df43dc78aef2f Mon Sep 17 00:00:00 2001
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Wed, 26 Jun 2002 02:50:37 +0000
Subject: [PATCH] Resolve conflicts from import of sendmail 8.12.5

---
 contrib/sendmail/cf/m4/cfhead.m4     | 8 +++++---
 contrib/sendmail/src/conf.c          | 4 ++--
 contrib/sendmail/src/conf.h          | 2 +-
 contrib/sendmail/vacation/vacation.1 | 6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4
index a857c6c15685..2f92fbd88db2 100644
--- a/contrib/sendmail/cf/m4/cfhead.m4
+++ b/contrib/sendmail/cf/m4/cfhead.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983, 1995 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -120,8 +120,10 @@ define(`_CPO_',`')
 define(`CLIENT_OPTIONS', `define(`_CPO_', defn(`_CPO_')
 O ClientPortOptions=`$1')')
 define(`_MAIL_FILTERS_', `')
+define(`_MAIL_FILTERS_DEF', `')
 define(`MAIL_FILTER', `define(`_MAIL_FILTERS_', defn(`_MAIL_FILTERS_')
-X`'$1`, '`$2')')
+X`'$1`, '`$2')
+define(`_MAIL_FILTERS_DEF', defn(`_MAIL_FILTERS_DEF')`X')')
 define(`INPUT_MAIL_FILTER', `MAIL_FILTER(`$1', `$2')
 ifelse(defn(`confINPUT_MAIL_FILTERS')X, `X',
 `define(`confINPUT_MAIL_FILTERS', $1)',
@@ -303,4 +305,4 @@ define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'')
 
 
 divert(0)dnl
-VERSIONID(`$Id: cfhead.m4,v 8.107 2001/07/22 03:25:37 ca Exp $')
+VERSIONID(`$Id: cfhead.m4,v 8.108 2002/06/13 18:53:24 ca Exp $')
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c
index fb0b7953d287..677aea2e0eb4 100644
--- a/contrib/sendmail/src/conf.c
+++ b/contrib/sendmail/src/conf.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: conf.c,v 8.969 2002/05/24 23:48:55 gshapiro Exp $")
+SM_RCSID("@(#)$Id: conf.c,v 8.972 2002/06/18 16:11:44 ca Exp $")
 
 /* $FreeBSD$ */
 
@@ -2340,7 +2340,7 @@ typedef unsigned int	*pt_entry_t;
 */
 
 # ifdef SPT_ALIGN_SIZE
-#  define SPT_ALIGN(x, align)	((((x) + SPT_ALIGN_SIZE) >> (align)) << (align))
+#  define SPT_ALIGN(x, align)	(((((x) + SPT_ALIGN_SIZE) >> (align)) << (align)) - 1)
 # else /* SPT_ALIGN_SIZE */
 #  define SPT_ALIGN(x, align)	(x)
 # endif /* SPT_ALIGN_SIZE */
diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h
index df6f3019f9f6..fb562f4fbb2e 100644
--- a/contrib/sendmail/src/conf.h
+++ b/contrib/sendmail/src/conf.h
@@ -10,7 +10,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: conf.h,v 8.562 2002/05/22 19:46:26 gshapiro Exp $
+ *	$Id: conf.h,v 8.563 2002/06/04 02:13:50 geir Exp $
  */
 
 /* $FreeBSD$ */
diff --git a/contrib/sendmail/vacation/vacation.1 b/contrib/sendmail/vacation/vacation.1
index 0f8d09b7638c..43f1976025cb 100644
--- a/contrib/sendmail/vacation/vacation.1
+++ b/contrib/sendmail/vacation/vacation.1
@@ -9,11 +9,11 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"	$Id: vacation.1,v 8.29 2002/03/23 19:17:36 gshapiro Exp $
+.\"	$Id: vacation.1,v 8.29.2.1 2002/06/21 21:28:06 ca Exp $
 .\"
 .\" $FreeBSD$
 .\"
-.TH VACATION 1 "$Date: 2002/03/23 19:17:36 $"
+.TH VACATION 1 "$Date: 2002/06/21 21:28:06 $"
 .SH NAME
 vacation
 \- E-mail auto-responder
@@ -81,7 +81,7 @@ This option defaults to the standard sendmail configuration file,
 located at /etc/mail/sendmail.cf on most systems.
 .TP
 .B \-d
-Send error/debug messages to stdout instead of syslog.
+Send error/debug messages to stderr instead of syslog.
 Otherwise, fatal errors, such as calling
 .B vacation
 with incorrect arguments, or with non-existent