PERFORCE change 64716 for review

Sam Leffler sam at FreeBSD.org
Tue Nov 9 12:36:34 PST 2004


http://perforce.freebsd.org/chv.cgi?CH=64716

Change 64716 by sam at sam_ebb on 2004/11/09 20:35:35

	IFC @ 64715

Affected files ...

.. //depot/projects/wifi/Makefile#2 integrate
.. //depot/projects/wifi/Makefile.inc1#3 integrate
.. //depot/projects/wifi/bin/rcp/Makefile#2 integrate
.. //depot/projects/wifi/bin/stty/key.c#3 integrate
.. //depot/projects/wifi/etc/defaults/pccard.conf#2 integrate
.. //depot/projects/wifi/etc/defaults/rc.conf#3 integrate
.. //depot/projects/wifi/etc/devd.conf#2 integrate
.. //depot/projects/wifi/etc/mtree/BIND.chroot.dist#2 integrate
.. //depot/projects/wifi/etc/namedb/named.conf#2 integrate
.. //depot/projects/wifi/etc/rc.d/Makefile#3 integrate
.. //depot/projects/wifi/etc/rc.d/initdiskless#2 integrate
.. //depot/projects/wifi/etc/rc.d/swap1#2 integrate
.. //depot/projects/wifi/etc/rc.d/tmp#2 integrate
.. //depot/projects/wifi/etc/rc.d/var#2 integrate
.. //depot/projects/wifi/etc/rc.d/vinum#2 delete
.. //depot/projects/wifi/etc/rc.subr#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/c++filt/Makefile#3 integrate
.. //depot/projects/wifi/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/gdb/libgdb/Makefile#3 integrate
.. //depot/projects/wifi/gnu/usr.bin/grep/grep.1#2 integrate
.. //depot/projects/wifi/kerberos5/usr.bin/ksu/Makefile#2 integrate
.. //depot/projects/wifi/lib/libarchive/Makefile#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_private.h#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_read_extract.c#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_string.h#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_string_sprintf.c#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write.3#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write.c#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_none.c#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write_set_format_cpio.c#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write_set_format_pax.c#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write_set_format_shar.c#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write_set_format_ustar.c#2 integrate
.. //depot/projects/wifi/lib/libbegemot/Makefile#2 integrate
.. //depot/projects/wifi/lib/libc/arm/Makefile.inc#1 branch
.. //depot/projects/wifi/lib/libc/arm/SYS.h#2 integrate
.. //depot/projects/wifi/lib/libc/arm/gen/_ctx_start.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/gen/_setjmp.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/gen/alloca.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/gen/divsi3.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/gen/makecontext.c#2 integrate
.. //depot/projects/wifi/lib/libc/arm/gen/setjmp.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/gen/signalcontext.c#2 integrate
.. //depot/projects/wifi/lib/libc/arm/gen/sigsetjmp.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/string/ffs.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/string/memcmp.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/string/memmove.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/string/memset.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/string/strcmp.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/string/strncmp.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/sys/Makefile.inc#2 integrate
.. //depot/projects/wifi/lib/libc/arm/sys/brk.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/sys/cerror.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/sys/fork.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/sys/getcontext.S#2 delete
.. //depot/projects/wifi/lib/libc/arm/sys/pipe.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/sys/ptrace.S#2 integrate
.. //depot/projects/wifi/lib/libc/arm/sys/sbrk.S#2 integrate
.. //depot/projects/wifi/lib/libc/gen/syslog.c#2 integrate
.. //depot/projects/wifi/lib/libc/i386/gen/_set_tp.c#2 integrate
.. //depot/projects/wifi/lib/libc/i386/sys/Makefile.inc#2 integrate
.. //depot/projects/wifi/lib/libc/i386/sys/_amd64_get_fsbase.c#1 branch
.. //depot/projects/wifi/lib/libc/i386/sys/_amd64_get_gsbase.c#1 branch
.. //depot/projects/wifi/lib/libc/i386/sys/_amd64_set_fsbase.c#1 branch
.. //depot/projects/wifi/lib/libc/i386/sys/_amd64_set_gsbase.c#1 branch
.. //depot/projects/wifi/lib/libc/stdtime/strftime.3#2 integrate
.. //depot/projects/wifi/lib/libc/stdtime/strftime.c#2 integrate
.. //depot/projects/wifi/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 integrate
.. //depot/projects/wifi/lib/libpthread/arch/arm/arm/context.S#2 integrate
.. //depot/projects/wifi/lib/libpthread/arch/arm/arm/pthread_md.c#2 integrate
.. //depot/projects/wifi/lib/libpthread/arch/arm/include/atomic_ops.h#2 integrate
.. //depot/projects/wifi/lib/libpthread/arch/arm/include/pthread_md.h#2 integrate
.. //depot/projects/wifi/lib/libpthread/arch/i386/i386/pthread_md.c#2 integrate
.. //depot/projects/wifi/lib/libpthread/arch/i386/include/pthread_md.h#2 integrate
.. //depot/projects/wifi/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate
.. //depot/projects/wifi/libexec/ftpd/ftpd.c#4 integrate
.. //depot/projects/wifi/libexec/rtld-aout/Makefile#2 integrate
.. //depot/projects/wifi/libexec/rtld-elf/Makefile#3 integrate
.. //depot/projects/wifi/libexec/rtld-elf/i386/reloc.c#2 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate
.. //depot/projects/wifi/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 integrate
.. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 integrate
.. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#2 integrate
.. //depot/projects/wifi/release/doc/share/sgml/release.ent#2 integrate
.. //depot/projects/wifi/release/picobsd/tinyware/login/Makefile#3 integrate
.. //depot/projects/wifi/rescue/rescue/Makefile#3 integrate
.. //depot/projects/wifi/sbin/Makefile#3 integrate
.. //depot/projects/wifi/sbin/devfs/devfs.8#2 integrate
.. //depot/projects/wifi/sbin/devfs/rule.c#2 integrate
.. //depot/projects/wifi/sbin/geom/class/concat/gconcat.8#2 integrate
.. //depot/projects/wifi/sbin/geom/class/label/glabel.8#2 integrate
.. //depot/projects/wifi/sbin/geom/class/mirror/gmirror.8#2 integrate
.. //depot/projects/wifi/sbin/geom/class/nop/gnop.8#2 integrate
.. //depot/projects/wifi/sbin/geom/class/raid3/graid3.8#3 integrate
.. //depot/projects/wifi/sbin/geom/class/stripe/gstripe.8#2 integrate
.. //depot/projects/wifi/sbin/geom/core/geom.8#2 integrate
.. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#3 integrate
.. //depot/projects/wifi/sbin/init/Makefile#2 integrate
.. //depot/projects/wifi/sbin/ipfw/ipfw.8#2 integrate
.. //depot/projects/wifi/sbin/mdconfig/mdconfig.8#2 integrate
.. //depot/projects/wifi/sbin/mdconfig/mdconfig.c#2 integrate
.. //depot/projects/wifi/sbin/route/route.8#2 integrate
.. //depot/projects/wifi/sbin/vinum/Makefile#2 delete
.. //depot/projects/wifi/sbin/vinum/commands.c#2 delete
.. //depot/projects/wifi/sbin/vinum/list.c#2 delete
.. //depot/projects/wifi/sbin/vinum/v.c#2 delete
.. //depot/projects/wifi/sbin/vinum/vext.h#2 delete
.. //depot/projects/wifi/sbin/vinum/vinum.8#2 delete
.. //depot/projects/wifi/share/examples/etc/make.conf#3 integrate
.. //depot/projects/wifi/share/man/man4/Makefile#3 integrate
.. //depot/projects/wifi/share/man/man4/acpi_video.4#2 integrate
.. //depot/projects/wifi/share/man/man4/ath.4#2 integrate
.. //depot/projects/wifi/share/man/man4/em.4#2 integrate
.. //depot/projects/wifi/share/man/man4/gdb.4#2 integrate
.. //depot/projects/wifi/share/man/man4/gx.4#2 delete
.. //depot/projects/wifi/share/man/man4/ixgb.4#2 integrate
.. //depot/projects/wifi/share/man/man4/man4.i386/acpi_asus.4#2 integrate
.. //depot/projects/wifi/share/man/man4/man4.i386/acpi_panasonic.4#2 integrate
.. //depot/projects/wifi/share/man/man4/miibus.4#2 integrate
.. //depot/projects/wifi/share/man/man4/route.4#2 integrate
.. //depot/projects/wifi/share/man/man4/ste.4#2 integrate
.. //depot/projects/wifi/share/man/man4/vinumdebug.4#2 delete
.. //depot/projects/wifi/share/man/man4/vlan.4#2 integrate
.. //depot/projects/wifi/share/man/man5/make.conf.5#2 integrate
.. //depot/projects/wifi/share/man/man5/rc.conf.5#3 integrate
.. //depot/projects/wifi/share/man/man7/tuning.7#2 integrate
.. //depot/projects/wifi/share/man/man9/condvar.9#2 integrate
.. //depot/projects/wifi/share/misc/bsd-family-tree#4 integrate
.. //depot/projects/wifi/share/mk/bsd.prog.mk#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/machdep.c#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/mp_machdep.c#2 integrate
.. //depot/projects/wifi/sys/alpha/include/pcpu.h#2 integrate
.. //depot/projects/wifi/sys/alpha/include/smp.h#2 integrate
.. //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/wifi/sys/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/wifi/sys/amd64/amd64/mp_machdep.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/bcopy_page.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/bcopyinout.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/bcopyinout_xscale.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/blockio.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/bus_space_asm_generic.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/copystr.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc_asm.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm3.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm67.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm7tdmi.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm8.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_armv4.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_ixp12x0.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_sa1.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_sa11x0.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_xscale.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/critical.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/elf_machdep.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/fiq_subr.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/fusu.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/in_cksum_arm.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/machdep.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/mem.c#1 branch
.. //depot/projects/wifi/sys/arm/arm/nexus_io_asm.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/setcpsr.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/support.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/swtch.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/trap.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/wifi/sys/arm/conf/IQ31244#3 integrate
.. //depot/projects/wifi/sys/arm/conf/SIMICS#3 integrate
.. //depot/projects/wifi/sys/arm/include/asm.h#2 integrate
.. //depot/projects/wifi/sys/arm/include/atomic.h#2 integrate
.. //depot/projects/wifi/sys/arm/include/cpu.h#2 integrate
.. //depot/projects/wifi/sys/arm/include/cpuconf.h#2 integrate
.. //depot/projects/wifi/sys/arm/include/cpufunc.h#2 integrate
.. //depot/projects/wifi/sys/arm/include/endian.h#2 integrate
.. //depot/projects/wifi/sys/arm/include/memdev.h#1 branch
.. //depot/projects/wifi/sys/arm/include/param.h#2 integrate
.. //depot/projects/wifi/sys/arm/include/pcpu.h#2 integrate
.. //depot/projects/wifi/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/wifi/sys/arm/include/reg.h#2 integrate
.. //depot/projects/wifi/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/wifi/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/wifi/sys/boot/forth/loader.conf.5#2 integrate
.. //depot/projects/wifi/sys/boot/i386/boot0/boot0.S#2 integrate
.. //depot/projects/wifi/sys/boot/i386/libi386/biossmap.c#2 integrate
.. //depot/projects/wifi/sys/compat/svr4/svr4_filio.c#2 integrate
.. //depot/projects/wifi/sys/conf/NOTES#4 integrate
.. //depot/projects/wifi/sys/conf/files#5 integrate
.. //depot/projects/wifi/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/wifi/sys/contrib/pf/net/pf_if.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_timer.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_video.c#2 integrate
.. //depot/projects/wifi/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/wifi/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/wifi/sys/dev/fdc/fdc.c#3 integrate
.. //depot/projects/wifi/sys/dev/gx/if_gx.c#2 delete
.. //depot/projects/wifi/sys/dev/gx/if_gxreg.h#2 delete
.. //depot/projects/wifi/sys/dev/gx/if_gxvar.h#2 delete
.. //depot/projects/wifi/sys/dev/lge/if_lge.c#2 integrate
.. //depot/projects/wifi/sys/dev/md/md.c#2 integrate
.. //depot/projects/wifi/sys/dev/nge/if_nge.c#2 integrate
.. //depot/projects/wifi/sys/dev/random/randomdev_soft.c#2 integrate
.. //depot/projects/wifi/sys/dev/snp/snp.c#2 integrate
.. //depot/projects/wifi/sys/dev/usb/ehci.c#3 integrate
.. //depot/projects/wifi/sys/dev/usb/ehcireg.h#2 integrate
.. //depot/projects/wifi/sys/dev/usb/uhub.c#2 integrate
.. //depot/projects/wifi/sys/dev/usb/usb_subr.c#2 integrate
.. //depot/projects/wifi/sys/dev/usb/usbdivar.h#2 integrate
.. //depot/projects/wifi/sys/dev/vinum/COPYRIGHT#2 delete
.. //depot/projects/wifi/sys/dev/vinum/makestatetext#2 delete
.. //depot/projects/wifi/sys/dev/vinum/request.h#2 delete
.. //depot/projects/wifi/sys/dev/vinum/statetexts.h#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinum.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumconfig.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumdaemon.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumext.h#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumhdr.h#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinuminterrupt.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumio.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumio.h#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumioctl.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumkw.h#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumlock.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinummemory.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumobj.h#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumparser.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumraid5.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumrequest.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumrevive.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumstate.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumstate.h#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumutil.c#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumutil.h#2 delete
.. //depot/projects/wifi/sys/dev/vinum/vinumvar.h#2 delete
.. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#4 integrate
.. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#2 integrate
.. //depot/projects/wifi/sys/fs/ntfs/ntfs.h#2 integrate
.. //depot/projects/wifi/sys/fs/ntfs/ntfs_subr.c#2 integrate
.. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#3 integrate
.. //depot/projects/wifi/sys/geom/geom_mbr.c#2 integrate
.. //depot/projects/wifi/sys/geom/geom_slice.c#2 integrate
.. //depot/projects/wifi/sys/geom/geom_vfs.c#2 integrate
.. //depot/projects/wifi/sys/geom/mirror/g_mirror.c#2 integrate
.. //depot/projects/wifi/sys/geom/mirror/g_mirror.h#2 integrate
.. //depot/projects/wifi/sys/geom/raid3/g_raid3.c#2 integrate
.. //depot/projects/wifi/sys/geom/raid3/g_raid3.h#2 integrate
.. //depot/projects/wifi/sys/gnu/ext2fs/ext2_mount.h#3 integrate
.. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vfsops.c#4 integrate
.. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vnops.c#3 integrate
.. //depot/projects/wifi/sys/i386/acpica/acpi_asus.c#3 integrate
.. //depot/projects/wifi/sys/i386/acpica/acpi_panasonic.c#2 integrate
.. //depot/projects/wifi/sys/i386/i386/busdma_machdep.c#2 integrate
.. //depot/projects/wifi/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/wifi/sys/i386/include/sysarch.h#2 integrate
.. //depot/projects/wifi/sys/isa/vga_isa.c#2 integrate
.. //depot/projects/wifi/sys/kern/init_main.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_environment.c#3 integrate
.. //depot/projects/wifi/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_intr.c#3 integrate
.. //depot/projects/wifi/sys/kern/kern_mac.c#3 integrate
.. //depot/projects/wifi/sys/kern/kern_physio.c#3 integrate
.. //depot/projects/wifi/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_subr.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_switch.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/wifi/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/wifi/sys/kern/subr_param.c#2 integrate
.. //depot/projects/wifi/sys/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/wifi/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/wifi/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/wifi/sys/kern/tty.c#2 integrate
.. //depot/projects/wifi/sys/kern/uipc_cow.c#2 integrate
.. //depot/projects/wifi/sys/kern/uipc_domain.c#2 integrate
.. //depot/projects/wifi/sys/kern/uipc_jumbo.c#2 integrate
.. //depot/projects/wifi/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/wifi/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/wifi/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/wifi/sys/kern/vfs_aio.c#4 integrate
.. //depot/projects/wifi/sys/kern/vfs_bio.c#4 integrate
.. //depot/projects/wifi/sys/kern/vfs_cluster.c#4 integrate
.. //depot/projects/wifi/sys/kern/vfs_default.c#4 integrate
.. //depot/projects/wifi/sys/kern/vfs_subr.c#4 integrate
.. //depot/projects/wifi/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/wifi/sys/libkern/arm/divsi3.S#2 integrate
.. //depot/projects/wifi/sys/libkern/arm/ffs.S#2 integrate
.. //depot/projects/wifi/sys/modules/Makefile#4 integrate
.. //depot/projects/wifi/sys/modules/gx/Makefile#2 delete
.. //depot/projects/wifi/sys/modules/vinum/Makefile#2 delete
.. //depot/projects/wifi/sys/net/if_ppp.c#2 integrate
.. //depot/projects/wifi/sys/net/if_pppvar.h#2 integrate
.. //depot/projects/wifi/sys/net/if_sl.c#2 integrate
.. //depot/projects/wifi/sys/net/ppp_tty.c#2 integrate
.. //depot/projects/wifi/sys/net/raw_usrreq.c#2 integrate
.. //depot/projects/wifi/sys/net/rtsock.c#2 integrate
.. //depot/projects/wifi/sys/netatalk/ddp_usrreq.c#2 integrate
.. //depot/projects/wifi/sys/netatm/atm_aal5.c#2 integrate
.. //depot/projects/wifi/sys/netatm/atm_usrreq.c#2 integrate
.. //depot/projects/wifi/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate
.. //depot/projects/wifi/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/hci/ng_hci_var.h#2 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#2 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate
.. //depot/projects/wifi/sys/netgraph/ng_base.c#3 integrate
.. //depot/projects/wifi/sys/netgraph/ng_socket.c#2 integrate
.. //depot/projects/wifi/sys/netinet/ip_divert.c#3 integrate
.. //depot/projects/wifi/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/wifi/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/wifi/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/wifi/sys/netinet/tcp_subr.c#3 integrate
.. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/wifi/sys/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/wifi/sys/netinet6/ah_core.c#2 integrate
.. //depot/projects/wifi/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/wifi/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/wifi/sys/netipsec/keysock.c#2 integrate
.. //depot/projects/wifi/sys/netipx/ipx_usrreq.c#2 integrate
.. //depot/projects/wifi/sys/netipx/spx_usrreq.c#2 integrate
.. //depot/projects/wifi/sys/netkey/key.c#2 integrate
.. //depot/projects/wifi/sys/netkey/key.h#2 integrate
.. //depot/projects/wifi/sys/netkey/keydb.h#2 integrate
.. //depot/projects/wifi/sys/netkey/keysock.c#2 integrate
.. //depot/projects/wifi/sys/netnatm/natm.c#2 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#3 integrate
.. //depot/projects/wifi/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/wifi/sys/pc98/pc98/fd.c#2 integrate
.. //depot/projects/wifi/sys/pci/if_de.c#2 integrate
.. //depot/projects/wifi/sys/pci/if_xl.c#2 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/wifi/sys/sys/_types.h#2 integrate
.. //depot/projects/wifi/sys/sys/buf.h#4 integrate
.. //depot/projects/wifi/sys/sys/fdcio.h#2 integrate
.. //depot/projects/wifi/sys/sys/file.h#2 integrate
.. //depot/projects/wifi/sys/sys/filedesc.h#2 integrate
.. //depot/projects/wifi/sys/sys/kernel.h#3 integrate
.. //depot/projects/wifi/sys/sys/ktr.h#2 integrate
.. //depot/projects/wifi/sys/sys/mac_policy.h#2 integrate
.. //depot/projects/wifi/sys/sys/mdioctl.h#2 integrate
.. //depot/projects/wifi/sys/sys/param.h#2 integrate
.. //depot/projects/wifi/sys/sys/protosw.h#2 integrate
.. //depot/projects/wifi/sys/sys/resource.h#2 integrate
.. //depot/projects/wifi/sys/sys/sf_buf.h#2 integrate
.. //depot/projects/wifi/sys/sys/syslog.h#2 integrate
.. //depot/projects/wifi/sys/sys/ttydefaults.h#2 integrate
.. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#4 integrate
.. //depot/projects/wifi/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/wifi/sys/vm/uma_core.c#3 integrate
.. //depot/projects/wifi/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/wifi/sys/vm/vm_glue.c#3 integrate
.. //depot/projects/wifi/sys/vm/vm_object.c#2 integrate
.. //depot/projects/wifi/sys/vm/vm_object.h#2 integrate
.. //depot/projects/wifi/sys/vm/vm_page.c#4 integrate
.. //depot/projects/wifi/sys/vm/vm_pageout.c#3 integrate
.. //depot/projects/wifi/sys/vm/vm_pager.c#3 integrate
.. //depot/projects/wifi/sys/vm/vm_pager.h#2 integrate
.. //depot/projects/wifi/sys/vm/vm_param.h#2 integrate
.. //depot/projects/wifi/sys/vm/vm_zeroidle.c#3 integrate
.. //depot/projects/wifi/sys/vm/vnode_pager.c#4 integrate
.. //depot/projects/wifi/tools/debugscripts/dot.gdbinit#2 integrate
.. //depot/projects/wifi/tools/debugscripts/gdbinit.vinum#2 delete
.. //depot/projects/wifi/tools/tools/genericize/Makefile#2 integrate
.. //depot/projects/wifi/tools/tools/nanobsd/make.conf#3 integrate
.. //depot/projects/wifi/tools/tools/raidtest/README#2 integrate
.. //depot/projects/wifi/tools/tools/raidtest/raidtest.c#2 integrate
.. //depot/projects/wifi/usr.bin/cut/cut.c#2 integrate
.. //depot/projects/wifi/usr.bin/ee/ee.c#2 integrate
.. //depot/projects/wifi/usr.bin/fstat/fstat.c#2 integrate
.. //depot/projects/wifi/usr.bin/limits/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/login/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/make/config.h#2 integrate
.. //depot/projects/wifi/usr.bin/make/job.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/job.h#2 integrate
.. //depot/projects/wifi/usr.bin/make/main.c#2 integrate
.. //depot/projects/wifi/usr.bin/newgrp/Makefile#3 integrate
.. //depot/projects/wifi/usr.bin/opieinfo/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/opiepasswd/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/rlogin/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/rsh/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/su/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/tail/extern.h#2 integrate
.. //depot/projects/wifi/usr.bin/tail/forward.c#2 integrate
.. //depot/projects/wifi/usr.bin/tail/misc.c#2 integrate
.. //depot/projects/wifi/usr.bin/tail/read.c#2 integrate
.. //depot/projects/wifi/usr.bin/tail/reverse.c#2 integrate
.. //depot/projects/wifi/usr.bin/tail/tail.c#2 integrate
.. //depot/projects/wifi/usr.bin/tar/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/tar/bsdtar_platform.h#2 integrate
.. //depot/projects/wifi/usr.bin/tar/write.c#2 integrate
.. //depot/projects/wifi/usr.sbin/ancontrol/ancontrol.c#2 integrate
.. //depot/projects/wifi/usr.sbin/cron/crontab/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/diskinfo/diskinfo.8#2 integrate
.. //depot/projects/wifi/usr.sbin/diskinfo/diskinfo.c#2 integrate
.. //depot/projects/wifi/usr.sbin/fdread/fdutil.c#2 integrate
.. //depot/projects/wifi/usr.sbin/moused/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/mrouted/defs.h#2 integrate
.. //depot/projects/wifi/usr.sbin/nfsd/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/nfsd/nfsd.c#2 integrate
.. //depot/projects/wifi/usr.sbin/rpcbind/rpcbind.8#2 integrate
.. //depot/projects/wifi/usr.sbin/rpcbind/rpcbind.c#2 integrate
.. //depot/projects/wifi/usr.sbin/sliplogin/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/config.c#3 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/index.c#2 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/menus.c#2 integrate
.. //depot/projects/wifi/usr.sbin/syslogd/syslogd.8#2 integrate
.. //depot/projects/wifi/usr.sbin/syslogd/syslogd.c#2 integrate

Differences ...

==== //depot/projects/wifi/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.309 2004/10/18 17:47:31 ru Exp $
+# $FreeBSD: src/Makefile,v 1.310 2004/11/06 03:14:26 peter Exp $
 #
 # The user-driven targets are:
 #
@@ -69,7 +69,8 @@
 	kernel-toolchain libraries lint maninstall \
 	obj objlink regress rerelease tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
-	_build-tools _cross-tools _includes _libraries _depend
+	_build-tools _cross-tools _includes _libraries _depend \
+	build32 install32
 
 BITGTS=	files includes
 BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}

==== //depot/projects/wifi/Makefile.inc1#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.451 2004/11/06 03:14:26 peter Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -201,6 +201,46 @@
 		PATH=${TMPPATH}
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
+.if ${MACHINE_ARCH} == amd64
+# 32 bit world
+LIB32TMP=	${OBJTREE}${.CURDIR}/lib32
+
+LIB32PREFLAGS=	-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT
+LIB32POSTFLAGS=	-I${LIB32TMP}/usr/include \
+		-L${LIB32TMP}/usr/lib32 \
+		-B${LIB32TMP}/usr/lib32
+LIB32CC=	${LIB32PREFLAGS} \
+		${LIB32POSTFLAGS}
+LIB32CXX=	${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \
+		${LIB32POSTFLAGS}
+LIB32OBJC=	${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/objc \
+		${LIB32POSTFLAGS}
+
+# Yes, the flags are redundant.
+LIB32MAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
+		_SHLIBDIRPREFIX=${LIB32TMP} \
+		MACHINE_ARCH=i386 \
+		INSTALL="sh ${.CURDIR}/tools/install.sh" \
+		PATH=${TMPPATH} \
+		CC="cc ${LIB32CC}" \
+		CXX="c++ ${LIB32CXX}" \
+		OBJC="cc ${LIB32OBJC}" \
+		LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
+		AS="as --32" \
+		LIBDIR=/usr/lib32 \
+		SHLIBDIR=/usr/lib32
+
+LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
+		-DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \
+		CC="cc ${LIB32CC}" \
+		CXX="c++ ${LIB32CXX}" \
+		OBJC="cc ${LIB32OBJC}" \
+		LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
+		AS="as --32" \
+		LIBDIR=/usr/lib32 \
+		SHLIBDIR=/usr/lib32
+.endif
+
 # install stage
 .if empty(.MAKEFLAGS:M-n)
 IMAKEENV=	${CROSSENV} \
@@ -338,7 +378,54 @@
 	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} par-all
+.if ${MACHINE_ARCH} == amd64
+build32:
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo ">>> stage 5.1: building 32 bit shim libraries"
+	@echo "--------------------------------------------------------------"
+.for _dir in \
+    lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \
+    usr/libexec usr/sbin usr/share/misc \
+    usr/share/snmp/defs usr/share/snmp/mibs
+	mkdir -p ${LIB32TMP}/${_dir}
+.endfor
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
+	    -p ${LIB32TMP}/usr/include >/dev/null
+	ln -sf ${.CURDIR}/sys ${WORLDTMP}
+.for _t in obj includes
+	cd ${.CURDIR}/include; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	cd ${.CURDIR}/lib; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	cd ${.CURDIR}/gnu/lib; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+.if !defined(NOCRYPT)
+	cd ${.CURDIR}/secure/lib; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+.endif
+.endfor
+.for _dir in lib/libncurses lib/libmagic
+	cd ${.CURDIR}/${_dir}; \
+	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
+.endfor
+	cd ${.CURDIR}; \
+	    ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries 
+.for _t in obj depend all
+	cd ${.CURDIR}/libexec/rtld-elf; \
+	    PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+.endfor
 
+install32:
+	mkdir -p ${DESTDIR}/usr/lib32	# XXX add to mtree
+	cd ${.CURDIR}/lib; ${LIB32MAKE} install
+	cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install
+.if !defined(NOCRYPT)
+	cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install
+.endif
+	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install
+.endif
+
 
 WMAKE_TGTS=
 .if !defined(SUBDIR_OVERRIDE)
@@ -349,6 +436,9 @@
 WMAKE_TGTS+=	_cross-tools
 .endif
 WMAKE_TGTS+=	_includes _libraries _depend everything
+.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32)
+WMAKE_TGTS+=	build32
+.endif
 
 buildworld: ${WMAKE_TGTS}
 .ORDER: ${WMAKE_TGTS}
