From owner-freebsd-current@FreeBSD.ORG Mon Aug 9 10:02:44 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 664) id 2FCE616A4CF; Mon, 9 Aug 2004 10:02:44 +0000 (GMT) Date: Mon, 9 Aug 2004 10:02:44 +0000 From: David O'Brien To: Jon Noack Message-ID: <20040809100244.GA17314@hub.freebsd.org> References: <410E3AA2.4030800@alumni.rice.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <410E3AA2.4030800@alumni.rice.edu> User-Agent: Mutt/1.4.1i X-Operating-System: FreeBSD 4.10-STABLE Organization: The NUXI BSD group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 cc: Edwin Groothuis cc: current@freebsd.org cc: Oliver Eikemeier 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: obrien@freebsd.org List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 10:02:44 -0000 On Mon, Aug 02, 2004 at 07:59:14AM -0500, Jon Noack wrote: > 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 This is getting really redicious. Edwin Groothuis should have never have submitted a patch that hardcoded -CURRENT in 4.08 and -STABLE in 4.10. And we don't have offical "revisions" (nor patchlevels, other than security branches), so that output is bad also. The only reasonable thing that doesn't have us chasing this all over the place is to print out the FreeBSD major version (and MAYBE the minor versoin) and leave it at that. The "FreeBSD" section of file(1)'s readelf.c has gotten beyond control. > 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 This output is mostly OK -- but I would drop the __FreeBSD_version. I can't see how knowing that helps anyone. If it is insisted on keeping it, it should be printed out consistently for *all* __FreeBSD_verions, not just some. -- -- David (obrien@FreeBSD.org)