bin/166404: [patch (resubmission)] src/usr.sbin/mptutil/mpt_show.c

2012-03-26 Thread Conrad J. Sabatier

Number: 166404
Category:   bin
Synopsis:   [patch (resubmission)] src/usr.sbin/mptutil/mpt_show.c
Confidential:   no
Severity:   serious
Priority:   medium
Responsible:freebsd-bugs
State:  open
Quarter:
Keywords:   
Date-Required:
Class:  change-request
Submitter-Id:   current-users
Arrival-Date:   Mon Mar 26 06:20:08 UTC 2012
Closed-Date:
Last-Modified:
Originator: Conrad J. Sabatier
Release:FreeBSD 10.0-CURRENT amd64
Organization:
Environment:
System: FreeBSD serene.no-ip.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0: Sun Feb 
12 19:15:46 CST 2012 conr...@serene.no-ip.org:/usr/obj/usr/src/sys/CUSTOM amd64

Description:

When building world with DEBUG defined, the build fails in the file
usr.sbin/mptutil/mpt_show.c in function show_physdisks().  This 
function is wrapped in an #idfef DEBUG conditional and so will not cause 
any problems when DEBUG is not defined, but when it is, an 'undefined 
identifier' error occurs due to there being no declaration for the 
variable 'error' (which *is* declared in other, similar functions which 
aren't DEBUG-dependent).

I originally submitted this patch back in late January, but it seems to 
have somehow simply fallen through the cracks.

How-To-Repeat:

Define DEBUG on a buildworld.  Sit back and wait for the inevitable.

Fix:

patch below

--- mptutil.diff begins here ---
Index: src/usr.sbin/mptutil/mpt_show.c
===
RCS file: /home/ncvs/src/usr.sbin/mptutil/mpt_show.c,v
retrieving revision 1.3
diff -u -r1.3 mpt_show.c
--- src/usr.sbin/mptutil/mpt_show.c 9 Nov 2010 19:28:06 -   1.3
+++ src/usr.sbin/mptutil/mpt_show.c 31 Jan 2012 19:22:16 -
@@ -538,7 +538,7 @@
 {
CONFIG_PAGE_RAID_PHYS_DISK_0 *pinfo;
U16 IOCStatus;
-   int fd, i;
+   int error, fd, i;
 
if (ac != 1) {
warnx(show drives: extra arguments);
--- mptutil.diff ends here ---

Release-Note:
Audit-Trail:
Unformatted:
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to freebsd-bugs-unsubscr...@freebsd.org


bin/164561: [patch] usr.sbin/pkg_install: update references to INDEX-8 for CURRENT

2012-01-27 Thread Conrad J. Sabatier

Number: 164561
Category:   bin
Synopsis:   [patch] usr.sbin/pkg_install: update references to INDEX-8 for 
CURRENT
Confidential:   no
Severity:   non-critical
Priority:   low
Responsible:freebsd-bugs
State:  open
Quarter:
Keywords:   
Date-Required:
Class:  change-request
Submitter-Id:   current-users
Arrival-Date:   Sat Jan 28 03:50:04 UTC 2012
Closed-Date:
Last-Modified:
Originator: Conrad J. Sabatier
Release:FreeBSD 10.0-CURRENT amd64
Organization:
Environment:
System: FreeBSD serene.no-ip.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0: Thu Jan 
26 09:38:49 CST 2012 r...@serene.no-ip.org:/usr/obj/usr/src/sys/CUSTOM amd64


Description:
pkg_version(1) refers to INDEX-8, should be INDEX-10 in CURRENT
How-To-Repeat:
N/A
Fix:
patch below

--- pkg_install.diff begins here ---
Index: /usr/src/usr.sbin/pkg_install/version/pkg_version.1
===
RCS file: /home/ncvs/src/usr.sbin/pkg_install/version/pkg_version.1,v
retrieving revision 1.40
diff -u -r1.40 pkg_version.1
--- /usr/src/usr.sbin/pkg_install/version/pkg_version.1 30 May 2008 14:26:09 
-  1.40
+++ /usr/src/usr.sbin/pkg_install/version/pkg_version.1 28 Jan 2012 03:30:24 
-
@@ -72,7 +72,7 @@
 .Nm
 will search for the package in the ports collection index file
 (typically
-.Pa /usr/ports/INDEX-8 ) .
+.Pa /usr/ports/INDEX-10 ) .
 Any matching version number(s) there will be used to determine whether
 the installed package is up-to-date or requires updating.
 .Pp
@@ -205,12 +205,12 @@
 If no
 .Ar index
 file is specified on the command line,
-.Pa /usr/ports/INDEX-8
+.Pa /usr/ports/INDEX-10
 is used.
 .El
 .Sh FILES
-.Bl -tag -width /usr/ports/INDEX-8 -compact
-.It Pa /usr/ports/INDEX-8
+.Bl -tag -width /usr/ports/INDEX-10 -compact
+.It Pa /usr/ports/INDEX-10
 Default index file.
 .El
 .Sh EXAMPLES
@@ -224,7 +224,7 @@
 The command below generates a report against
 the version numbers in the on-line ports collection:
 .Pp
-.Dl % pkg_version http://www.FreeBSD.org/ports/INDEX-8
+.Dl % pkg_version http://www.FreeBSD.org/ports/INDEX-10
 .Pp
 The following command compares two package version strings:
 .Pp
--- pkg_install.diff ends here ---


Release-Note:
Audit-Trail:
Unformatted:
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to freebsd-bugs-unsubscr...@freebsd.org