@@ -479,6 +569,9 @@
 	@echo ">>> Installing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
+.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32)
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
+.endif
 
 redistribute:
 	@echo "--------------------------------------------------------------"

==== //depot/projects/wifi/bin/rcp/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD: src/bin/rcp/Makefile,v 1.22 2002/10/16 16:06:46 markm Exp $
+# $FreeBSD: src/bin/rcp/Makefile,v 1.23 2004/11/03 18:01:18 ru Exp $
 
 PROG=	rcp
 SRCS=	rcp.c util.c
@@ -7,6 +7,6 @@
 
 BINOWN=	root
 BINMODE=4555
-INSTALLFLAGS=-fschg
+PRECIOUSPROG=
 
 .include <bsd.prog.mk>

==== //depot/projects/wifi/bin/stty/key.c#3 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.19 2004/11/02 18:10:01 phk Exp $");
+__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.20 2004/11/06 13:56:18 ache Exp $");
 
 #include <sys/types.h>
 
@@ -263,7 +263,7 @@
 	ip->t.c_iflag |= ICRNL;
 	/* preserve user-preference flags in lflag */
 #define	LKEEP	(ECHOKE|ECHOE|ECHOK|ECHOPRT|ECHOCTL|ALTWERASE|TOSTOP|NOFLSH)
