From nobody@FreeBSD.org  Tue Apr 11 19:27:10 2006
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EBD1116A409
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 11 Apr 2006 19:27:10 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 13D4443D60
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 11 Apr 2006 19:27:08 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BJR7T0090158
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 11 Apr 2006 19:27:07 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id k3BJR7W9090157;
	Tue, 11 Apr 2006 19:27:07 GMT
	(envelope-from nobody)
Message-Id: <200604111927.k3BJR7W9090157@www.freebsd.org>
Date: Tue, 11 Apr 2006 19:27:07 GMT
From: Rostislav Krasny <rosti.bsd@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: sendmail configuration isn't updated after 8.13.4 to 8.13.6 update
X-Send-Pr-Version: www-2.3

>Number:         95634
>Category:       conf
>Synopsis:       sendmail configuration isn't updated after 8.13.4 to 8.13.6 update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 11 19:30:08 GMT 2006
>Closed-Date:    Thu Apr 13 04:14:39 GMT 2006
>Last-Modified:  Thu Apr 13 18:00:30 GMT 2006
>Originator:     Rostislav Krasny
>Release:        6.1-PRERELEASE
>Organization:
>Environment:
>Description:
After one of system upgrades those I do wheekly I noticed that sendmail is updated but its configuration isn't. When I reran a mergemaster I saw following lines in its output:

 *** Temp ./etc/mail/freebsd.mc and installed have the same CVS Id, deleting
 *** Temp ./etc/mail/freebsd.cf and installed have the same CVS Id, deleting
 *** Temp ./etc/mail/freebsd.submit.mc and installed have the same CVS Id, deleting
 *** Temp ./etc/mail/freebsd.submit.cf and installed have the same CVS Id, deleting
 *** Temp ./etc/mail/helpfile and installed are the same, deleting
 *** Temp ./etc/mail/sendmail.cf and installed have the same CVS Id, deleting
 *** Temp ./etc/mail/submit.cf and installed have the same CVS Id, deleting
 *** Temp ./etc/mail/Makefile and installed have the same CVS Id, deleting
 *** Temp ./etc/mail/README and installed have the same CVS Id, deleting
 *** Temp ./etc/mail/mailer.conf and installed have the same CVS Id, deleting
 *** Temp ./etc/mail/access.sample and installed have the same CVS Id, deleting
 *** Temp ./etc/mail/virtusertable.sample and installed have the same CVS Id, deleting
 *** Temp ./etc/mail/mailertable.sample and installed have the same CVS Id, deleting
 *** Temp ./etc/mail/aliases and installed have the same CVS Id, deleting

