Subject: Differences in the NetBSD source, ftp and CVS
To: None <tech-kern@netbsd.org>
From: Bharani Chadalavada <bharani.chadalavada@nexsi.com>
List: tech-kern
Date: 02/03/2001 14:55:44
This is a multi-part message in MIME format.
--------------FE0529EA15485DF298D058D2
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi,

I downloaded the NetBSD-1-5-RELEASE sources both from ftp and CVS. And
I happen to notice some differences in the sys sources. I am attaching
the output from the recursive diff that I did.

/tmp/netbsd15 is the ftp downloaded, untarred, unzipped sources.
/tmp/cvscheckout is the cvs checkout version. Particularly there are lot
of empty directories in the checkout version and two files if_gre.c and
if_gif.c have changed.

What is supposed to be the correct version? Or is it the case that both
are OK? Someone who is knowledgeable, please explain.

I did not do the userland diff yet.

Also, if this is not the correct mailing list, pardon me and direct me
to the correct one.

Thank you,
Bharani.


--------------FE0529EA15485DF298D058D2
Content-Type: text/plain; charset=us-ascii;
 name="sysdiff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="sysdiff"

diff -r /tmp/netbsd15/usr/src/sys /tmp/netbsd15/cvs_checkout/src/sys --exclude CVS
Only in /tmp/netbsd15/cvs_checkout/src/sys: altq
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/alpha/compile: build_all
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/alpha/compile: rebuild_all
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/alpha: sableio
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/alpha/stand/boot: libsa
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/alpha/stand/bootxx: libsa
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/alpha/stand: installboot_cd9660
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/alpha/stand: xxboot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/alpha: wscons
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/amiga/compile: AMIGA
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/amiga/dev: grf
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/amiga: doc
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/amiga: floppy
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/amiga: fpsp
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/amiga/stand/binpatch: sys
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/amiga/stand: boot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/amiga/stand: iteconfig
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/amiga/stand: videomode
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/amiga: sunos
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/amigappc: compile
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch: arm
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/arm26: stand
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/arm32: boot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/arm32/dev: console
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/arm32: fpe-sp
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/arm32: kshell
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/atari/stand: chg_pid
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/atari/stand: loadbsd
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/atari/stand: rawwrite
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/bebox/isa: pcvt
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/cobalt/conf: RCS
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/cobalt/dev: RCS
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/cobalt/include: RCS
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/cobalt/pci: RCS
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/cobalt/stand: installboot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch: da30
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch: dreamcast
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/hp300/hp300: DOC
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/hp300: hpux
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/hp300/stand: libsa
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch: hpc
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/hpcmips/stand: libz
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch: hpcsh
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/i386: apm_init
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/i386: boot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/i386: floppy
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/i386/isa: ic
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/i386/isa: pcvt
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/i386: netboot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/i386/stand: pxeboot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch: mac
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/mac68k: scsi
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch: mipsco
diff -r --exclude CVS /tmp/netbsd15/usr/src/sys/arch/mvme68k/conf/VME162 /tmp/netbsd15/cvs_checkout/src/sys/arch/mvme68k/conf/VME162
1c1
< #	$NetBSD$
---
> #	$NetBSD: VME162,v 1.1.2.1 2000/10/17 19:43:57 scw Exp $
diff -r --exclude CVS /tmp/netbsd15/usr/src/sys/arch/mvme68k/dev/zs_pcctwo.c /tmp/netbsd15/cvs_checkout/src/sys/arch/mvme68k/dev/zs_pcctwo.c
1c1
< /*	$NetBSD$	*/
---
> /*	$NetBSD: zs_pcctwo.c,v 1.1.2.1 2000/10/17 19:54:48 scw Exp $	*/
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/mvme68k: docs
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch: news
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/pc532: scsi
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch: pica
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/pmax: dist
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/pmax/stand: dec_label
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/pmax/stand: lib
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/pmax/stand: libsa
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/pmax/stand: scsiboot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/pmax: test
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/pmax: ultrix
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/powerpc: compile
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/powerpc: stand
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sgimips: eisa
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sgimips: hpc
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sgimips: stand
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sparc: rcons
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sparc: sbus
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sparc: scsi
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sparc: sunos
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sparc64: fpu
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sparc64/stand: bootblk
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sparc64/stand: installboot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sparc64/stand: ofwboot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sun3: boot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sun3/compile: libcompat
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sun3/compile: libkern
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sun3: netboot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sun3/stand: boot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/sun3/stand: libnet
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch: sun3x
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/vax: mscp
diff -r --exclude CVS /tmp/netbsd15/usr/src/sys/arch/vax/vax/unimpl_emul.s /tmp/netbsd15/cvs_checkout/src/sys/arch/vax/vax/unimpl_emul.s
1c1
< /*	$NetBSD$	*/
---
> /*	$NetBSD: unimpl_emul.s,v 1.2.2.1 2000/08/14 21:11:02 ragge Exp $	*/
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/x68k: fdboot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/x68k: sdboot
Only in /tmp/netbsd15/cvs_checkout/src/sys/arch/x68k/stand: gunzip
Only in /tmp/netbsd15/cvs_checkout/src/sys: boot
Only in /tmp/netbsd15/cvs_checkout/src/sys: cfs
Only in /tmp/netbsd15/cvs_checkout/src/sys: codeset
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat: aoutm68k
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat/linux: alpha
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat/linux: arm
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat/linux: i386
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat/linux: include
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat/linux: m68k
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat/linux: mips
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat/linux: multiarch
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat/linux: ppc
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat/linux: sparc
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat/linux: sparc64
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat: sparc32
Only in /tmp/netbsd15/cvs_checkout/src/sys/compat: sunos32
Only in /tmp/netbsd15/cvs_checkout/src/sys/dev: apm
Only in /tmp/netbsd15/cvs_checkout/src/sys/dev/dec: qbus
Only in /tmp/netbsd15/cvs_checkout/src/sys/dev/dec: uba
Only in /tmp/netbsd15/cvs_checkout/src/sys/dev: i2o
Only in /tmp/netbsd15/cvs_checkout/src/sys/dev: lsu
Only in /tmp/netbsd15/cvs_checkout/src/sys/dev/microcode: daic
Only in /tmp/netbsd15/cvs_checkout/src/sys/dev: news
Only in /tmp/netbsd15/cvs_checkout/src/sys/dev: scsi
Only in /tmp/netbsd15/cvs_checkout/src/sys: kgdb
Only in /tmp/netbsd15/cvs_checkout/src/sys/lib: libc_sa
Only in /tmp/netbsd15/cvs_checkout/src/sys/lib/libkern/arch: arm
Only in /tmp/netbsd15/cvs_checkout/src/sys/lib/libkern: hp300
Only in /tmp/netbsd15/cvs_checkout/src/sys/lib/libkern: i386
Only in /tmp/netbsd15/cvs_checkout/src/sys/lib/libkern: kernel
Only in /tmp/netbsd15/cvs_checkout/src/sys/lib/libkern: m68k
Only in /tmp/netbsd15/cvs_checkout/src/sys/lib/libkern: mips
Only in /tmp/netbsd15/cvs_checkout/src/sys/lib/libkern: ns32k
Only in /tmp/netbsd15/cvs_checkout/src/sys/lib/libkern: pc532
Only in /tmp/netbsd15/cvs_checkout/src/sys/lib/libkern: sparc
Only in /tmp/netbsd15/cvs_checkout/src/sys/lib: libnetboot
Only in /tmp/netbsd15/cvs_checkout/src/sys: libkern
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm/compat: aout
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm/compat: aoutm68k
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm/compat: hpux
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm/compat: ibcs2
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm/compat: netbsd32
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm/compat: osf1
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm/compat: ultrix
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm: exec
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm: misc
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm: syscall
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm/vfs: filecorefs
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm/vfs/miscfs: deadfs
Only in /tmp/netbsd15/cvs_checkout/src/sys/lkm/vfs/miscfs: fifofs
Only in /tmp/netbsd15/cvs_checkout/src/sys/miscfs: devfs
Only in /tmp/netbsd15/cvs_checkout/src/sys/miscfs: lofs
Only in /tmp/netbsd15/cvs_checkout/src/sys/miscfs/union: libc
Only in /tmp/netbsd15/cvs_checkout/src/sys/net: .if_gif.c.swp
diff -r --exclude CVS /tmp/netbsd15/usr/src/sys/net/if_gif.c /tmp/netbsd15/cvs_checkout/src/sys/net/if_gif.c
1c1
< /*	$NetBSD: if_gif.c,v 1.10.4.2 2000/10/17 02:19:17 tv Exp $	*/
---
> /*	$NetBSD: if_gif.c,v 1.10.4.3 2000/11/19 20:21:09 tv Exp $	*/
57a58
> #include <sys/proc.h>
441a443
> 	struct proc *p = curproc;	/* XXX */
459a462,463
> 		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
> 			break;
486a491,492
> 			if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
> 				break;
500a507,508
> 		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
> 			break;
614a623,624
> 		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
> 			break;
diff -r --exclude CVS /tmp/netbsd15/usr/src/sys/net/if_gre.c /tmp/netbsd15/cvs_checkout/src/sys/net/if_gre.c
1c1
< /*	$NetBSD: if_gre.c,v 1.9.6.1 2000/08/25 01:13:25 mjl Exp $ */
---
> /*	$NetBSD: if_gre.c,v 1.9.6.2 2000/11/19 20:21:50 tv Exp $ */
60a61
> #include <sys/proc.h>
328c329
< 
---
> 	struct proc *p = curproc;	/* XXX */
343a345,346
> 		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
> 			break;
362a366,367
> 		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
> 			break;
380a386,387
> 		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
> 			break;
391a399,400
> 		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
> 			break;
406a416,417
> 		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
> 			break;
425a437,438
> 		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
> 			break;
Only in /tmp/netbsd15/cvs_checkout/src/sys: netisdn
Only in /tmp/netbsd15/cvs_checkout/src/sys/netiso/xebec: test
Only in /tmp/netbsd15/cvs_checkout/src/sys: netsmb
Only in /tmp/netbsd15/cvs_checkout/src/sys: pcfs
Only in /tmp/netbsd15/cvs_checkout/src/sys: scsi
Only in /tmp/netbsd15/cvs_checkout/src/sys: smbfs

--------------FE0529EA15485DF298D058D2--