From owner-cvs-all@FreeBSD.ORG  Sat Jun  4 19:06:52 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@freebsd.org
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 757C116A41C;
	Sat,  4 Jun 2005 19:06:52 +0000 (GMT)
	(envelope-from keramida@ceid.upatras.gr)
Received: from aiolos.otenet.gr (aiolos.otenet.gr [195.170.0.93])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9B1C743D53;
	Sat,  4 Jun 2005 19:06:49 +0000 (GMT)
	(envelope-from keramida@ceid.upatras.gr)
Received: from gothmog.gr (patr530-a084.otenet.gr [212.205.215.84])
	by aiolos.otenet.gr (8.13.4/8.13.4/Debian-1) with ESMTP id
	j54J6kfJ002037; Sat, 4 Jun 2005 22:06:47 +0300
Received: from gothmog.gr (gothmog [127.0.0.1])
	by gothmog.gr (8.13.3/8.13.3) with ESMTP id j54J6ikv001943;
	Sat, 4 Jun 2005 22:06:44 +0300 (EEST)
	(envelope-from keramida@ceid.upatras.gr)
Received: (from giorgos@localhost)
	by gothmog.gr (8.13.3/8.13.3/Submit) id j54J6iLn001942;
	Sat, 4 Jun 2005 22:06:44 +0300 (EEST)
	(envelope-from keramida@ceid.upatras.gr)
Date: Sat, 4 Jun 2005 22:06:43 +0300
From: Giorgos Keramidas <keramida@ceid.upatras.gr>
To: Robert Watson <rwatson@freebsd.org>
Message-ID: <20050604190643.GA1615@gothmog.gr>
References: <200505302051.j4UKpDdf066810@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200505302051.j4UKpDdf066810@repoman.freebsd.org>
Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org
Subject: Re: cvs commit: src/etc/mtree BSD.root.dist
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jun 2005 19:06:52 -0000

On 2005-05-30 20:51, Robert Watson <rwatson@freebsd.org> wrote:
> rwatson     2005-05-30 20:51:13 UTC
>
>   FreeBSD src repository
>
>   Modified files:
>     etc/mtree            BSD.root.dist
>   Log:
>   Add /etc/security, into which the BSM audit configuration files will be
>   installed.  This is the same directory as found on Solaris.
>
>   NB: In FreeBSD 4.x and earlier, a script (file) named /etc/security
>   exists.  Does mergemaster need to be taught how to replace a file with
>   a directory?

mergemaster includes a check for "removed" files, but I'm not sure if it
can handle a directory entry that has a different file type.  IMHO, this
may have to be checked iff the /etc/security changes are MFC'ed to 5.X.
Otherwise, it shouldn't be a problem, since upgrading from 4.X to 6.X is
probably unsupported (or, at least, people who try it should be prepared
to pay great attention to details like this one).