Shouldn't some of these CVS Ids be increased by forced commits? CVS Ids
in the *.cf files are copied from *.mc and included *.m4 files. By the
way, each of the /etc/mail/*.cf files has two different $FreeBSD CVS Id
lines because the included /usr/src/contrib/sendmail/cf/m4/cfhead.m4 has
one.
>How-To-Repeat:

>Fix:
Increase file versions in the CVS Ids by doing forced commits of freebsd.mc and freebsd.submit.mc. Remove the $FreeBSD CVS Id from src/contrib/sendmail/cf/m4/cfhead.m4
>Release-Note:
>Audit-Trail:

From: Giorgos Keramidas <keramida@freebsd.org>
To: Rostislav Krasny <rosti.bsd@gmail.com>
Cc: freebsd-gnats-submit@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 20:51:20 +0300

 On 2006-04-11 19:27, Rostislav Krasny <rosti.bsd@gmail.com> wrote:
 > After one of system upgrades those I do wheekly I noticed that
 > sendmail is updated but its configuration isn't. When I reran a
 > mergemaster I saw following lines in its output:
 >
 >  *** Temp ./etc/mail/freebsd.mc and installed have the same CVS Id, deleting
 >  *** Temp ./etc/mail/freebsd.cf and installed have the same CVS Id, deleting
 >  *** Temp ./etc/mail/freebsd.submit.mc and installed have the same CVS Id, deleting
 >  *** Temp ./etc/mail/freebsd.submit.cf and installed have the same CVS Id, deleting
 >  *** Temp ./etc/mail/helpfile and installed are the same, deleting
 >  *** Temp ./etc/mail/sendmail.cf and installed have the same CVS Id, deleting
 >  *** Temp ./etc/mail/submit.cf and installed have the same CVS Id, deleting
 >  *** Temp ./etc/mail/Makefile and installed have the same CVS Id, deleting
 >  *** Temp ./etc/mail/README and installed have the same CVS Id, deleting
 >  *** Temp ./etc/mail/mailer.conf and installed have the same CVS Id, deleting
 >  *** Temp ./etc/mail/access.sample and installed have the same CVS Id, deleting
 >  *** Temp ./etc/mail/virtusertable.sample and installed have the same CVS Id, deleting
 >  *** Temp ./etc/mail/mailertable.sample and installed have the same CVS Id, deleting
 >  *** Temp ./etc/mail/aliases and installed have the same CVS Id, deleting
 >
 > 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.
 

From: Giorgos Keramidas <keramida@freebsd.org>
To: Rostislav Krasny <rosti.bsd@gmail.com>
Cc: Gregory Neil Shapiro <gshapiro@freebsd.org>,
        freebsd-gnats-submit@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:50:49 +0300

 On 2006-04-12 21:35, Rostislav Krasny <rosti.bsd@gmail.com> wrote:
 > On Wed, 12 Apr 2006 20:51:20 +0300
 > Giorgos Keramidas <keramida@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@x64.samsco.home on Thu Nov 3 07:46:18 UTC 2005
 > +##### built by root@saturn.lan on Fri Apr 7 00:33:11 IDT 2006
 
 Ah, I see!  Good point.
 
 You mean that because the included files are changed, someone may fail
 to notice this and skip regenerating the sendmail.cf and submit.cf
 files.
 
 I think a forced commit is a good idea, but I don't know if there is
 precedent for doing this after Sendmail upgrades.  Mr. Gregory Shapiro,
 our Sendmail maintainer, is probably the best person to decide about
 this.
 
 - Giorgos
 

From: Rostislav Krasny <rosti.bsd@gmail.com>
To: Giorgos Keramidas <keramida@freebsd.org>
Cc: freebsd-gnats-submit@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@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@x64.samsco.home on Thu Nov 3 07:46:18 UTC 2005
 +##### built by root@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@x64.samsco.home on Thu Nov 3 07:46:19 UTC 2005
 +##### built by root@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

From: Rostislav Krasny <rosti.bsd@gmail.com>
To: Giorgos Keramidas <keramida@freebsd.org>
Cc: Gregory Neil Shapiro <gshapiro@freebsd.org>,
 freebsd-gnats-submit@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 22:49:27 +0300

 On Wed, 12 Apr 2006 21:50:49 +0300
 Giorgos Keramidas <keramida@freebsd.org> wrote:
 
 > Ah, I see!  Good point.
 > 
 > You mean that because the included files are changed, someone may fail
 > to notice this and skip regenerating the sendmail.cf and submit.cf
 > files.
 > 
 > I think a forced commit is a good idea, but I don't know if there is
 > precedent for doing this after Sendmail upgrades.  Mr. Gregory Shapiro,
 > our Sendmail maintainer, is probably the best person to decide about
 > this.
 
 I forgot to mention that this PR has been opened at the instance of
 Mr. Gregory Neil Shapiro, after I emailed him about that problem.
 I already sent him the PR number. He wanted that the mergemaster
 maintainer take a look on this PR as well.

From: Gregory Neil Shapiro <gshapiro@freebsd.org>
To: Rostislav Krasny <rosti.bsd@gmail.com>
Cc: Giorgos Keramidas <keramida@freebsd.org>, freebsd-gnats-submit@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 15:38:45 -0700

 I'm fine with adding a forced commit to the files as part of my import
 procedure.

From: Rostislav Krasny <rosti.bsd@gmail.com>
To: Gregory Neil Shapiro <gshapiro@freebsd.org>
Cc: keramida@freebsd.org, freebsd-gnats-submit@freebsd.org
Subject: Re: conf/95634: sendmail configuration isn't updated after 8.13.4
 to 8.13.6 update
Date: Thu, 13 Apr 2006 01:50:52 +0300

 On Wed, 12 Apr 2006 15:38:45 -0700
 Gregory Neil Shapiro <gshapiro@freebsd.org> wrote:
 
 > I'm fine with adding a forced commit to the files as part of my import
 > procedure.
 
 Okay. And what about removing $FreeBSD CVS Id from
 src/contrib/sendmail/cf/m4/cfhead.m4 ?

From: Gregory Neil Shapiro <gshapiro@gshapiro.net>
To: Rostislav Krasny <rosti.bsd@gmail.com>
Cc: keramida@freebsd.org, freebsd-gnats-submit@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 20:27:55 -0700

 > Okay. And what about removing $FreeBSD CVS Id from
 > src/contrib/sendmail/cf/m4/cfhead.m4 ?
 
 That file has local FreeBSD changes and the CVS system doesn't allow
 you to remove it.
State-Changed-From-To: open->closed 
State-Changed-By: gshapiro 
State-Changed-When: Thu Apr 13 04:13:12 UTC 2006 
State-Changed-Why:  
I did a force commit on src/etc/sendmail/freebsd*mc and verified 
mergemaster now asks to merge /etc/mail/freebsd*cf.  I've done the 
forced commit in HEAD, RELENG_6_1, RELENG_6, RELENG_5, and RELENG_4. 

I've also added a note to FREEBSD-upgrade for future imports. 

Thanks! 


http://www.freebsd.org/cgi/query-pr.cgi?pr=95634 

From: Rostislav Krasny <rosti.bsd@gmail.com>
To: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Cc: freebsd-bugs@FreeBSD.org, freebsd-gnats-submit@freebsd.org
Subject: Re: conf/95634: sendmail configuration isn't updated after 8.13.4
 to 8.13.6 update
Date: Thu, 13 Apr 2006 20:49:22 +0300

 On Thu, 13 Apr 2006 04:14:38 GMT
 Gregory Neil Shapiro <gshapiro@FreeBSD.org> wrote:
 
 > I did a force commit on src/etc/sendmail/freebsd*mc and verified
 > mergemaster now asks to merge /etc/mail/freebsd*cf.  I've done the
 > forced commit in HEAD, RELENG_6_1, RELENG_6, RELENG_5, and RELENG_4.
 > 
 > I've also added a note to FREEBSD-upgrade for future imports.
 
 The mergemaster also asks to merge /etc/mail/sendmail.cf
 and /etc/mail/submit.cf, that is right.
 Well done, thank you!
>Unformatted:
