From owner-freebsd-bugs@FreeBSD.ORG  Thu Apr 13 17:51:00 2006
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
X-Original-To: freebsd-bugs@freebsd.org
Delivered-To: freebsd-bugs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0E5A216A403
	for <freebsd-bugs@freebsd.org>; Thu, 13 Apr 2006 17:51:00 +0000 (UTC)
	(envelope-from rosti.bsd@gmail.com)
Received: from wproxy.gmail.com (wproxy.gmail.com [64.233.184.228])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 32D1F43D67
	for <freebsd-bugs@freebsd.org>; Thu, 13 Apr 2006 17:50:56 +0000 (GMT)
	(envelope-from rosti.bsd@gmail.com)
Received: by wproxy.gmail.com with SMTP id i27so1550081wra
	for <freebsd-bugs@freebsd.org>; Thu, 13 Apr 2006 10:50:55 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com;
	h=received:date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer:mime-version:content-type:content-transfer-encoding;
	b=I76MgE6WFCqAXBj3QbmY8nWkCyzjPa9K98U1DCXQwZ6vDJnSQL5016/bagfJuKDOf0fYghgOeWEBrSEc9BbvzpPU6TiceTBo2jUn9ze+IVSYbBcejEzm1RSRt67UIHCMoD8GaDWOCusiUm4VDe9CMrKzQMPX3hpbMN7uJifrt70=
Received: by 10.65.126.6 with SMTP id d6mr524655qbn;
	Thu, 13 Apr 2006 10:50:52 -0700 (PDT)
Received: from saturn.lan ( [212.143.154.227])
	by mx.gmail.com with ESMTP id q15sm993490qbq.2006.04.13.10.50.48;
	Thu, 13 Apr 2006 10:50:52 -0700 (PDT)
Date: Thu, 13 Apr 2006 20:49:22 +0300
From: Rostislav Krasny <rosti.bsd@gmail.com>
To: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Message-Id: <20060413204922.646bfb17.rosti.bsd@gmail.com>
In-Reply-To: <200604130414.k3D4EcRN017924@freefall.freebsd.org>
References: <200604130414.k3D4EcRN017924@freefall.freebsd.org>
X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.17; i386-portbld-freebsd6.1)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
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
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Thu, 13 Apr 2006 17:51:00 -0000

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!