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

[Rostislav Krasny]

>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:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 11 19:30:08 GMT 2006
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: