conf/95634: sendmail configuration isn't updated after 8.13.4 to 8.13.6 update

Rostislav Krasny rosti.bsd at gmail.com
Wed Apr 12 19:10:37 UTC 2006


The following reply was made to PR conf/95634; it has been noted by GNATS.

From: Rostislav Krasny <rosti.bsd at gmail.com>
To: Giorgos Keramidas <keramida at freebsd.org>
Cc: freebsd-gnats-submit at freebsd.org
Subject: Re: conf/95634: sendmail configuration isn't updated after 8.13.4
 to 8.13.6 update
Date: Wed, 12 Apr 2006 21:35:36 +0300

 On Wed, 12 Apr 2006 20:51:20 +0300
 Giorgos Keramidas <keramida at freebsd.org> wrote:
 
 > > Shouldn't some of these CVS Ids be increased by forced commits?
 > 
 > Not necessarily.  If the update of Sendmail was a bugfix or a
 > security fix, backported to RELENG_6, and these files didn't
 > include changes in the vendor branch or as part of the fix, then
 > they have the same RCS id line.
 
 There are changes in included *.m4 files, so the resulted *.cf files are
 changed as well:
 
 --- /etc/mail/freebsd.cf	Thu Nov  3 10:12:06 2005
 +++ /usr/obj/usr/src/etc/sendmail/freebsd.cf	Fri Apr  7 00:33:11 2006
 @@ -17,7 +17,7 @@
  #####
  #####		SENDMAIL CONFIGURATION FILE
  #####
 -##### built by root at x64.samsco.home on Thu Nov 3 07:46:18 UTC 2005
 +##### built by root at saturn.lan on Fri Apr 7 00:33:11 IDT 2006
  ##### in /usr/obj/usr/src/etc/sendmail
  ##### using /usr/src/etc/sendmail/../../contrib/sendmail/cf/ as configuration include directory
  #####
 @@ -76,7 +76,7 @@
  
  
  
 -#####  $Id: proto.m4,v 8.711 2004/08/04 21:29:55 ca Exp $  #####
 +#####  $Id: proto.m4,v 8.718 2005/08/24 18:07:23 ca Exp $  #####
  
  # level 10 config file format
  V10/Berkeley
 @@ -173,7 +173,7 @@
  Kvirtuser hash -o /etc/mail/virtusertable
  
  # Configuration version number
 -DZ8.13.4
 +DZ8.13.6
  
  
  ###############
 @@ -313,7 +313,7 @@
  #O MinQueueAge=30m
  
  # how many jobs can you process in the queue?
 -#O MaxQueueRunSize=10000
 +#O MaxQueueRunSize=0
  
  # perform initial split of envelope without checking MX records
  #O FastSplit=1
 @@ -441,13 +441,13 @@
  #O HostsFile=/etc/hosts
  
  # dialup line delay on connection failure
 -#O DialDelay=10s
 +#O DialDelay=0s
  
  # action to take if there are no recipients in the message
  O NoRecipientAction=add-to-undisclosed
  
  # chrooted environment for writing to files
 -#O SafeFileEnvironment=/arch
 +#O SafeFileEnvironment
  
  # are colons OK in addresses?
  #O ColonOkInAddr=True
 @@ -1569,6 +1569,9 @@
  # deal with TLS handshake failures: abort
  RSOFTWARE $| <$-:$+> $* 	$#error $@ $2 $: $1 " TLS handshake failed."
  RSOFTWARE $| $* 		$#error $@ 4.7.0 $: "403 TLS handshake failed."
 +# deal with TLS protocol errors: abort
 +RPROTOCOL $| <$-:$+> $* 	$#error $@ $2 $: $1 " STARTTLS failed."
 +RPROTOCOL $| $* 		$#error $@ 4.7.0 $: "403 STARTTLS failed."
  R$* $| <$*> <VERIFY>		$: <$2> <VERIFY> <> $1
  R$* $| <$*> <VERIFY + $+>	$: <$2> <VERIFY> <$3> $1
  R$* $| <$*> <$={Tls}:$->$*	$: <$2> <$3:$4> <> $1
 
 
 --- /etc/mail/freebsd.submit.cf	Thu Nov  3 10:12:06 2005
 +++ /usr/obj/usr/src/etc/sendmail/freebsd.submit.cf	Fri Apr  7 00:33:12 2006
 @@ -17,7 +17,7 @@
  #####
  #####		SENDMAIL CONFIGURATION FILE
  #####
 -##### built by root at x64.samsco.home on Thu Nov 3 07:46:19 UTC 2005
 +##### built by root at saturn.lan on Fri Apr 7 00:33:12 IDT 2006
  ##### in /usr/obj/usr/src/etc/sendmail
  ##### using /usr/src/etc/sendmail/../../contrib/sendmail/cf/ as configuration include directory
  #####
 @@ -36,7 +36,7 @@
  #####  $Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $  #####
  
  
 -#####  $Id: proto.m4,v 8.711 2004/08/04 21:29:55 ca Exp $  #####
 +#####  $Id: proto.m4,v 8.718 2005/08/24 18:07:23 ca Exp $  #####
  
  # level 10 config file format
  V10/Berkeley
 @@ -115,7 +115,7 @@
  
  
  # Configuration version number
 -DZ8.13.4/Submit
 +DZ8.13.6/Submit
  
  
  ###############
 @@ -253,7 +253,7 @@
  #O MinQueueAge=30m
  
  # how many jobs can you process in the queue?
 -#O MaxQueueRunSize=10000
 +#O MaxQueueRunSize=0
  
  # perform initial split of envelope without checking MX records
  #O FastSplit=1
 @@ -381,13 +381,13 @@
  #O HostsFile=/etc/hosts
  
  # dialup line delay on connection failure
 -#O DialDelay=10s
 +#O DialDelay=0s
  
  # action to take if there are no recipients in the message
 -#O NoRecipientAction=add-to-undisclosed
 +#O NoRecipientAction=none
  
  # chrooted environment for writing to files
 -#O SafeFileEnvironment=/arch
 +#O SafeFileEnvironment
  
  # are colons OK in addresses?
  #O ColonOkInAddr=True


More information about the freebsd-bugs mailing list