From owner-freebsd-current@FreeBSD.ORG Mon Aug 2 12:59:53 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E36FE16A4CE for ; Mon, 2 Aug 2004 12:59:53 +0000 (GMT) Received: from smtp004.bizmail.sc5.yahoo.com (smtp004.bizmail.sc5.yahoo.com [66.163.175.81]) by mx1.FreeBSD.org (Postfix) with SMTP id B0E2043D55 for ; Mon, 2 Aug 2004 12:59:53 +0000 (GMT) (envelope-from noackjr@alumni.rice.edu) Received: from unknown (HELO optimator.noacks.org) (noackjr@supercrime.org@70.240.234.183 with login) by smtp004.bizmail.sc5.yahoo.com with SMTP; 2 Aug 2004 12:59:19 -0000 Received: from localhost (localhost [127.0.0.1]) by optimator.noacks.org (Postfix) with ESMTP id D5AB26168; Mon, 2 Aug 2004 07:59:18 -0500 (CDT) Received: from optimator.noacks.org ([127.0.0.1]) by localhost (optimator.noacks.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 92889-01; Mon, 2 Aug 2004 07:59:17 -0500 (CDT) Received: from compgeek.noacks.org (compgeek [192.168.1.10]) by optimator.noacks.org (Postfix) with ESMTP id AD8F46114; Mon, 2 Aug 2004 07:59:16 -0500 (CDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by compgeek.noacks.org (8.13.1/8.13.1) with ESMTP id i72CxElF009992; Mon, 2 Aug 2004 07:59:15 -0500 (CDT) (envelope-from noackjr@alumni.rice.edu) Message-ID: <410E3AA2.4030800@alumni.rice.edu> Date: Mon, 02 Aug 2004 07:59:14 -0500 From: Jon Noack User-Agent: Mozilla Thunderbird 0.7.2 (X11/20040802) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Oliver Eikemeier References: In-Reply-To: Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new at noacks.org cc: Edwin Groothuis cc: current@freebsd.org Subject: Re: upgrade of file(1) to 4.10 (including FreeBSD elf(5) fixes) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: noackjr@alumni.rice.edu List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Aug 2004 12:59:54 -0000 On 08/02/04 07:15, Oliver Eikemeier wrote: > I've prepared an upgrade to file-4.10 at: > > > > This fixes > > PR bin/63830: [patch] file(1) doesn't recognize FreeBSD 5.x > executables properly > > and an MFC will fix the problems of FreeBSD 4.10 being identified as > 4.9.1. I'll do some more testing (GCC 3.4) and think we should commit > this before the 5.3 src freeze, especially since it has been discussed > over a month ago: > *sigh* Why does Christos Zoulas ignore me? He keeps telling me he'll include my patch and then includes someone else's that doesn't fix the problems. In any case, my patch (against file 4.09) to fix the versioning: http://www.noacks.org/freebsd/readelf.c.diff I made a test program to compare the output. Here's the way things would look with file 4.10: http://www.noacks.org/freebsd/output-4.10.txt Note that 5.x is hardcoded as -CURRENT. This is asking to be fixed in a few months when 5.x goes -STABLE and 6.x appears. Better not to print branch names at all (for dev branches I just print the whole version value in parentheses). There are other minor nits like 5.0.4 and 4.15.30... Here's the output of my patch: http://www.noacks.org/freebsd/output.txt My version is highly accurate for every version we've had so far and I've even checked with re@ to ensure it'll be accurate in the future. It won't need to be fixed in a few months. Here's to resubmitting for file 4.11... Jon