From owner-freebsd-questions@FreeBSD.ORG Fri Apr 12 09:12:12 2013 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6474BA9F for ; Fri, 12 Apr 2013 09:12:12 +0000 (UTC) (envelope-from matthew@freebsd.org) Received: from smtp.infracaninophile.co.uk (smtp6.infracaninophile.co.uk [IPv6:2001:8b0:151:1:3cd3:cd67:fafa:3d78]) by mx1.freebsd.org (Postfix) with ESMTP id 1582C1A4D for ; Fri, 12 Apr 2013 09:12:11 +0000 (UTC) Received: from rufus.webfusion.com (mail.heartinternet.co.uk [79.170.40.31]) (authenticated bits=0) by smtp.infracaninophile.co.uk (8.14.6/8.14.6) with ESMTP id r3C9BsQN027732 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Fri, 12 Apr 2013 10:12:01 +0100 (BST) (envelope-from matthew@freebsd.org) DKIM-Filter: OpenDKIM Filter v2.8.2 smtp.infracaninophile.co.uk r3C9BsQN027732 Authentication-Results: smtp.infracaninophile.co.uk/r3C9BsQN027732; dkim=none reason="no signature"; dkim-adsp=none (unprotected policy) X-Authentication-Warning: lucid-nonsense.infracaninophile.co.uk: Host mail.heartinternet.co.uk [79.170.40.31] claimed to be rufus.webfusion.com Message-ID: <5167CFD9.6070106@freebsd.org> Date: Fri, 12 Apr 2013 10:11:53 +0100 From: Matthew Seaman User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130405 Thunderbird/17.0.5 MIME-Version: 1.0 To: Melanie Schulte Subject: Re: Keeping FreeBSD uptodate with svn, freebsd-update complaining References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.97.7 at lucid-nonsense.infracaninophile.co.uk X-Virus-Status: Clean X-Spam-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_SOFTFAIL autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on lucid-nonsense.infracaninophile.co.uk Cc: freebsd-questions@freebsd.org X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2013 09:12:12 -0000 On 12/04/2013 09:19, Melanie Schulte wrote: > [I wasn't sure what the most appropriate list for this issue is...] > > Hello! > > Recently (after the latest OpenSSL security issue) I have updated my > FreeBSD install from source. i.e., I have updated my source tree > (under /usr/src) with svn and did the > buildworld/buildkernel/installkernel/mergemaster/installworld/mergemaster > procedure. For completeness: My source tree contains this code > revision: > > URL: https://svn0.us-west.freebsd.org/base/releng/9.1 > Repository Root: https://svn0.us-west.freebsd.org/base > Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f > Revision: 249029 > > This was my first time, but I was following the handbook closely and > everything seems to have worked just fine. > > # uname -a > FreeBSD XXX 9.1-RELEASE-p2 FreeBSD 9.1-RELEASE-p2 #5 r249029: Wed Apr 3 > 12:29:28 CEST 2013 root@XXX:/usr/obj/usr/src/sys/FUGLOS amd64 > > But what I don't understand is the following. Whenever I execute > 'freebsd-update fetch' (I had added a 'freebsd-update cron' to my > crontab), the output below(!) is generated. > > It's not clear to me what this actually means: > > * Why does freebsd-update want to update my system to 9.1-RELEASE-p2, > although I _am_ running that version already? > > * Why does it want to update that specific list of files? This is just > a subset of of the the binary files which should have been installed > from installworld. What is special about this subset? > > * What is the proper way to 'resolve' this situation? > > I would be happy about some insights/pointers/help here! > Thank you very much, > melanie > Hi, Melanie, Your main problem here is trying to mix usage of SVN with usage of freebsd-update. You can use either one of those methods but not both. Unless you prefer to build your own, I'd recommend sticking with freebsd-update. It's much simpler and quicker to keep your systems up to date than the alternative. To recover from the mix of files you have from freebsd-update and self-compiled, it should be sufficient to run 'freebsd-update install' This is going to rewrite all the files that freebsd-update knows about that were altered by your self-built update: ie. most of the OS. Definitely make sure you have good backups before doing that. Yes, it may say 'upgrading to 9.1-RELEASE-p2' but that's because it is comparing against the previous version you got from freebsd-update, not what you compiled yourself. The list of files it shows are specifically the files that were changed between FreeBSD 9.1-RELEASE-p1 and 9.1-RELEASE-p2. freebsd-update is fast largely because it only installs the changed bits onto your system. Cheers, Matthew