diff options
| author | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2002-04-20 20:34:16 +0000 |
|---|---|---|
| committer | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2002-04-20 20:34:16 +0000 |
| commit | 7320a0ab16e44a4b444c367f27d1d0a7d00ee31e (patch) | |
| tree | 2d328972fa0308788ff4acbb5c3bc4c10ead7103 /contrib/sendmail/cf | |
| parent | 1e66b2bb258ad9652003ebc6aac4515d1062be89 (diff) | |
Resolve conflicts from import of post-8.12.3 bug fixes.
Notes
Notes:
svn path=/head/; revision=95157
Diffstat (limited to 'contrib/sendmail/cf')
| -rw-r--r-- | contrib/sendmail/cf/m4/cfhead.m4 | 2 | ||||
| -rw-r--r-- | contrib/sendmail/cf/ostype/bsd4.4.m4 | 2 | ||||
| -rw-r--r-- | contrib/sendmail/cf/sh/makeinfo.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4 index a857c6c15685..aae4d6ec7fbe 100644 --- a/contrib/sendmail/cf/m4/cfhead.m4 +++ b/contrib/sendmail/cf/m4/cfhead.m4 @@ -303,4 +303,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 1.1.1.7 2002/02/17 21:56:44 gshapiro Exp $') diff --git a/contrib/sendmail/cf/ostype/bsd4.4.m4 b/contrib/sendmail/cf/ostype/bsd4.4.m4 index 65309b98195b..15ea055e4e38 100644 --- a/contrib/sendmail/cf/ostype/bsd4.4.m4 +++ b/contrib/sendmail/cf/ostype/bsd4.4.m4 @@ -14,7 +14,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: bsd4.4.m4,v 8.14 1999/04/24 05:37:40 gshapiro Exp $') +VERSIONID(`$Id: bsd4.4.m4,v 1.1.1.3 2000/08/12 21:55:39 gshapiro Exp $') ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail $u')')dnl diff --git a/contrib/sendmail/cf/sh/makeinfo.sh b/contrib/sendmail/cf/sh/makeinfo.sh index e7b0cd101fce..0a8275fd9227 100644 --- a/contrib/sendmail/cf/sh/makeinfo.sh +++ b/contrib/sendmail/cf/sh/makeinfo.sh @@ -11,7 +11,7 @@ # the sendmail distribution. # # -# $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $ +# $Id: makeinfo.sh,v 1.1.1.3 2000/08/12 21:55:41 gshapiro Exp $ # # $FreeBSD$ # |