From owner-freebsd-stable@FreeBSD.ORG Fri Feb 25 13:42:29 2011 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51C96106566C for ; Fri, 25 Feb 2011 13:42:29 +0000 (UTC) (envelope-from marco@tolstoy.tols.org) Received: from tolstoy.tols.org (tolstoy.tols.org [IPv6:2a02:898:0:20::57:1]) by mx1.freebsd.org (Postfix) with ESMTP id DD29B8FC17 for ; Fri, 25 Feb 2011 13:42:28 +0000 (UTC) Received: from tolstoy.tols.org (localhost [127.0.0.1]) by tolstoy.tols.org (8.14.4/8.14.4) with ESMTP id p1PDgPeq023086 for ; Fri, 25 Feb 2011 13:42:25 GMT (envelope-from marco@tolstoy.tols.org) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.97 at tolstoy.tols.org Received: (from marco@localhost) by tolstoy.tols.org (8.14.4/8.14.4/Submit) id p1PDgPeg023085 for freebsd-stable@freebsd.org; Fri, 25 Feb 2011 14:42:25 +0100 (CET) (envelope-from marco) Date: Fri, 25 Feb 2011 14:42:25 +0100 From: Marco van Tol To: freebsd-stable@freebsd.org Message-ID: <20110225134225.GB19190@tolstoy.tols.org> Mail-Followup-To: freebsd-stable@freebsd.org References: <4D66CCFF.9020903@buffalo.edu> <86zkpkwff5.fsf@brain.hack.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <86zkpkwff5.fsf@brain.hack.org> User-Agent: Mutt/1.4.2.3i X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on tolstoy.tols.org Subject: Re: 8.2/7.4-RELEASEs Announced... X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 13:42:29 -0000 On Fri, Feb 25, 2011 at 11:56:46AM +0100, Michael Cardell Widerkrantz wrote: > Ken Smith, 2011-02-24 22:26 (+0100): > > > Just a quick note for those of you who are not subscribed to the > > freebsd-announce mail list... > > > > 8.2-RELEASE and 7.4-RELEASE have been announced. The announcement > > messages are available here: > > > > http://www.freebsd.org/releases/8.2R/announce.html > > http://www.freebsd.org/releases/7.4R/announce.html > > > > Enjoy. :-) > > Great news. > > However, a freebsd-update from a straight binary installed 8.1-RELEASE > gives me a dialogue to merge a lot of files in /etc/ with just the $Id$ > tag being different. That is, I get: > > The following changes, which occurred between FreeBSD 8.1-RELEASE and > FreeBSD 8.2-RELEASE have been merged into /etc/manpath.config: > --- current version > +++ new version > @@ -1,6 +1,6 @@ > -# $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.config,v 1.26.2.1.4.1 > 2010/06/14 02:09:06 kensmith Exp $ > +# $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.config,v 1.26.2.1.6.1 > 2010/12/21 17:09:25 kensmith Exp $ > # > # This file is read by manpath(1) to configure the mandatory manpath, > # optional manpath and to map each path element to a manpath element. > # The format is: > # > Does this look reasonable (y/n)? > > I'm afraid this will go on for all files in /etc. > > What just happened? How can I avoid it? > > I had this problem before and then in my frustration just commented out > this line in freebsd-update.conf: > > #MergeChanges /etc/ /var/named/etc/ /boot/device.hints > > I got lucky that time, but is this really safe? What if, say, a new > daemon has been installed in the upgrade and needs a new user. > > Any suggestions? Read up on the mergemaster manual for options "-F" and "-i" :-) Marco -- Micro$oft likes to discard vulnerabilities by `no standard client would do this.' No, and no `standard visitor' would apply a crowbar to your patio door, either." - H. Peter Anvin in linux-kernel.