Date: Sun, 29 Sep 2002 21:03:13 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 18360 for review Message-ID: <200209300403.g8U43DOs001557@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18360 Change 18360 by rwatson@rwatson_tislabs on 2002/09/29 21:03:07 Integ main tree into TrustedBSD base tree. VFS cleanups, et al. We're probably about ready to integ to the MAC tree. Affected files ... .. //depot/projects/trustedbsd/base/Makefile#13 integrate .. //depot/projects/trustedbsd/base/bin/chmod/chmod.1#6 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#9 integrate .. //depot/projects/trustedbsd/base/bin/rcp/util.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/error.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/error.h#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/exec.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/redir.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/show.c#5 integrate .. //depot/projects/trustedbsd/base/etc/defaults/pccard.conf#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/moused#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libg2c/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcc/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libregex/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/Makefile#7 integrate .. //depot/projects/trustedbsd/base/include/Makefile#15 integrate .. //depot/projects/trustedbsd/base/include/getopt.h#1 branch .. //depot/projects/trustedbsd/base/include/wchar.h#9 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/kerberosIV/lib/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/csu/i386-elf/crt1.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libalias/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libbz2/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/asprintf.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/getwc.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/getwchar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/putwc.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/putwchar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vasprintf.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vswprintf.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/getopt_long.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/getopt_long.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/string/wcscat.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcscpy.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libdevstat/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libedit/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libftpio/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libisc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libncp/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/libnetgraph/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libopie/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libpam/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/lib/libpcap/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libradius/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libsmb/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libtacplus/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libusbhid/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libutil/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libvgl/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libwrap/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libxpg4/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/liby/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libypclnt/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/Makefile#20 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#10 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/errata/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#8 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent#2 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/init/init.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.8#4 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#15 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#16 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pst.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man7/hier.7#7 integrate .. //depot/projects/trustedbsd/base/share/man/man7/release.7#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_IOCTL.9#4 integrate .. //depot/projects/trustedbsd/base/share/termcap/termcap.src#10 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_low.c#5 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_venus.c#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.sparc64#12 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#14 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#14 integrate .. //depot/projects/trustedbsd/base/sys/conf/majors#10 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_input.c#4 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_watch.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic/aic.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_eisa.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_pci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.reg#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.seq#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_inline.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm_gram.y#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm_scan.l#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-all.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_core.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus_cis.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/dgb/dgb.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/digi.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/eisa/eisaconf.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midwayvar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/mca/mca_bus.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/pnaphy.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rlphy.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/pst/pst-raid.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/pucvar.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbni_isa.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbni_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_pci.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_vars.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wireg.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wivar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/deadfs/dead_vnops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#12 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vfsops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_ioctl.c#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vnops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/specfs/spec_vnops.c#12 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_aes.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_enc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_event.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_int.h#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_kern.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mbr.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_pc98.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.h#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_sunlabel.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/initcpu.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#20 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/segments.h#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/sysarch.h#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/npx.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_cfgreg.c#10 integrate .. //depot/projects/trustedbsd/base/sys/isa/fd.c#7 integrate .. //depot/projects/trustedbsd/base/sys/isa/isa_common.c#4 integrate .. //depot/projects/trustedbsd/base/sys/isa/pnp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vfsops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vnops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_alq.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_conf.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mib.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/link_elf.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_diskmbr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_generic.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#28 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#22 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#10 integrate .. //depot/projects/trustedbsd/base/sys/net/if.h#10 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#13 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#10 integrate .. //depot/projects/trustedbsd/base/sys/net/rtsock.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_input.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netatm/sigpvc/sigpvc_subr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/uniip.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#15 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/fd.c#9 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/sio.c#14 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/sio_cbus.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/syscons.c#8 integrate .. //depot/projects/trustedbsd/base/sys/pccard/pccard_beep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/pccard/pcic.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pccard/pcic_pci.c#8 integrate .. //depot/projects/trustedbsd/base/sys/pccard/pcic_pci.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/intr_machdep.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/pci/psycho.c#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/elf_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#7 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/interrupt.S#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/intr_machdep.c#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/alq.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/conf.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/linker.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#22 integrate .. //depot/projects/trustedbsd/base/sys/sys/types.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#27 integrate .. //depot/projects/trustedbsd/base/sys/tools/vnode_if.awk#7 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/inode.h#5 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#17 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#10 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#11 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#18 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#14 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/GLib/Makefile#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T013/ref.conf#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T013/testprg.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T014/ref.conf#6 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/geom_sim.h#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/fstat/fstat.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/compat.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/cond.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/dir.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/job.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/job.h#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/main.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/make.1#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/make.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/parse.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/str.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/suff.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/targ.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/var.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/file.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/pccardd.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/pccardd.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/install.c#8 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile#13 (text+ko) ==== @@ -1,8 +1,10 @@ # -# $FreeBSD: src/Makefile,v 1.265 2002/09/17 01:48:47 peter Exp $ +# $FreeBSD: src/Makefile,v 1.266 2002/09/26 04:40:54 phk Exp $ # # The user-driven targets are: # +# universe - *Really* build *everything*: Buildworld and +# all kernels on all architectures. # buildworld - Rebuild *everything*, including glue to help do # upgrades. # installworld - Install everything built by "buildworld". @@ -213,3 +215,39 @@ ${UPGRADE} : upgrade_checks @cd ${.CURDIR}; \ ${MAKE} -f Makefile.upgrade -m ${.CURDIR}/share/mk ${.TARGET} + + +universe: + @echo "--------------------------------------------------------------" + @echo ">>> make universe started on ${STARTTIME}" + @echo "--------------------------------------------------------------" +.for arch in i386 sparc64 alpha ia64 + @printf ">> ${arch} started on `LC_ALL=C date`\n" + -cd ${.CURDIR} && make ${JFLAG} buildworld TARGET_ARCH=${arch} \ + __MAKE_CONF=/dev/null \ + > _.${arch}.buildworld 2>&1 + @printf ">> ${arch} buildworld ended on `LC_ALL=C date`\n" +.if exists(sys/${arch}/conf/NOTES) + cd ${.CURDIR}/sys/${arch}/conf && make LINT \ + > _.${arch}.makeLINT 2>&1 +.endif + cd ${.CURDIR} && make buildkernels TARGET_ARCH=${arch} JFLAG="${JFLAG}" + @printf ">> ${arch} ended on `LC_ALL=C date`\n" +.endfor + @echo "--------------------------------------------------------------" + @printf ">>> make universe completed on `LC_ALL=C date`\n (started ${STARTTIME})\n" + @echo "--------------------------------------------------------------" + +KERNCONFS != echo ${.CURDIR}/sys/${TARGET_ARCH}/conf/[A-Z]* +KERNCONF2 = ${KERNCONFS:T:N*[a-z]*:NCVS:NNOTES} + +buildkernels: +.for kernel in ${KERNCONF2} +.if exists(${.CURDIR}/sys/${TARGET_ARCH}/conf/${kernel}) + -cd ${.CURDIR} && make ${JFLAG} buildkernel \ + TARGET_ARCH=${TARGET_ARCH} KERNCONF=${kernel} \ + __MAKE_CONF=/dev/null \ + > _.${TARGET_ARCH}.${kernel} 2>&1 +.endif +.endfor + ==== //depot/projects/trustedbsd/base/bin/chmod/chmod.1#6 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.31 2002/08/09 10:34:57 ru Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.32 2002/09/28 23:05:58 trhodes Exp $ .\" .Dd March 31, 1994 .Dt CHMOD 1 @@ -163,7 +163,7 @@ .Pp For example, the absolute mode that permits read, write and execute by the owner, read and execute by group members, read and execute by -others, and no set-uid or set-gid behaviour is 755 +others, and no set-uid or set-gid behavior is 755 (400+200+100+040+010+004+001). .Pp The symbolic mode is described by the following grammar: ==== //depot/projects/trustedbsd/base/bin/ps/keyword.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.54 2002/09/17 17:13:52 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.56 2002/09/27 01:44:30 jmallett Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -264,8 +264,11 @@ } } free(tempstr1); - if (!vhead) - errx(1, "no valid keywords"); + if (!vhead) { + warnx("no valid keywords; valid keywords:"); + showkey(); + exit(1); + } } static VAR * ==== //depot/projects/trustedbsd/base/bin/rcp/util.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rcp/util.c,v 1.14 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/util.c,v 1.15 2002/09/29 07:59:57 jmallett Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -155,7 +155,7 @@ } void -lostconn(int signo) +lostconn(int signo __unused) { if (!iamremote) warnx("lost connection"); ==== //depot/projects/trustedbsd/base/bin/sh/error.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.23 2002/08/21 17:32:44 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.24 2002/09/29 11:37:39 tjr Exp $"); /* * Errors and exceptions. @@ -180,91 +180,3 @@ exverror(cond, msg, ap); va_end(ap); } - - - -/* - * Table of error messages. - */ - -struct errname { - short errcode; /* error number */ - short action; /* operation which encountered the error */ - char *msg; /* text describing the error */ -}; - - -#define ALL (E_OPEN|E_CREAT|E_EXEC) - -STATIC const struct errname errormsg[] = { - { EINTR, ALL, "interrupted" }, - { EACCES, ALL, "permission denied" }, - { EIO, ALL, "I/O error" }, - { ENOENT, E_OPEN, "no such file" }, - { ENOENT, E_CREAT,"directory nonexistent" }, - { ENOENT, E_EXEC, "not found" }, - { ENOTDIR, E_OPEN, "no such file" }, - { ENOTDIR, E_CREAT,"directory nonexistent" }, - { ENOTDIR, E_EXEC, "not found" }, - { EISDIR, ALL, "is a directory" }, -#ifdef notdef - { EMFILE, ALL, "too many open files" }, -#endif - { ENFILE, ALL, "file table overflow" }, - { ENOSPC, ALL, "file system full" }, -#ifdef EDQUOT - { EDQUOT, ALL, "disk quota exceeded" }, -#endif -#ifdef ENOSR - { ENOSR, ALL, "no streams resources" }, -#endif - { ENXIO, ALL, "no such device or address" }, - { EROFS, ALL, "read-only file system" }, - { ETXTBSY, ALL, "text busy" }, - { ENOMEM, ALL, "not enough memory" }, -#ifdef ENOLINK - { ENOLINK, ALL, "remote access failed" }, -#endif -#ifdef EMULTIHOP - { EMULTIHOP, ALL, "remote access failed" }, -#endif -#ifdef ECOMM - { ECOMM, ALL, "remote access failed" }, -#endif -#ifdef ESTALE - { ESTALE, ALL, "remote access failed" }, -#endif -#ifdef ETIMEDOUT - { ETIMEDOUT, ALL, "remote access failed" }, -#endif -#ifdef ELOOP - { ELOOP, ALL, "symbolic link loop" }, -#endif - { E2BIG, E_EXEC, "argument list too long" }, -#ifdef ELIBACC - { ELIBACC, E_EXEC, "shared library missing" }, -#endif - { EEXIST, E_CREAT, "file exists" }, - { 0, 0, NULL }, -}; - - -/* - * Return a string describing an error. The returned string may be a - * pointer to a static buffer that will be overwritten on the next call. - * Action describes the operation that got the error. - */ - -char * -errmsg(int e, int action) -{ - struct errname const *ep; - static char buf[12]; - - for (ep = errormsg ; ep->errcode ; ep++) { - if (ep->errcode == e && (ep->action & action) != 0) - return ep->msg; - } - fmtstr(buf, sizeof buf, "error %d", e); - return buf; -} ==== //depot/projects/trustedbsd/base/bin/sh/error.h#4 (text+ko) ==== @@ -34,18 +34,9 @@ * SUCH DAMAGE. * * @(#)error.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/error.h,v 1.15 2002/07/19 08:09:04 tjr Exp $ - */ - -/* - * Types of operations (passed to the errmsg routine). + * $FreeBSD: src/bin/sh/error.h,v 1.16 2002/09/29 11:37:39 tjr Exp $ */ -#define E_OPEN 01 /* opening a file */ -#define E_CREAT 02 /* creating a file */ -#define E_EXEC 04 /* executing a program */ - - /* * We enclose jmp_buf in a structure so that we can declare pointers to * jump locations. The global variable handler contains the location to @@ -93,7 +84,6 @@ void onint(void); void error(const char *, ...) __printf0like(1, 2); void exerror(int, const char *, ...) __printf0like(2, 3); -char *errmsg(int, int); /* ==== //depot/projects/trustedbsd/base/bin/sh/exec.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.20 2002/07/19 08:09:04 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.21 2002/09/29 11:37:39 tjr Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -144,7 +144,7 @@ exerrno = 2; break; } - exerror(EXEXEC, "%s: %s", argv[0], errmsg(e, E_EXEC)); + exerror(EXEXEC, "%s: %s", argv[0], strerror(e)); } @@ -420,7 +420,7 @@ if (cmdp) delete_cmd_entry(); if (printerr) - outfmt(out2, "%s: %s\n", name, errmsg(e, E_EXEC)); + outfmt(out2, "%s: %s\n", name, strerror(e)); entry->cmdtype = CMDUNKNOWN; return; ==== //depot/projects/trustedbsd/base/bin/sh/redir.c#7 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.21 2002/07/18 12:24:35 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.23 2002/09/29 12:38:25 tjr Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -179,7 +179,7 @@ case NFROM: fname = redir->nfile.expfname; if ((f = open(fname, O_RDONLY)) < 0) - error("cannot open %s: %s", fname, errmsg(errno, E_OPEN)); + error("cannot open %s: %s", fname, strerror(errno)); movefd: if (f != fd) { close(fd); @@ -189,54 +189,26 @@ break; case NFROMTO: fname = redir->nfile.expfname; -#ifdef O_CREAT if ((f = open(fname, O_RDWR|O_CREAT, 0666)) < 0) - error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); -#else - if ((f = open(fname, O_RDWR, 0666)) < 0) { - if (errno != ENOENT) - error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); - else if ((f = creat(fname, 0666)) < 0) - error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); - else { - close(f); - if ((f = open(fname, O_RDWR)) < 0) { - error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); - remove(fname); - } - } - } -#endif + error("cannot create %s: %s", fname, strerror(errno)); goto movefd; case NTO: fname = redir->nfile.expfname; if (Cflag && stat(fname, &sb) != -1 && S_ISREG(sb.st_mode)) error("cannot create %s: %s", fname, - errmsg(EEXIST, E_CREAT)); -#ifdef O_CREAT + strerror(EEXIST)); if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0) - error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); -#else - if ((f = creat(fname, 0666)) < 0) - error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); -#endif + error("cannot create %s: %s", fname, strerror(errno)); goto movefd; case NCLOBBER: fname = redir->nfile.expfname; if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0) - error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); + error("cannot create %s: %s", fname, strerror(errno)); goto movefd; case NAPPEND: fname = redir->nfile.expfname; -#ifdef O_APPEND if ((f = open(fname, O_WRONLY|O_CREAT|O_APPEND, 0666)) < 0) - error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); -#else - if ((f = open(fname, O_WRONLY)) < 0 - && (f = creat(fname, 0666)) < 0) - error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); - lseek(f, (off_t)0, 2); -#endif + error("cannot create %s: %s", fname, strerror(errno)); goto movefd; case NTOFD: case NFROMFD: @@ -287,9 +259,7 @@ signal(SIGINT, SIG_IGN); signal(SIGQUIT, SIG_IGN); signal(SIGHUP, SIG_IGN); -#ifdef SIGTSTP signal(SIGTSTP, SIG_IGN); -#endif signal(SIGPIPE, SIG_DFL); if (redir->type == NHERE) xwrite(pip[1], redir->nhere.doc->narg.text, len); ==== //depot/projects/trustedbsd/base/bin/sh/show.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/show.c,v 1.18 2002/07/09 03:26:47 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/show.c,v 1.19 2002/09/29 12:38:25 tjr Exp $"); #include <stdio.h> #include <stdarg.h> @@ -374,9 +374,7 @@ { char s[100]; char *getenv(); -#ifdef O_APPEND int flags; -#endif if (!debug) return; @@ -399,10 +397,8 @@ fprintf(stderr, "Can't open %s: %s\n", s, strerror(errno)); return; } -#ifdef O_APPEND if ((flags = fcntl(fileno(tracefile), F_GETFL, 0)) >= 0) fcntl(fileno(tracefile), F_SETFL, flags | O_APPEND); -#endif fputs("\nTracing started.\n", tracefile); fflush(tracefile); } ==== //depot/projects/trustedbsd/base/etc/defaults/pccard.conf#13 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.242 2002/09/06 17:45:36 iwasaki Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.252 2002/09/30 01:19:52 imp Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -157,7 +157,10 @@ card "IBM" "IBM17JSSFP10" config auto "ata" ? iosize 16 -# XXX NOT SURE SUPPORTED +# IBM IDE PC-CARD CDROM (ThinkPad 240 and others) +card "PCMCIA" "IDE CARD" + config auto "ata" ? + # IBM Portable 4X Speed CD-ROM Drive CD-400 #card "IBM" "PCMCIA CD-ROM Drive CD-400" # config 0x1 "ata" ? iosize 0x20 # 0x10000 (flags for wd, not sure for ata) @@ -421,6 +424,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Belkin F5D5020 +card "Belkin" "F5D5020-PCMCIA-Network-Card" + config auto "ed" ? 0x10 + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # Billionton LNA-100B card "Billionton" "LNA-100B" config auto "ed" ? @@ -559,6 +568,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Dynalink L100C16 +card "Dynalink" "L100C16" + config auto "ed" ? + insert /etc/pccard_ether $device + remove /etc/pccard_ether $device stop + # Linksys Combo PCMCIA Ethernet Card card "E-CARD" "E-CARD" config auto "ed" ? @@ -660,6 +675,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# I-O DATA PCET/100-CL +card "IO DATA" "PCET100CL" + config auto "ed" ? 0x80000 + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # I-O DATA PCET/TX card "IO DATA" "PCETTX" config auto "ed" ? 0x80000 @@ -866,6 +887,13 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Nortel Networks BayStack 22 Ethernet 10/100 PC Card +card "Nortel" "BAYSTACK22-PCMCIA-ETHERNET" + config auto "ed" ? 0x30000 + ether 0x1c8 + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # Longshine LCS-8534TB card "PCMCIA" "/^Ethernet$/" config auto "ed" ? @@ -938,6 +966,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Psion Dacom Gold Card Ethernet +card "Psion Dacom" "Gold Card Ethernet" + config auto "ed" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # Psion Dacom Gold Card V34 Ethernet GSM # as ethernet card "Psion Dacom" "Gold Card V34 Ethernet GSM" @@ -1350,6 +1384,10 @@ card "BUG Inc." "Linkboy D64K" config auto "sio" ? +# Portable Add Ons FreeSpirit 56K/ISDN Card +card "Portable Add Ons" "FreeSpirit Global 56K" + config auto "sio" ? + # NewMedia 14.4K FAX/Data Modem card "CIRRUS LOGIC" "FAX MODEM" config auto "sio" ? @@ -1754,6 +1792,12 @@ ########## wi ########## +# OEM ID 0x5 unlabelled PRISM2.5 card +card " " "IEEE 802.11 Wireless LAN/PC Card" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # 3com 3crwe737A AirConnect Wireless LAN PC Card card "3Com" "3CRWE737A AirConnect Wireless LAN PC Card" config auto "wi" ? @@ -1766,6 +1810,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Actiontec PRISM wireless +card "ACTIONTEC" "PRISM Wireless LAN PC Card" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # Addtron AWP-100 card "Addtron" "AWP-100 Wireless PCMCIA" config auto "wi" ? @@ -1790,6 +1840,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Belkin wireless card +card "Belkin" "11Mbps Wireless Notebook Network Adapter" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # BreezeNET card "BreezeNET" "PC-DS.11" config auto "wi" ? @@ -1986,6 +2042,24 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Netgear MA401RA +card "NETGEAR MA401RA Wireless PC" "Card" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + +# Nortel eMobility +card "Nortel Networks" "emobility 802.11 Wireless LAN PC Card" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + +# Generic PRISM2.5 card +card "PCMCIA" "11M WLAN Card v2.5" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # PLANEX GeoWave/GW-NS110 card "PLANEX" "GeoWave/GW-NS110" config 0x1 "wi" ? @@ -2011,6 +2085,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# SAMSUNG SWL-2000P PCI Card +card "SAMSUNG" "11Mbps WLAN PCI Card" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # SMC's SMC2632W (also matches the 3.3V SMC2602W) card "SMC" "SMC2632W" config auto "wi" ? @@ -2023,6 +2103,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# German Telekom T-Sinus 130card, unknown original manufactor +card "T-Sinus" "130card" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # TDK LAK-CD011WL card "TDK" "LAK-CD011WL for Wireless LAN" config auto "wi" ? @@ -2035,13 +2121,6 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop -# Taiwanese Blue Concentric Circle CF Wireless LAN Model WL-379F -# This is a card sold in Taiwan. -card "Wireless LAN" "11Mbps PC Card" - config auto "wi" ? - insert /etc/pccard_ether $device start - remove /etc/pccard_ether $device stop - # Toshibas wireless lan card card "TOSHIBA" "Wireless LAN Card" config auto "wi" ? @@ -2054,6 +2133,19 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Taiwanese Blue Concentric Circle CF Wireless LAN Model WL-379F +# This is a card sold in Taiwan. +card "Wireless LAN" "11Mbps PC Card" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + +# ZoomAir 802.11 +card "ZoomAir 11Mbps High" "Rate wireless Networking" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + ########## xe ########## # Accton EN2226/Fast EtherCard (16-bit verison) @@ -2137,5 +2229,5 @@ # GENERIC Flash ATA / ATA HDD generic fixed_disk - config auto "ata" ? + config 0x1 "ata" ? logstr "GENERIC Flash ATA / ATA HDD" ==== //depot/projects/trustedbsd/base/etc/rc.d/moused#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $ -# $FreeBSD: src/etc/rc.d/moused,v 1.2 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.3 2002/09/27 16:54:21 gordon Exp $ # # PROVIDE: moused @@ -12,14 +12,12 @@ name=moused rcvar=`set_rcvar` +command="/usr/sbin/${name}" case ${OSTYPE} in FreeBSD) start_cmd="moused_start" ;; -NetBSD) - command="/usr/sbin/${name}" - ;; esac moused_start() ==== //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#5 (text+ko) ==== @@ -1,12 +1,11 @@ # Makefile for libdialog -# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.37 2002/07/29 09:40:08 ru Exp $ +# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.38 2002/09/28 00:25:26 peter Exp $ LIB= dialog INCS= dialog.h MAN= dialog.3 SHLIB_MAJOR= 4 -SHLIB_MINOR= 0 SRCS= kernel.c rc.c checklist.c inputbox.c menubox.c msgbox.c \ lineedit.c radiolist.c textbox.c yesno.c prgbox.c raw_popen.c \ fselect.c ui_objects.c dir.c notify.c help.c gauge.c tree.c ==== //depot/projects/trustedbsd/base/gnu/lib/libg2c/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.9 2002/05/12 16:00:46 ru Exp $ +# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.10 2002/09/28 00:25:27 peter Exp $ SRCDIR= ${.CURDIR}/../../../contrib/libf2c >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209300403.g8U43DOs001557>