From owner-freebsd-security  Tue Jun 12 22:40:35 2001
Delivered-To: freebsd-security@freebsd.org
Received: from netau1.alcanet.com.au (ntp.alcanet.com.au [203.62.196.27])
	by hub.freebsd.org (Postfix) with ESMTP id 96B3D37B405
	for <freebsd-security@FreeBSD.ORG>; Tue, 12 Jun 2001 22:40:31 -0700 (PDT)
	(envelope-from jeremyp@gsmx07.alcatel.com.au)
Received: from mfg1.cim.alcatel.com.au (mfg1.cim.alcatel.com.au [139.188.23.1])
	by netau1.alcanet.com.au (8.9.3 (PHNE_22672)/8.9.3) with ESMTP id PAA03340;
	Wed, 13 Jun 2001 15:40:27 +1000 (EST)
Received: from gsmx07.alcatel.com.au by cim.alcatel.com.au
 (PMDF V5.2-32 #37645) with ESMTP id <01K4Q1VRF41CVNYT03@cim.alcatel.com.au>;
 Wed, 13 Jun 2001 15:40:28 +1000
Received: (from jeremyp@localhost)	by gsmx07.alcatel.com.au (8.11.1/8.11.1)
 id f5D5eMu37443; Wed, 13 Jun 2001 15:40:22 +1000 (EST envelope-from jeremyp)
Content-return: prohibited
Date: Wed, 13 Jun 2001 15:40:22 +1000
From: Peter Jeremy <peter.jeremy@alcatel.com.au>
Subject: Re: RELENG_4_3
In-reply-to: <016a01c0f3c2$19f27920$3200a8c0@Home>; from mail@max-info.net on
 Wed, Jun 13, 2001 at 12:33:44AM -0400
To: Ryan Masse <mail@max-info.net>
Cc: Rob Simmons <rsimmons@wlcg.com>, freebsd-security@FreeBSD.ORG
Mail-Followup-To: Ryan Masse <mail@max-info.net>,
	Rob Simmons <rsimmons@wlcg.com>, freebsd-security@FreeBSD.ORG
Message-id: <20010613154022.D95583@gsmx07.alcatel.com.au>
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-disposition: inline
User-Agent: Mutt/1.2.5i
References: <Pine.BSF.4.21.0106121806310.64291-100000@mail.wlcg.com>
 <016a01c0f3c2$19f27920$3200a8c0@Home>
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

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.

Peter

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