-	ip->t.c_lflag = TTYDEF_LFLAG_ECHO | (ip->t.c_lflag & LKEEP);
+	ip->t.c_lflag = TTYDEF_LFLAG | (ip->t.c_lflag & LKEEP);
 	ip->t.c_oflag = TTYDEF_OFLAG;
 	ip->set = 1;
 }

==== //depot/projects/wifi/etc/defaults/pccard.conf#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # Default PCCARD configuration file
 #
-# $FreeBSD: src/etc/defaults/pccard.conf,v 1.269 2004/06/06 11:46:28 schweikh Exp $
+# $FreeBSD: src/etc/defaults/pccard.conf,v 1.270 2004/11/08 16:59:01 imp Exp $
 #
 # Please send new entries for this file to imp at freebsd.org.  He likes to
 # review them before they are committed to make sure they are correct for
@@ -505,8 +505,8 @@
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# COREGA FEther PCC-TXD
-card "corega K.K." "corega FEther PCC-TXD"
+# COREGA FEther PCC-TXD and COREGA FEtherII PCC-TXD
+card "corega K.K." "corega FEther(II)? PCC-TXD"
 	config	auto "ed" ? 0x30000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop

==== //depot/projects/wifi/etc/defaults/rc.conf#3 (text+ko) ====

