From owner-freebsd-security  Wed Jun 13  7:49:28 2001
Delivered-To: freebsd-security@freebsd.org
Received: from mail.wlcg.com (mail.wlcg.com [207.226.17.4])
	by hub.freebsd.org (Postfix) with ESMTP id 02F6537B401
	for <freebsd-security@FreeBSD.ORG>; Wed, 13 Jun 2001 07:49:19 -0700 (PDT)
	(envelope-from rsimmons@wlcg.com)
Received: from localhost (rsimmons@localhost)
	by mail.wlcg.com (8.11.3/8.11.3) with ESMTP id f5DEmsB11168;
	Wed, 13 Jun 2001 10:48:55 -0400 (EDT)
	(envelope-from rsimmons@wlcg.com)
Date: Wed, 13 Jun 2001 10:48:51 -0400 (EDT)
From: Rob Simmons <rsimmons@wlcg.com>
To: Peter Jeremy <peter.jeremy@alcatel.com.au>
Cc: Ryan Masse <mail@max-info.net>, freebsd-security@FreeBSD.ORG
Subject: Re: RELENG_4_3
In-Reply-To: <20010613154022.D95583@gsmx07.alcatel.com.au>
Message-ID: <Pine.BSF.4.21.0106131047500.91342-100000@mail.wlcg.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-freebsd-security@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-security.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-security>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-security>
X-Loop: FreeBSD.org

-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160

On Wed, 13 Jun 2001, Peter Jeremy wrote:

> On 2001-Jun-13 00:33:44 -0400, Ryan Masse <mail@max-info.net> wrote:
> >not sure what exactly you mean by this. RELENG_4_3 is a security branch
> >specifically for 4.3-RELEASE. The standard make
> >buildworld/installworld/kernel would update your 4.3-RELEASE box with the
> >latest security fixes. Mergemaster in this situation can be skipped.
> 
> No it can't.  Since Rob's box is at -STABLE, it may be running _later_
> versions of some scripts.  In any case, mergemaster still needs to be
> run on the RELENG_4_3 branch in case a security fix impacts /etc and
> related files.
> 
> >> What is the best way to go about this?  The buildworld/installworld/kernel
> >> part is straightforward.  How would I get mergemaster to work in this
> >> situation.
> 
> mergemaster does a equality comparison, rather than a relational
> comparison, on the CVS Id line.  This means that you should be able to
> use mergemaster normally to go backwards in time, or across branches.

In that case, I will give it a try.

> 
> Peter
> 
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-security" in the body of the message
> 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (FreeBSD)
Comment: For info see http://www.gnupg.org

iD8DBQE7J31Wv8Bofna59hYRA7UxAJsECulS1cw3Z6YjUToxLirR4JsU2QCdExyw
w5Z1ZHjLT2M6ly7amozlP6Y=
=UZr6
-----END PGP SIGNATURE-----



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-security" in the body of the message