From owner-freebsd-bugs@FreeBSD.ORG  Wed Apr 12 18:00:35 2006
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
X-Original-To: freebsd-bugs@hub.freebsd.org
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F333916A400
	for <freebsd-bugs@hub.freebsd.org>;
	Wed, 12 Apr 2006 18:00:34 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 848E643D45
	for <freebsd-bugs@hub.freebsd.org>;
	Wed, 12 Apr 2006 18:00:34 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3CI0Y93080012
	for <freebsd-bugs@freefall.freebsd.org>; Wed, 12 Apr 2006 18:00:34 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3CI0Yh0080011;
	Wed, 12 Apr 2006 18:00:34 GMT (envelope-from gnats)
Date: Wed, 12 Apr 2006 18:00:34 GMT
Message-Id: <200604121800.k3CI0Yh0080011@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Giorgos Keramidas <keramida@freebsd.org>
Cc: 
Subject: Re: conf/95634: sendmail configuration isn't updated after 8.13.4
	to 8.13.6 update
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Giorgos Keramidas <keramida@freebsd.org>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Apr 2006 18:00:35 -0000

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

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.