@@ -13,7 +13,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.228 2004/11/01 18:05:40 mtm Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.230 2004/11/09 10:03:17 keramida Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -40,8 +40,10 @@
 removable_interfaces=""	# Removable network interfaces for /etc/pccard_ether.
 tmpmfs="AUTO"		# Set to YES to always create an mfs /tmp, NO to never
 tmpsize="20m"		# Size of mfs /tmp if created
+tmpmfs_flags="-S -o noexec,nosuid,nodev" # Extra mdmfs options for the mfs /tmp
 varmfs="AUTO"		# Set to YES to always create an mfs /var, NO to never
 varsize="32m"		# Size of mfs /var if created
+varmfs_flags="-S"	# Extra mount options for the mfs /var
 populate_var="AUTO"	# Set to YES to always (re)populate /var, NO to never
 local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs.
 script_name_sep=" "	# Change if your startup scripts' names contain spaces
@@ -449,7 +451,6 @@
 kern_securelevel="-1"	# range: -1..3 ; `-1' is the most insecure
 lomac_enable="NO"	# start lomac(4) security module at boot
 update_motd="YES"	# update version info in /etc/motd (or NO)
-start_vinum="NO"	# set to YES to start vinum
 unaligned_print="YES"	# print unaligned access warnings on the alpha (or NO).
 entropy_file="/entropy"	# Set to NO to disable caching entropy through reboots.
 			# /var/db/entropy is preferred if / is not available.

==== //depot/projects/wifi/etc/devd.conf#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.17 2004/09/10 20:57:44 wpaul Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.18 2004/11/08 20:24:51 ru Exp $
 #
 # Refer to devd.conf(5) and devd(8) man pages for the details on how to
 # run and configure devd.
@@ -19,7 +19,7 @@
 	# Setup some shorthand for regex that we use later in the file.
 	set ethernet-nic-regex
 		"(an|ar|ath|aue|awi|axe|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|\
-		ep|ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\
+		ep|ex|fe|fxp|gem|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\
 		rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vge|vr|vx|wb|wi|xe|\
 		xl)[0-9]+";
 	set scsi-controller-regex

==== //depot/projects/wifi/etc/mtree/BIND.chroot.dist#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BIND.chroot.dist,v 1.5 2004/09/29 03:43:10 dougb Exp $
+# $FreeBSD: src/etc/mtree/BIND.chroot.dist,v 1.6 2004/11/04 05:24:29 gshapiro Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -9,6 +9,8 @@
     ..
     etc
         namedb
+            dynamic uname=bind
+            ..
             master
             ..
             slave   uname=bind

==== //depot/projects/wifi/etc/namedb/named.conf#2 (text+ko) ====

@@ -1,4 +1,4 @@
-// $FreeBSD: src/etc/namedb/named.conf,v 1.19 2004/09/30 09:57:36 dougb Exp $
+// $FreeBSD: src/etc/namedb/named.conf,v 1.20 2004/11/04 05:24:29 gshapiro Exp $
 //
 // Refer to the named.conf(5) and named(8) man pages, and the documentation
 // in /usr/share/doc/bind9 for more details.
@@ -102,6 +102,20 @@
 	};
 };
 
+// An example dynamic zone
+key "exampleorgkey" {
+        algorithm hmac-md5;
+        secret "sf87HJqjkqh8ac87a02lla==";
+};
+
+zone "example.org" {
+	type master;
+	allow-update {
+		key "exampleorgkey";
+	};
+	file "dynamic/example.org";
+};
+
 zone "0.168.192.in-addr.arpa" {
 	type slave;
 	file "slave/0.168.192.in-addr.arpa";

==== //depot/projects/wifi/etc/rc.d/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.45 2004/11/02 12:35:54 pjd Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.46 2004/11/04 12:59:16 phk Exp $
 
 FILES=	DAEMON LOGIN NETWORKING SERVERS \
 	abi accounting addswap adjkerntz amd \
@@ -35,7 +35,7 @@
 	syscons sysctl syslogd \
 	timed tmp \
 	ugidfw usbd \
-	var vinum virecover \
+	var virecover \
 	watchdogd \
 	ypbind yppasswdd ypserv \
 	ypset ypupdated ypxfrd

==== //depot/projects/wifi/etc/rc.d/initdiskless#2 (text+ko) ====

@@ -24,12 +24,12 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/initdiskless,v 1.39 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/initdiskless,v 1.40 2004/11/05 07:35:31 mtm Exp $
 #
+# PROVIDE: initdiskless
 # REQUIRE: preseedrandom
-# PROVIDE: initdiskless
+# BEFORE: rcconf
 # KEYWORD: nojail
-# BEFORE: ipfw
 
 
 # On entry to this script the entire system consists of a read-only root

==== //depot/projects/wifi/etc/rc.d/swap1#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $
-# $FreeBSD: src/etc/rc.d/swap1,v 1.8 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/swap1,v 1.9 2004/11/05 12:38:27 pjd Exp $
 #
 
 # PROVIDE: localswap
@@ -12,7 +12,7 @@
 
 name="swap1"
 start_cmd='swapon -a'
-stop_cmd='swapoff -a'
+stop_cmd=':'
 
 load_rc_config swap
 run_rc_command "$1"

==== //depot/projects/wifi/etc/rc.d/tmp#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/tmp,v 1.34 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/tmp,v 1.35 2004/11/09 10:03:17 keramida Exp $
 #
 
 # PROVIDE: tmp
@@ -42,7 +42,7 @@
 #
 case "${tmpmfs}" in
 [Yy][Ee][Ss])
-	mount_md ${tmpsize} /tmp
+	mount_md ${tmpsize} /tmp "${tmpmfs_flags}"
 	chmod 01777 /tmp
 	;;
 [Nn][Oo])
@@ -56,7 +56,7 @@
 			echo "dropping into shell, ^D to continue anyway."
 			/bin/sh
 		else
-			mount_md ${tmpsize} /tmp
+			mount_md ${tmpsize} /tmp "${tmpmfs_flags}"
 			chmod 01777 /tmp
 		fi
 	fi

==== //depot/projects/wifi/etc/rc.d/var#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/var,v 1.34 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/var,v 1.35 2004/11/09 10:03:17 keramida Exp $
 #
 
 # PROVIDE: var
@@ -61,7 +61,7 @@
 #
 case "${varmfs}" in
 [Yy][Ee][Ss])
-	mount_md ${varsize} /var
+	mount_md ${varsize} /var "${varmfs_flags}"
 	;;
 [Nn][Oo])
 	;;
@@ -69,7 +69,7 @@
 	if (/bin/mkdir -p /var/.diskless 2> /dev/null); then
 		rmdir /var/.diskless
 	else
-		mount_md ${varsize} /var
+		mount_md ${varsize} /var "${varmfs_flags}"
 	fi
 esac
 

==== //depot/projects/wifi/etc/rc.subr#2 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.31 2004/07/30 17:19:35 mtm Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.32 2004/11/09 10:03:17 keramida Exp $
 #
 # Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1289,12 +1289,12 @@
 # as close as possible between 5-current and 4-stable.
 #   $1 = size
 #   $2 = mount point
-#   $3 = (optional) bytes-per-inode
+#   $3 = (optional) extra mdmfs flags
 mount_md() {
 	if [ -n "$3" ]; then
-		bpi="-i $3"
+		flags="$3"
 	fi
-	/sbin/mdmfs $bpi -s $1 -M md $2
+	/sbin/mdmfs $flags -s $1 -M md $2
 }
 
 fi

==== //depot/projects/wifi/gnu/usr.bin/cc/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.36 2004/07/28 05:27:19 kan Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.38 2004/11/07 22:49:20 kan Exp $
 
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.
@@ -10,7 +10,7 @@
 .endif
 
 .if !defined(NO_CXX)
-SUBDIR+= cc1plus c++
+SUBDIR+= cc1plus c++ c++filt
 .if !defined(NO_COLLECT2)
 #SUBDIR+= collect2
 .endif

==== //depot/projects/wifi/gnu/usr.bin/cc/c++filt/Makefile#3 (text+ko) ====

@@ -1,11 +1,11 @@
-# $FreeBSD: src/gnu/usr.bin/cc/c++filt/Makefile,v 1.18 2004/10/24 15:32:26 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/c++filt/Makefile,v 1.19 2004/11/07 13:46:16 kan Exp $
 
 .include "../Makefile.inc"
 
 .PATH: ${GCCDIR}
 
 PROG=	c++filt
-SRCS=	cp-demangle.c cplus-dem+%DIKED.c
+SRCS=	cp-demangle.c
 NOMAN=
 
 CFLAGS+= -DSTANDALONE_DEMANGLER -DIN_GCC -DVERSION=\"$(version)\"
@@ -13,11 +13,4 @@
 DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
-cplus-dem+%DIKED.c: cplus-dem.c
-	sed -e 's/^xmalloc[ 	]/_DONT_xmalloc /g' \
-	    -e 's/^xrealloc[ 	]/_DONT_xrealloc /g' \
-	    ${.ALLSRC} > ${.TARGET}
-
-CLEANFILES=	cplus-dem+%DIKED.c
-
 .include <bsd.prog.mk>

==== //depot/projects/wifi/gnu/usr.bin/gdb/arch/i386/Makefile#2 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.1 2004/06/25 06:48:53 marcel Exp $
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.2 2004/11/09 06:32:37 marcel Exp $
 
 GENSRCS+= xm.h
 LIBSRCS+= fbsd-proc.c gcore.c
 LIBSRCS+= i386-nat.c i386-tdep.c i386bsd-nat.c i386bsd-tdep.c		\
-	i386fbsd-nat.c	 i386fbsd-tdep.c i387-tdep.c
+	i386fbsd-nat.c i386fbsd-tdep.c i387-tdep.c
 
 nm.h:
 	echo '#include "i386/nm-fbsd.h"' > ${.TARGET}

==== //depot/projects/wifi/gnu/usr.bin/gdb/libgdb/Makefile#3 (text+ko) ====

@@ -1,42 +1,50 @@
-# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.4 2004/10/24 15:32:28 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.5 2004/11/09 06:02:48 marcel Exp $
 
 LIB=	gdb
 INTERNALLIB=
-SRCS=	annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c bcache.c	\
-	bfd-target.c block.c blockframe.c breakpoint.c buildsym.c	\
-	c-exp.y c-lang.c c-typeprint.c c-valprint.c charset.c		\
-	cli-cmds.c cli-decode.c cli-dump.c cli-interp.c cli-logging.c	\
-	cli-out.c cli-script.c cli-setshow.c cli-utils.c coff-pe-read.c	\
-	coffread.c complaints.c completer.c copying.c corefile.c	\
-	corelow.c cp-abi.c cp-namespace.c cp-support.c cp-valprint.c	\
-	dbxread.c dcache.c demangle.c dictionary.c disasm.c doublest.c	\
-	dummy-frame.c dwarf2-frame.c dwarf2expr.c dwarf2loc.c		\
-	dwarf2read.c dwarfread.c elfread.c environ.c eval.c		\
-	event-loop.c event-top.c exec.c expprint.c f-exp.y f-lang.c	\
-	f-typeprint.c f-valprint.c findvar.c fork-child.c frame-base.c	\
-	frame-unwind.c frame.c gdb-events.c gdbarch.c gdbtypes.c	\
-	gnu-v2-abi.c gnu-v3-abi.c hpacc-abi.c inf-loop.c infcall.c	\
-	infcmd.c inflow.c infptrace.c infrun.c inftarg.c init.c		\
-	interps.c jv-exp.y jv-lang.c jv-typeprint.c jv-valprint.c	\
-	kod-cisco.c kod.c language.c linespec.c m2-exp.y m2-lang.c	\
-	m2-typeprint.c m2-valprint.c macrocmd.c macroexp.c macroscope.c	\
-	macrotab.c main.c maint.c mdebugread.c mem-break.c memattr.c	\
-	mi-cmd-break.c mi-cmd-disas.c mi-cmd-env.c mi-cmd-file.c	\
-	mi-cmd-stack.c mi-cmd-var.c mi-cmds.c mi-console.c mi-getopt.c	\
-	mi-interp.c mi-main.c mi-out.c mi-parse.c mi-symbol-cmds.c	\
-	minsyms.c mipsread.c nlmread.c objc-exp.y objc-lang.c		\
-	objfiles.c observer.c osabi.c p-exp.y p-lang.c p-typeprint.c	\
-	p-valprint.c parse.c printcmd.c regcache.c reggroups.c remote.c	\
-	remote-fileio.c remote-utils.c scm-exp.c scm-lang.c		\
-	scm-valprint.c sentinel-frame.c ser-pipe.c ser-tcp.c ser-unix.c	\
-	serial.c signals.c solib.c solib-svr4.c source.c stabsread.c	\
-	stack.c std-regs.c symfile.c symmisc.c symtab.c target.c	\
-	thread.c top.c tracepoint.c trad-frame.c tui.c tui-command.c	\
-	tui-data.c tui-disasm.c tui-file.c tui-hooks.c tui-interp.c	\
-	tui-io.c tui-layout.c tui-out.c tui-regs.c tui-source.c		\
-	tui-stack.c tui-win.c tui-windata.c tui-wingeneral.c		\
-	tui-winsource.c typeprint.c ui-file.c ui-out.c user-regs.c	\
-	utils.c valarith.c valops.c valprint.c values.c varobj.c	\
+SRCS=	annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c \
+	bcache.c bfd-target.c block.c blockframe.c breakpoint.c \
+	buildsym.c \
+	c-exp.y c-lang.c c-typeprint.c c-valprint.c charset.c \
+	cli-cmds.c cli-decode.c cli-dump.c cli-interp.c cli-logging.c \
+	cli-out.c cli-script.c cli-setshow.c cli-utils.c coff-pe-read.c \
+	coffread.c complaints.c completer.c copying.c corefile.c \
+	corelow.c cp-abi.c cp-namespace.c cp-support.c cp-valprint.c \
+	dbxread.c dcache.c demangle.c dictionary.c disasm.c doublest.c \
+	dummy-frame.c dwarf2-frame.c dwarf2expr.c dwarf2loc.c \

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list