From owner-freebsd-questions@FreeBSD.ORG Tue Mar 30 11:45:58 2004 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 925D616A4CE for ; Tue, 30 Mar 2004 11:45:58 -0800 (PST) Received: from voyager.twobirds.us (c-24-18-214-102.client.comcast.net [24.18.214.102]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7398043D39 for ; Tue, 30 Mar 2004 11:45:58 -0800 (PST) (envelope-from joshua@twobirds.us) Received: from [12.18.154.2] (helo=localhost) by voyager.twobirds.us with esmtp (Exim 4.30; FreeBSD) id 1B8PAq-000FkW-Fd for freebsd-questions@freebsd.org; Tue, 30 Mar 2004 11:45:24 -0800 Date: Tue, 30 Mar 2004 11:45:52 -0800 From: Joshua Lokken To: freebsd-questions@freebsd.org Message-ID: <20040330194352.GA1816@cs025_2k> Mail-Followup-To: freebsd-questions@freebsd.org References: <38632096-81B7-11D8-A410-00039352A78A@calarts.edu> <20040329214036.GA2847@gothmog.gr> <4069C569.1000502@mac.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4069C569.1000502@mac.com> User-Agent: Mutt/1.4.1i X-Organization: Little to none... Subject: Re: Security Updates and Patching Two Choices? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Mar 2004 19:45:58 -0000 * Chuck Swiger [2004-03-30 11:14]: > Giorgos Keramidas wrote: > >On 2004-03-29 15:07, Charles Swiger wrote: > >>On Mar 29, 2004, at 2:28 PM, Sean Murphy wrote: > [ ... ] > >>>If a tag just the 4_9 Release in the CVSupfile can i just ignore the > >>>mergemaster? also can I just CVSup the sources and build the ones I > >>>want? (see above) > >> > >>Generally one can ignore doing the mergemaster simply for a security > >>patch. > > > >Unless, of course, the security patch fixes problems in /etc files that > >mergemaster *must* update. It's not very difficult to run mergemaster. > >I wouldn't recomment avoiding it altogether. [ ... ] > > Oh, I agree with you: I think mergemaster is a useful tool, and I don't > think it's very difficult to use. > > Reasonable people disagree, however. In particular, people who aren't > familiar with diff generally find mergemaster to be incomprehensible. :-) > >From a [relative] newbie; it's only incomprehensible the first time or two. -- Joshua A woman should have compassion. -- Kirk, "Catspaw", stardate 3018.2