From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 10 14:30:26 2004 Return-Path: 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 EF53E16A4CF for ; Fri, 10 Dec 2004 14:30:25 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C560B43D3F for ; Fri, 10 Dec 2004 14:30:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iBAEUP7S076352 for ; Fri, 10 Dec 2004 14:30:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iBAEUPU1076350; Fri, 10 Dec 2004 14:30:25 GMT (envelope-from gnats) Resent-Date: Fri, 10 Dec 2004 14:30:25 GMT Resent-Message-Id: <200412101430.iBAEUPU1076350@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, "Joel Diaz" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC96816A4CE for ; Fri, 10 Dec 2004 14:24:12 +0000 (GMT) Received: from imf23aec.mail.bellsouth.net (imf23aec.mail.bellsouth.net [205.152.59.71]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70AE143D45 for ; Fri, 10 Dec 2004 14:24:12 +0000 (GMT) (envelope-from joeldiaz@bellsouth.net) Received: from fbsd.launchmodem.com ([65.8.96.129]) by imf23aec.mail.bellsouth.netESMTP <20041210142411.HTZI2382.imf23aec.mail.bellsouth.net@fbsd.launchmodem.com> for ; Fri, 10 Dec 2004 09:24:11 -0500 Message-Id: <1102688649.0@fbsd.launchmodem.com> Date: Fri, 10 Dec 2004 09:24:09 -0500 From: "Joel Diaz" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.1 Subject: ports/74916: sysutils/bpm - Patch which fixes running bpm on CURRENT X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Dec 2004 14:30:26 -0000 >Number: 74916 >Category: ports >Synopsis: sysutils/bpm - Patch which fixes running bpm on CURRENT >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Dec 10 14:30:25 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Joel Diaz >Release: FreeBSD 6.0-CURRENT i386 >Organization: >Environment: System: FreeBSD 6.0-CURRENT #0: Fri Dec 10 03:19:12 EST 2004 jdiaz@fbsd.launchmodem.com:/usr/obj/usr/src/sys/MYKERNEL >Description: There is no check in src/refresh.c for anything higher than 500036. The patch adjust the compilation for users of 6-CURRENT. >How-To-Repeat: Try running bpm on CURRENT, and you get a message saying INDEX-5 couldn't be found. >Fix: --- patch-src::refresh.c begins here --- --- src/refresh.c.orig Mon Aug 23 22:40:08 2004 +++ src/refresh.c Fri Dec 10 08:58:03 2004 @@ -62,7 +62,13 @@ __RCSID("$Id: refresh.c,v 1.32 2004/08/24 02:40:08 sethk Exp $"); /* XXX use libinstall/lib.h */ +#if __FreeBSD_version >= 600000 +#define INDEX_FN PORTS_BASE "/INDEX-6" +#elif __FreeBSD_version >= 500036 +#define INDEX_FN PORTS_BASE "/INDEX-5" +#else #define INDEX_FN PORTS_BASE "/INDEX" +#endif #define INDEX_MAXLN 4096 #define DB_DIR "/var/db/pkg" #define ITER_BYTES (128 * 1024) @@ -183,10 +189,12 @@ if (*sp == '|') ++i; - if (i != (PFIELD_NFIELD - 1)) + if (i < (PFIELD_NFIELD - 1)) { #ifdef DEBUG - warnx("invalid number of fields"); + warnx("invalid number of fields (%d should be %d)", + i + 1, + PFIELD_NFIELD); #endif /* DEBUG */ return FALSE; } @@ -195,12 +203,9 @@ for (i = 0; i < PFIELD_NFIELD; ++i) { - if (i < PFIELD_NFIELD - 1) - { - if (!(sp = strchr(line, '|'))) - break; - *sp++ = '\0'; - } + if (!(sp = strchr(line, '|')) && i < PFIELD_NFIELD - 1) + break; + *sp++ = '\0'; switch (i) { @@ -320,7 +325,6 @@ if (_refresh_index_parse(ln, portdp, rdp) != TRUE) { - _refresh_portfree(portdp); #ifdef DEBUG warnx("%s:%u: invalid format", INDEX_FN, rdp->rd_linec); #endif /* DEBUG */ --- patch-src::refresh.c ends here --- >Release-Note: >Audit-Trail: >Unformatted: