diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2004-01-19 01:41:15 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2004-01-19 01:41:15 +0000 |
| commit | 6792a0541d8ae3784572478b89043dd72c01867f (patch) | |
| tree | 4be36813992ba71c83e78e4a8b144709edfd1f4b /gnu/usr.sbin/sendmail/cf/m4 | |
| parent | 44556ed4f297a8bb4fa0fbdadde9afcd17bb988d (diff) | |
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.
Diffstat (limited to 'gnu/usr.sbin/sendmail/cf/m4')
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/m4/cfhead.m4 | 2 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/m4/proto.m4 | 8 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/m4/version.m4 | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/gnu/usr.sbin/sendmail/cf/m4/cfhead.m4 b/gnu/usr.sbin/sendmail/cf/m4/cfhead.m4 index 3fe593b6ec5..aa1ffb56bfd 100644 --- a/gnu/usr.sbin/sendmail/cf/m4/cfhead.m4 +++ b/gnu/usr.sbin/sendmail/cf/m4/cfhead.m4 @@ -305,4 +305,4 @@ define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'') divert(0)dnl -VERSIONID(`$Sendmail: cfhead.m4,v 8.108.2.3 2003/04/03 17:51:51 ca Exp $') +VERSIONID(`$Sendmail: cfhead.m4,v 8.108.2.6 2003/12/05 02:26:47 ca Exp $') diff --git a/gnu/usr.sbin/sendmail/cf/m4/proto.m4 b/gnu/usr.sbin/sendmail/cf/m4/proto.m4 index cc6426811d1..bcde48b249f 100644 --- a/gnu/usr.sbin/sendmail/cf/m4/proto.m4 +++ b/gnu/usr.sbin/sendmail/cf/m4/proto.m4 @@ -1,6 +1,6 @@ divert(-1) # -# 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 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: proto.m4,v 8.649.2.24 2003/08/04 21:14:26 ca Exp $') +VERSIONID(`$Sendmail: proto.m4,v 8.649.2.30 2004/01/11 17:54:06 ca Exp $') # level CF_LEVEL config file format V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley') @@ -111,6 +111,7 @@ Fw`'confCW_FILE', # ... `define' this only if sendmail cannot automatically determine your domain ifdef(`confDOMAIN_NAME', `Dj`'confDOMAIN_NAME', `#Dj$w.Foo.COM') +# host/domain names ending with a token in class P are canonical CP. ifdef(`UUCP_RELAY', @@ -633,7 +634,8 @@ _OPTION(Milter.LogLevel, `confMILTER_LOG_LEVEL', `') _OPTION(Milter.macros.connect, `confMILTER_MACROS_CONNECT', `') _OPTION(Milter.macros.helo, `confMILTER_MACROS_HELO', `') _OPTION(Milter.macros.envfrom, `confMILTER_MACROS_ENVFROM', `') -_OPTION(Milter.macros.envrcpt, `confMILTER_MACROS_ENVRCPT', `')') +_OPTION(Milter.macros.envrcpt, `confMILTER_MACROS_ENVRCPT', `') +') # CA directory _OPTION(CACertPath, `confCACERT_PATH', `') diff --git a/gnu/usr.sbin/sendmail/cf/m4/version.m4 b/gnu/usr.sbin/sendmail/cf/m4/version.m4 index d5fa52ff023..64f36345b02 100644 --- a/gnu/usr.sbin/sendmail/cf/m4/version.m4 +++ b/gnu/usr.sbin/sendmail/cf/m4/version.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -11,8 +11,8 @@ divert(-1) # the sendmail distribution. # # -VERSIONID(`$Sendmail: version.m4,v 8.92.2.22 2003/09/16 20:02:05 ca Exp $') +VERSIONID(`$Sendmail: version.m4,v 8.92.2.26 2004/01/13 00:29:26 ca Exp $') # divert(0) # Configuration version number -DZ8.12.10`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.12.11`'ifdef(`confCF_VERSION', `/confCF_VERSION') |