Date: Wed, 13 Jun 2001 15:40:22 +1000 From: Peter Jeremy <peter.jeremy@alcatel.com.au> To: Ryan Masse <mail@max-info.net> Cc: Rob Simmons <rsimmons@wlcg.com>, freebsd-security@FreeBSD.ORG Subject: Re: RELENG_4_3 Message-ID: <20010613154022.D95583@gsmx07.alcatel.com.au> In-Reply-To: <016a01c0f3c2$19f27920$3200a8c0@Home>; from mail@max-info.net on Wed, Jun 13, 2001 at 12:33:44AM -0400 References: <Pine.BSF.4.21.0106121806310.64291-100000@mail.wlcg.com> <016a01c0f3c2$19f27920$3200a8c0@Home>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010613154022.D95583>