From owner-freebsd-bugs@FreeBSD.ORG Tue Apr 11 19:30:09 2006 Return-Path: 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 6593216A400 for ; Tue, 11 Apr 2006 19:30:09 +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 D296543D48 for ; Tue, 11 Apr 2006 19:30:08 +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 k3BJU8wl067060 for ; Tue, 11 Apr 2006 19:30:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3BJU8xN067059; Tue, 11 Apr 2006 19:30:08 GMT (envelope-from gnats) Resent-Date: Tue, 11 Apr 2006 19:30:08 GMT Resent-Message-Id: <200604111930.k3BJU8xN067059@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rostislav Krasny Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EBD1116A409 for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: 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 List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 19:30:09 -0000 >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: