From owner-cvs-src@FreeBSD.ORG Sat Jun 4 21:07:07 2005 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5978216A41C; Sat, 4 Jun 2005 21:07:07 +0000 (GMT) (envelope-from simon@zaphod.nitro.dk) Received: from zaphod.nitro.dk (port324.ds1-khk.adsl.cybercity.dk [212.242.113.79]) by mx1.FreeBSD.org (Postfix) with ESMTP id DEA4843D1D; Sat, 4 Jun 2005 21:07:06 +0000 (GMT) (envelope-from simon@zaphod.nitro.dk) Received: by zaphod.nitro.dk (Postfix, from userid 3000) id 30F47119E6; Sat, 4 Jun 2005 23:07:05 +0200 (CEST) Date: Sat, 4 Jun 2005 23:07:05 +0200 From: "Simon L. Nielsen" To: Ceri Davies , Giorgos Keramidas , Robert Watson , src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org Message-ID: <20050604210704.GH779@zaphod.nitro.dk> References: <200505302051.j4UKpDdf066810@repoman.freebsd.org> <20050604190643.GA1615@gothmog.gr> <20050604210237.GM14221@submonkey.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="BXVAT5kNtrzKuDFl" Content-Disposition: inline In-Reply-To: <20050604210237.GM14221@submonkey.net> User-Agent: Mutt/1.5.9i Cc: Subject: Re: cvs commit: src/etc/mtree BSD.root.dist X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2005 21:07:07 -0000 --BXVAT5kNtrzKuDFl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2005.06.04 22:02:37 +0100, Ceri Davies wrote: > On Sat, Jun 04, 2005 at 10:06:43PM +0300, Giorgos Keramidas wrote: > > On 2005-05-30 20:51, Robert Watson 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 wil= l 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 w= ith > > > a directory? > >=20 > > 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). >=20 > Agreed. Plus: >=20 > shrike-{~} % uname -sr > FreeBSD 4.11-STABLE > shrike-{~} % ll /etc/security > ls: /etc/security: No such file or directory > shrike-{~} % >=20 > I don't think we support anything other than the head of RELENG_4 -> > -CURRENT either. Actually I'm pretty sure that buildworld does not support 4.X -> 6.X, only 4.X -> 5.X -> 6.X, since bootstrapping of some needed tools has been removed after the RELENG_5 branchpoint. --=20 Simon L. Nielsen --BXVAT5kNtrzKuDFl Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iD8DBQFCohf4h9pcDSc1mlERAhEUAJ4ghXdbqelhQytau4lbOC3DTFlxKQCghtsE 5Q2RFNkZ3/Ra9dF/jdq6EJU= =uDVc -----END PGP SIGNATURE----- --BXVAT5kNtrzKuDFl--