From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Sep 14 16:00:37 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77B2616A41F for ; Wed, 14 Sep 2005 16:00:37 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C645843D4C for ; Wed, 14 Sep 2005 16:00:36 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j8EG0aN5043583 for ; Wed, 14 Sep 2005 16:00:36 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j8EG0aR3043576; Wed, 14 Sep 2005 16:00:36 GMT (envelope-from gnats) Resent-Date: Wed, 14 Sep 2005 16:00:36 GMT Resent-Message-Id: <200509141600.j8EG0aR3043576@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ted Faber Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5292316A41F for ; Wed, 14 Sep 2005 15:52:52 +0000 (GMT) (envelope-from faber@ISI.EDU) Received: from boreas.isi.edu (boreas.isi.edu [128.9.160.161]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6A9043D5C for ; Wed, 14 Sep 2005 15:52:50 +0000 (GMT) (envelope-from faber@ISI.EDU) Received: from pun.isi.edu (pun.isi.edu [128.9.160.150]) by boreas.isi.edu (8.11.6p2+0917/8.11.2) with ESMTP id j8EFqFk23079 for ; Wed, 14 Sep 2005 08:52:15 -0700 (PDT) Received: (from faber@localhost) by pun.isi.edu (8.13.4/8.13.4/Submit) id j8EFqEvJ032975; Wed, 14 Sep 2005 08:52:14 -0700 (PDT) (envelope-from faber) Message-Id: <200509141552.j8EFqEvJ032975@pun.isi.edu> Date: Wed, 14 Sep 2005 08:52:14 -0700 (PDT) From: Ted Faber To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/86128: recent xsysinfo patch breaks xsysinfo on current [patch] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Ted Faber List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Sep 2005 16:00:37 -0000 >Number: 86128 >Category: ports >Synopsis: recent xsysinfo patch breaks xsysinfo on current [patch] >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Sep 14 16:00:36 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Ted Faber >Release: FreeBSD 7.0-CURRENT i386 >Organization: ISI >Environment: System: FreeBSD pun.isi.edu 7.0-CURRENT FreeBSD 7.0-CURRENT #14: Mon Sep 12 13:07:34 PDT 2005 root@pun.isi.edu:/usr/obj/usr/src/sys/PUN i386 >Description: xsysinfo grunges around in the kernel looking for the number of open files. Somewhere between 5.3 and 5.4 the nfiles kernel variable changed name to openfiles (and the xsysinfo-1.4a_1 patch went in to fix that). Then before 5.4 release that variable name changed back in 5.4, but not in the 6.0+ branch. Then a patch went into xsysinfo from someone tracking -current (5.4) that removed the change to the new variable name (openfiles). This patch puts the openfiles name back in for FreeBSDversions > 600000, which seems to be the least breakage. I've talked it over with the fellows who patched xsysinfo-1.4_2 and we agree this seems like the right patch. Patches to this port have been being incorporated due to maintainer timeout. As this problem breaks the code on -CURRENT, it would be nice if we could expedite it. Let me know if you need more info. >How-To-Repeat: try to run xsysinfo-1.4a_2 on -CURRENT >Fix: Patch follows: diff -ruN xsysinfo.bak/Makefile xsysinfo/Makefile --- xsysinfo.bak/Makefile Wed Sep 7 09:44:55 2005 +++ xsysinfo/Makefile Wed Sep 14 08:41:28 2005 @@ -7,7 +7,7 @@ PORTNAME= xsysinfo PORTVERSION= 1.4a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= ftp://freebsd.csie.nctu.edu.tw/pub/jdli/source/ diff -ruN xsysinfo.bak/files/patch-sysinfo.c xsysinfo/files/patch-sysinfo.c --- xsysinfo.bak/files/patch-sysinfo.c Wed Sep 7 09:44:55 2005 +++ xsysinfo/files/patch-sysinfo.c Wed Sep 14 08:41:57 2005 @@ -56,7 +56,7 @@ + { "_numvnodes" }, +#define FNL_NFILE 4 +/* nfiles changes name to openfiles near this FreeBSD version */ -+#if XXX && __FreeBSD_version > 503101 ++#if __FreeBSD_version > 600000 + {"_openfiles"}, +#else + {"_nfiles"}, >Release-Note: >Audit-Trail: >Unformatted: