misc/123152: pkg_install/add/main.c : wrong version picked out by csup?

[Garrett Cooper]

>Number:         123152
>Category:       misc
>Synopsis:       pkg_install/add/main.c : wrong version picked out by csup?
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 27 23:40:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Cooper
>Release:        8-CURRENT
>Organization:
n/a
>Environment:
optimus# uname -a
FreeBSD optimus 8.0-CURRENT FreeBSD 8.0-CURRENT #10: Wed Apr 16 19:47:39 PDT 2008     root at optimus:/usr/obj/usr/src/sys/OPTIMUS  i386
>Description:
I haven't been able to run buildworld for quite some time because gcc chokes on some missing symbols in pkg_install. After doing some research it turns out that the reason why the correct version isn't being fetched by csup. I'm unsure why this is occurring, but it is...

When I grab the file using csup, it differs from the file available when I fetch it from CVS, and yet again differs from the file available on cvsweb.

Here are my references :

[root at optimus /devel/ncvs/src]# diff /usr/src/usr.sbin/pkg_install/add/main.c usr.sbin/pkg_install/add/main.c > /store/pkg_add_main.c; cat /store/pkg_add_main.c
22c22
< __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.73 2007/10/11 04:28:08 kensmith Exp $");
---
> __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.76 2008/02/26 14:35:01 kensmith Exp $");
30c30
< static char Options[] = "hvIRfFnrp:P:SMt:C:K";
---
> static char Options[] = "hviIRfFnrp:P:SMt:C:K";
39a40
> Boolean IgnoreDeps    = FALSE;
78a80,81
>       { 603000, 603099, "/packages-6.3-release" },
>       { 700000, 700099, "/packages-7.0-release" },
84c87
<       { 700000, 799000, "/packages-7-stable" },
---
>       { 700100, 799000, "/packages-7-stable" },
93c96
< static void usage __P((void));
---
> static void usage(void);
169a173,175
>       case 'i':
>           IgnoreDeps = TRUE;
>           break;
325c331
<       "usage: pkg_add [-vInfFrRMSK] [-t template] [-p prefix] [-P prefix] [-C chrootdir]",
---
>       "usage: pkg_add [-viInfFrRMSK] [-t template] [-p prefix] [-P prefix] [-C  chrootdir]",

CVSweb ref: <http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/pkg_install/add/main.c>.
>How-To-Repeat:
optimus# cat /root/srcs.sup
*default tag=.
*default host=cvsup4.freebsd.org
*default prefix=/usr/src
*default base=/var/db
*default release=cvs delete use-rel-suffix compress

src-all
optimus# csup /root/srcs.sup
Connected to 204.152.184.73
Updating collection src-all/cvs
Finished successfully
optimus# make clean depend all install
===> lib (clean)
# [...]
/usr/src/usr.sbin/pkg_install/add/perform.c: In function 'pkg_do':
/usr/src/usr.sbin/pkg_install/add/perform.c:255: error: 'IgnoreDeps' undeclared
(first use in this function)
/usr/src/usr.sbin/pkg_install/add/perform.c:255: error: (Each undeclared identifier is reported only once
/usr/src/usr.sbin/pkg_install/add/perform.c:255: error: for each function it appears in.)
*** Error code 1

Stop in /usr/src/usr.sbin/pkg_install/add.
*** Error code 1

Stop in /usr/src/usr.sbin/pkg_install.
optimus# su gcooper
[gcooper at optimus /devel/ncvs]$ echo $CVSROOT
anoncvs at anoncvs1.FreeBSD.org:/home/ncvs
[gcooper at optimus /devel/ncvs]$ cvs co src && cd src/usr.sbin
[..]
[gcooper at optimus /devel/ncvs/src/usr.sbin/pkg_install]$ make -j2 depend all
===> lib (depend)
===> lib (all)
#[...]
cc -O3 -pipe -fno-strict-aliasing -march=prescott -I/devel/ncvs/src/usr.sbin/pkg_install/version/../lib -Wsystem-headers -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wno-pointer-sign -Wformat=2 -Wno-format-extra-args  -o pkg_version main.o perform.o /devel/ncvs/src/usr.sbin/pkg_install/version/../lib/libinstall.a -lfetch -lmd -lssl -lcrypto
[gcooper at optimus /devel/ncvs/src/usr.sbin/pkg_install]$
>Fix:
Stick to cvs(1) (for now). Fetching via csup is currently broken.

>Release-Note:
>Audit-Trail:
>Unformatted: