svn commit: r198701 - in projects/tcp_ffcaia2008_head: . bin/cat bin/csh bin/ls bin/sh bin/uuidgen contrib/gcc/config/i386 contrib/ncurses/ncurses/base etc etc/defaults etc/rc.d games/number gnu/li...

Fri Oct 30 21:01:00 UTC 2009

Author: lstewart
Date: Fri Oct 30 21:00:58 2009
New Revision: 198701
URL: http://svn.freebsd.org/changeset/base/198701

Log:
  Merge r197958:198700 from head.
  
  Sponsored by:	FreeBSD Foundation

Added:
  projects/tcp_ffcaia2008_head/lib/libc/sys/pselect.2
     - copied unchanged from r198700, head/lib/libc/sys/pselect.2
  projects/tcp_ffcaia2008_head/lib/libthr/arch/ia64/ia64/_umtx_op_err.S
     - copied unchanged from r198700, head/lib/libthr/arch/ia64/ia64/_umtx_op_err.S
  projects/tcp_ffcaia2008_head/share/man/man9/BUS_BIND_INTR.9
     - copied unchanged from r198700, head/share/man/man9/BUS_BIND_INTR.9
  projects/tcp_ffcaia2008_head/share/man/man9/BUS_DESCRIBE_INTR.9
     - copied unchanged from r198700, head/share/man/man9/BUS_DESCRIBE_INTR.9
  projects/tcp_ffcaia2008_head/sys/cam/ata/ata_pmp.c
     - copied unchanged from r198700, head/sys/cam/ata/ata_pmp.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/common/dmextern.c
     - copied unchanged from r198700, head/sys/contrib/dev/acpica/common/dmextern.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu
     - copied unchanged from r198700, head/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu
  projects/tcp_ffcaia2008_head/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu
     - copied unchanged from r198700, head/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu
  projects/tcp_ffcaia2008_head/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu
     - copied unchanged from r198700, head/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/ehcireg.h
     - copied unchanged from r198700, head/sys/dev/usb/controller/ehcireg.h
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/ohcireg.h
     - copied unchanged from r198700, head/sys/dev/usb/controller/ohcireg.h
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/uhcireg.h
     - copied unchanged from r198700, head/sys/dev/usb/controller/uhcireg.h
  projects/tcp_ffcaia2008_head/sys/modules/iwnfw/Makefile.inc
     - copied unchanged from r198700, head/sys/modules/iwnfw/Makefile.inc
  projects/tcp_ffcaia2008_head/sys/modules/iwnfw/iwn4965/
     - copied from r198700, head/sys/modules/iwnfw/iwn4965/
  projects/tcp_ffcaia2008_head/sys/modules/iwnfw/iwn5000/
     - copied from r198700, head/sys/modules/iwnfw/iwn5000/
  projects/tcp_ffcaia2008_head/sys/modules/iwnfw/iwn5150/
     - copied from r198700, head/sys/modules/iwnfw/iwn5150/
  projects/tcp_ffcaia2008_head/tools/regression/bin/sh/expansion/question1.0
     - copied unchanged from r198700, head/tools/regression/bin/sh/expansion/question1.0
  projects/tcp_ffcaia2008_head/tools/regression/bin/sh/expansion/set-u1.0
     - copied unchanged from r198700, head/tools/regression/bin/sh/expansion/set-u1.0
  projects/tcp_ffcaia2008_head/tools/regression/bin/sh/expansion/set-u2.0
     - copied unchanged from r198700, head/tools/regression/bin/sh/expansion/set-u2.0
Deleted:
  projects/tcp_ffcaia2008_head/lib/libc/gen/pselect.3
  projects/tcp_ffcaia2008_head/lib/libc/gen/pselect.c
  projects/tcp_ffcaia2008_head/sys/compat/x86bios/x86bios_alloc.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu
  projects/tcp_ffcaia2008_head/sys/contrib/x86emu/x86emu_util.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/serial/uch341.c
  projects/tcp_ffcaia2008_head/sys/modules/usb/uch341/
Modified:
  projects/tcp_ffcaia2008_head/   (props changed)
  projects/tcp_ffcaia2008_head/Makefile.inc1
  projects/tcp_ffcaia2008_head/ObsoleteFiles.inc
  projects/tcp_ffcaia2008_head/UPDATING
  projects/tcp_ffcaia2008_head/bin/cat/Makefile
  projects/tcp_ffcaia2008_head/bin/csh/iconv_stub.c
  projects/tcp_ffcaia2008_head/bin/ls/ls.c
  projects/tcp_ffcaia2008_head/bin/sh/expand.c
  projects/tcp_ffcaia2008_head/bin/sh/parser.c
  projects/tcp_ffcaia2008_head/bin/sh/sh.1
  projects/tcp_ffcaia2008_head/bin/uuidgen/Makefile
  projects/tcp_ffcaia2008_head/contrib/gcc/config/i386/i386.c
  projects/tcp_ffcaia2008_head/contrib/ncurses/ncurses/base/lib_getch.c
  projects/tcp_ffcaia2008_head/etc/defaults/rc.conf
  projects/tcp_ffcaia2008_head/etc/gettytab
  projects/tcp_ffcaia2008_head/etc/rc.d/faith
  projects/tcp_ffcaia2008_head/etc/rc.d/netoptions
  projects/tcp_ffcaia2008_head/etc/rc.d/stf
  projects/tcp_ffcaia2008_head/etc/rc.subr
  projects/tcp_ffcaia2008_head/games/number/Makefile
  projects/tcp_ffcaia2008_head/games/number/number.c
  projects/tcp_ffcaia2008_head/gnu/lib/libgcov/Makefile
  projects/tcp_ffcaia2008_head/kerberos5/lib/libgssapi_krb5/Makefile
  projects/tcp_ffcaia2008_head/kerberos5/lib/libgssapi_spnego/Makefile
  projects/tcp_ffcaia2008_head/lib/libbluetooth/bluetooth.3
  projects/tcp_ffcaia2008_head/lib/libbluetooth/bluetooth.h
  projects/tcp_ffcaia2008_head/lib/libc/gen/Makefile.inc
  projects/tcp_ffcaia2008_head/lib/libc/gen/Symbol.map
  projects/tcp_ffcaia2008_head/lib/libc/gen/getcwd.c
  projects/tcp_ffcaia2008_head/lib/libc/gen/wordexp.c
  projects/tcp_ffcaia2008_head/lib/libc/include/namespace.h
  projects/tcp_ffcaia2008_head/lib/libc/include/un-namespace.h
  projects/tcp_ffcaia2008_head/lib/libc/nls/C.msg
  projects/tcp_ffcaia2008_head/lib/libc/sys/Makefile.inc
  projects/tcp_ffcaia2008_head/lib/libc/sys/Symbol.map
  projects/tcp_ffcaia2008_head/lib/libfetch/common.c
  projects/tcp_ffcaia2008_head/lib/libpmc/libpmc.c
  projects/tcp_ffcaia2008_head/lib/libstand/open.c
  projects/tcp_ffcaia2008_head/lib/libthr/arch/ia64/Makefile.inc
  projects/tcp_ffcaia2008_head/lib/libthr/arch/ia64/include/pthread_md.h
  projects/tcp_ffcaia2008_head/lib/libthr/pthread.map
  projects/tcp_ffcaia2008_head/lib/libthr/thread/thr_private.h
  projects/tcp_ffcaia2008_head/lib/libthr/thread/thr_syscalls.c
  projects/tcp_ffcaia2008_head/lib/libusb/libusb20_ugen20.c
  projects/tcp_ffcaia2008_head/release/doc/README
  projects/tcp_ffcaia2008_head/release/doc/en_US.ISO8859-1/errata/article.sgml
  projects/tcp_ffcaia2008_head/release/doc/share/mk/doc.relnotes.mk
  projects/tcp_ffcaia2008_head/release/doc/share/sgml/release.dsl
  projects/tcp_ffcaia2008_head/release/doc/share/sgml/release.ent
  projects/tcp_ffcaia2008_head/release/scripts/package-split.py
  projects/tcp_ffcaia2008_head/sbin/Makefile.inc
  projects/tcp_ffcaia2008_head/sbin/adjkerntz/Makefile
  projects/tcp_ffcaia2008_head/sbin/atacontrol/Makefile
  projects/tcp_ffcaia2008_head/sbin/atm/atmconfig/Makefile
  projects/tcp_ffcaia2008_head/sbin/badsect/Makefile
  projects/tcp_ffcaia2008_head/sbin/bsdlabel/Makefile
  projects/tcp_ffcaia2008_head/sbin/camcontrol/Makefile
  projects/tcp_ffcaia2008_head/sbin/ccdconfig/Makefile
  projects/tcp_ffcaia2008_head/sbin/clri/Makefile
  projects/tcp_ffcaia2008_head/sbin/comcontrol/Makefile
  projects/tcp_ffcaia2008_head/sbin/conscontrol/Makefile
  projects/tcp_ffcaia2008_head/sbin/ddb/ddb_capture.c
  projects/tcp_ffcaia2008_head/sbin/dhclient/Makefile
  projects/tcp_ffcaia2008_head/sbin/dhclient/bpf.c
  projects/tcp_ffcaia2008_head/sbin/dhclient/dhcpd.h
  projects/tcp_ffcaia2008_head/sbin/dhclient/packet.c
  projects/tcp_ffcaia2008_head/sbin/dmesg/Makefile
  projects/tcp_ffcaia2008_head/sbin/dump/Makefile
  projects/tcp_ffcaia2008_head/sbin/dumpfs/Makefile
  projects/tcp_ffcaia2008_head/sbin/dumpfs/dumpfs.c
  projects/tcp_ffcaia2008_head/sbin/dumpon/Makefile
  projects/tcp_ffcaia2008_head/sbin/geom/Makefile
  projects/tcp_ffcaia2008_head/sbin/geom/Makefile.inc
  projects/tcp_ffcaia2008_head/sbin/geom/class/part/Makefile
  projects/tcp_ffcaia2008_head/sbin/geom/class/part/geom_part.c
  projects/tcp_ffcaia2008_head/sbin/geom/class/part/gpart.8
  projects/tcp_ffcaia2008_head/sbin/ggate/Makefile.inc
  projects/tcp_ffcaia2008_head/sbin/growfs/Makefile
  projects/tcp_ffcaia2008_head/sbin/gvinum/Makefile
  projects/tcp_ffcaia2008_head/sbin/ifconfig/af_nd6.c
  projects/tcp_ffcaia2008_head/sbin/ifconfig/ifieee80211.c
  projects/tcp_ffcaia2008_head/sbin/init/Makefile
  projects/tcp_ffcaia2008_head/sbin/ipf/Makefile.inc
  projects/tcp_ffcaia2008_head/sbin/iscontrol/Makefile
  projects/tcp_ffcaia2008_head/sbin/kldunload/Makefile
  projects/tcp_ffcaia2008_head/sbin/ldconfig/Makefile
  projects/tcp_ffcaia2008_head/sbin/md5/Makefile
  projects/tcp_ffcaia2008_head/sbin/mdconfig/Makefile
  projects/tcp_ffcaia2008_head/sbin/mdmfs/Makefile
  projects/tcp_ffcaia2008_head/sbin/mksnap_ffs/Makefile
  projects/tcp_ffcaia2008_head/sbin/mount/Makefile
  projects/tcp_ffcaia2008_head/sbin/mount_autofs/Makefile
  projects/tcp_ffcaia2008_head/sbin/mount_cd9660/Makefile
  projects/tcp_ffcaia2008_head/sbin/mount_ext2fs/Makefile
  projects/tcp_ffcaia2008_head/sbin/mount_msdosfs/Makefile
  projects/tcp_ffcaia2008_head/sbin/mount_nfs/mount_nfs.c
  projects/tcp_ffcaia2008_head/sbin/mount_nullfs/Makefile
  projects/tcp_ffcaia2008_head/sbin/mount_reiserfs/Makefile
  projects/tcp_ffcaia2008_head/sbin/mount_unionfs/Makefile
  projects/tcp_ffcaia2008_head/sbin/newfs_msdos/Makefile
  projects/tcp_ffcaia2008_head/sbin/nfsiod/Makefile
  projects/tcp_ffcaia2008_head/sbin/pfctl/Makefile
  projects/tcp_ffcaia2008_head/sbin/rcorder/Makefile
  projects/tcp_ffcaia2008_head/sbin/reboot/Makefile
  projects/tcp_ffcaia2008_head/sbin/recoverdisk/Makefile
  projects/tcp_ffcaia2008_head/sbin/routed/Makefile
  projects/tcp_ffcaia2008_head/sbin/savecore/Makefile
  projects/tcp_ffcaia2008_head/sbin/sconfig/Makefile
  projects/tcp_ffcaia2008_head/sbin/shutdown/Makefile
  projects/tcp_ffcaia2008_head/sbin/spppcontrol/Makefile
  projects/tcp_ffcaia2008_head/sbin/swapon/Makefile
  projects/tcp_ffcaia2008_head/sbin/sysctl/sysctl.c
  projects/tcp_ffcaia2008_head/sbin/tunefs/Makefile
  projects/tcp_ffcaia2008_head/sbin/tunefs/tunefs.8
  projects/tcp_ffcaia2008_head/share/man/man4/Makefile
  projects/tcp_ffcaia2008_head/share/man/man4/acpi_hp.4
  projects/tcp_ffcaia2008_head/share/man/man4/acpi_wmi.4
  projects/tcp_ffcaia2008_head/share/man/man4/atapicam.4
  projects/tcp_ffcaia2008_head/share/man/man4/bge.4
  projects/tcp_ffcaia2008_head/share/man/man4/hifn.4
  projects/tcp_ffcaia2008_head/share/man/man4/ichwd.4
  projects/tcp_ffcaia2008_head/share/man/man4/iwn.4
  projects/tcp_ffcaia2008_head/share/man/man4/iwnfw.4
  projects/tcp_ffcaia2008_head/share/man/man4/mac_mls.4
  projects/tcp_ffcaia2008_head/share/man/man4/malo.4
  projects/tcp_ffcaia2008_head/share/man/man4/msk.4
  projects/tcp_ffcaia2008_head/share/man/man4/sbp_targ.4
  projects/tcp_ffcaia2008_head/share/man/man4/targ.4
  projects/tcp_ffcaia2008_head/share/man/man4/umass.4
  projects/tcp_ffcaia2008_head/share/man/man4/urtw.4
  projects/tcp_ffcaia2008_head/share/man/man5/regdomain.5
  projects/tcp_ffcaia2008_head/share/man/man9/Makefile
  projects/tcp_ffcaia2008_head/share/man/man9/get_cyclecount.9
  projects/tcp_ffcaia2008_head/share/misc/bsd-family-tree
  projects/tcp_ffcaia2008_head/share/misc/committers-src.dot
  projects/tcp_ffcaia2008_head/share/mk/bsd.sys.mk
  projects/tcp_ffcaia2008_head/share/zoneinfo/Makefile
  projects/tcp_ffcaia2008_head/share/zoneinfo/asia
  projects/tcp_ffcaia2008_head/share/zoneinfo/australasia
  projects/tcp_ffcaia2008_head/share/zoneinfo/southamerica
  projects/tcp_ffcaia2008_head/sys/amd64/acpica/acpi_wakecode.S
  projects/tcp_ffcaia2008_head/sys/amd64/amd64/intr_machdep.c
  projects/tcp_ffcaia2008_head/sys/amd64/amd64/machdep.c
  projects/tcp_ffcaia2008_head/sys/amd64/amd64/nexus.c
  projects/tcp_ffcaia2008_head/sys/amd64/amd64/pmap.c
  projects/tcp_ffcaia2008_head/sys/amd64/conf/GENERIC
  projects/tcp_ffcaia2008_head/sys/amd64/ia32/ia32_signal.c
  projects/tcp_ffcaia2008_head/sys/amd64/include/intr_machdep.h
  projects/tcp_ffcaia2008_head/sys/amd64/linux32/linux32_machdep.c
  projects/tcp_ffcaia2008_head/sys/amd64/linux32/linux32_sysvec.c
  projects/tcp_ffcaia2008_head/sys/arm/arm/machdep.c
  projects/tcp_ffcaia2008_head/sys/arm/arm/pmap.c
  projects/tcp_ffcaia2008_head/sys/arm/conf/HL200
  projects/tcp_ffcaia2008_head/sys/arm/conf/KB920X
  projects/tcp_ffcaia2008_head/sys/boot/common/commands.c
  projects/tcp_ffcaia2008_head/sys/boot/i386/zfsboot/zfsboot.c
  projects/tcp_ffcaia2008_head/sys/boot/zfs/zfs.c
  projects/tcp_ffcaia2008_head/sys/boot/zfs/zfsimpl.c
  projects/tcp_ffcaia2008_head/sys/cam/ata/ata_da.c
  projects/tcp_ffcaia2008_head/sys/cam/ata/ata_xpt.c
  projects/tcp_ffcaia2008_head/sys/cam/cam.h
  projects/tcp_ffcaia2008_head/sys/cam/cam_periph.c
  projects/tcp_ffcaia2008_head/sys/cam/cam_queue.c
  projects/tcp_ffcaia2008_head/sys/cam/cam_xpt.c
  projects/tcp_ffcaia2008_head/sys/cam/cam_xpt_internal.h
  projects/tcp_ffcaia2008_head/sys/cam/scsi/scsi_all.c
  projects/tcp_ffcaia2008_head/sys/cam/scsi/scsi_cd.c
  projects/tcp_ffcaia2008_head/sys/cam/scsi/scsi_ch.c
  projects/tcp_ffcaia2008_head/sys/cam/scsi/scsi_da.c
  projects/tcp_ffcaia2008_head/sys/cam/scsi/scsi_low.c
  projects/tcp_ffcaia2008_head/sys/cam/scsi/scsi_pt.c
  projects/tcp_ffcaia2008_head/sys/cam/scsi/scsi_sa.c
  projects/tcp_ffcaia2008_head/sys/cam/scsi/scsi_targ_bh.c
  projects/tcp_ffcaia2008_head/sys/cam/scsi/scsi_target.c
  projects/tcp_ffcaia2008_head/sys/cam/scsi/scsi_xpt.c
  projects/tcp_ffcaia2008_head/sys/cddl/boot/zfs/zfsimpl.h
  projects/tcp_ffcaia2008_head/sys/compat/freebsd32/freebsd32_misc.c
  projects/tcp_ffcaia2008_head/sys/compat/freebsd32/freebsd32_proto.h
  projects/tcp_ffcaia2008_head/sys/compat/freebsd32/freebsd32_syscall.h
  projects/tcp_ffcaia2008_head/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/tcp_ffcaia2008_head/sys/compat/freebsd32/freebsd32_sysent.c
  projects/tcp_ffcaia2008_head/sys/compat/freebsd32/syscalls.master
  projects/tcp_ffcaia2008_head/sys/compat/linux/linux_socket.c
  projects/tcp_ffcaia2008_head/sys/compat/x86bios/x86bios.c
  projects/tcp_ffcaia2008_head/sys/compat/x86bios/x86bios.h
  projects/tcp_ffcaia2008_head/sys/conf/NOTES
  projects/tcp_ffcaia2008_head/sys/conf/files
  projects/tcp_ffcaia2008_head/sys/conf/files.amd64
  projects/tcp_ffcaia2008_head/sys/conf/files.i386
  projects/tcp_ffcaia2008_head/sys/conf/options
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/changes.txt
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/common/adfile.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/common/adisasm.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/common/adwalk.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/common/dmtable.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/common/getopt.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/compiler/aslload.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/debugger/dbcmds.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/debugger/dbinput.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/disassembler/dmutils.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/disassembler/dmwalk.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/dispatcher/dswload.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/events/evregion.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/include/acapps.h
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/include/acdebug.h
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/include/acdisasm.h
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/include/acglobal.h
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/include/aclocal.h
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/include/acpixf.h
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/namespace/nsrepair.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/acpica/utilities/utglobal.c
  projects/tcp_ffcaia2008_head/sys/contrib/dev/iwn/LICENSE
  projects/tcp_ffcaia2008_head/sys/dev/aac/aac.c
  projects/tcp_ffcaia2008_head/sys/dev/aac/aac_cam.c
  projects/tcp_ffcaia2008_head/sys/dev/aac/aacreg.h
  projects/tcp_ffcaia2008_head/sys/dev/aac/aacvar.h
  projects/tcp_ffcaia2008_head/sys/dev/acpi_support/acpi_aiboost.c
  projects/tcp_ffcaia2008_head/sys/dev/ahci/ahci.c
  projects/tcp_ffcaia2008_head/sys/dev/ahci/ahci.h
  projects/tcp_ffcaia2008_head/sys/dev/aic7xxx/aic79xx_pci.c
  projects/tcp_ffcaia2008_head/sys/dev/aic7xxx/aicasm/aicasm.c
  projects/tcp_ffcaia2008_head/sys/dev/amr/amr.c
  projects/tcp_ffcaia2008_head/sys/dev/ata/ata-all.h
  projects/tcp_ffcaia2008_head/sys/dev/ata/ata-disk.c
  projects/tcp_ffcaia2008_head/sys/dev/ata/ata-pci.h
  projects/tcp_ffcaia2008_head/sys/dev/ata/ata-queue.c
  projects/tcp_ffcaia2008_head/sys/dev/ata/ata-raid.c
  projects/tcp_ffcaia2008_head/sys/dev/ata/atapi-cam.c
  projects/tcp_ffcaia2008_head/sys/dev/ata/atapi-cd.c
  projects/tcp_ffcaia2008_head/sys/dev/ata/atapi-fd.c
  projects/tcp_ffcaia2008_head/sys/dev/ata/atapi-tape.c
  projects/tcp_ffcaia2008_head/sys/dev/ata/chipsets/ata-adaptec.c
  projects/tcp_ffcaia2008_head/sys/dev/ata/chipsets/ata-marvell.c
  projects/tcp_ffcaia2008_head/sys/dev/ata/chipsets/ata-nvidia.c
  projects/tcp_ffcaia2008_head/sys/dev/ata/chipsets/ata-serverworks.c
  projects/tcp_ffcaia2008_head/sys/dev/ata/chipsets/ata-via.c
  projects/tcp_ffcaia2008_head/sys/dev/atkbdc/atkbd.c
  projects/tcp_ffcaia2008_head/sys/dev/bce/if_bce.c
  projects/tcp_ffcaia2008_head/sys/dev/bce/if_bcereg.h
  projects/tcp_ffcaia2008_head/sys/dev/bge/if_bge.c
  projects/tcp_ffcaia2008_head/sys/dev/dpms/dpms.c
  projects/tcp_ffcaia2008_head/sys/dev/drm/drmP.h
  projects/tcp_ffcaia2008_head/sys/dev/drm/drm_scatter.c
  projects/tcp_ffcaia2008_head/sys/dev/drm/mach64_state.c
  projects/tcp_ffcaia2008_head/sys/dev/drm/r600_blit.c
  projects/tcp_ffcaia2008_head/sys/dev/drm/radeon_cp.c
  projects/tcp_ffcaia2008_head/sys/dev/fb/vesa.c
  projects/tcp_ffcaia2008_head/sys/dev/fb/vesa.h
  projects/tcp_ffcaia2008_head/sys/dev/fdc/fdc.c
  projects/tcp_ffcaia2008_head/sys/dev/gem/if_gem_pci.c
  projects/tcp_ffcaia2008_head/sys/dev/hwpmc/hwpmc_core.c
  projects/tcp_ffcaia2008_head/sys/dev/hwpmc/hwpmc_mod.c
  projects/tcp_ffcaia2008_head/sys/dev/ips/ips_disk.c
  projects/tcp_ffcaia2008_head/sys/dev/iwn/if_iwn.c
  projects/tcp_ffcaia2008_head/sys/dev/iwn/if_iwnreg.h
  projects/tcp_ffcaia2008_head/sys/dev/iwn/if_iwnvar.h
  projects/tcp_ffcaia2008_head/sys/dev/mpt/mpt.c
  projects/tcp_ffcaia2008_head/sys/dev/mpt/mpt.h
  projects/tcp_ffcaia2008_head/sys/dev/mpt/mpt_cam.c
  projects/tcp_ffcaia2008_head/sys/dev/mpt/mpt_raid.c
  projects/tcp_ffcaia2008_head/sys/dev/msk/if_msk.c
  projects/tcp_ffcaia2008_head/sys/dev/msk/if_mskreg.h
  projects/tcp_ffcaia2008_head/sys/dev/mwl/if_mwl_pci.c
  projects/tcp_ffcaia2008_head/sys/dev/mxge/if_mxge.c
  projects/tcp_ffcaia2008_head/sys/dev/mxge/if_mxge_var.h
  projects/tcp_ffcaia2008_head/sys/dev/pci/pci.c
  projects/tcp_ffcaia2008_head/sys/dev/pci/vga_pci.c
  projects/tcp_ffcaia2008_head/sys/dev/ppbus/lpt.c
  projects/tcp_ffcaia2008_head/sys/dev/ppbus/pcfclock.c
  projects/tcp_ffcaia2008_head/sys/dev/siis/siis.c
  projects/tcp_ffcaia2008_head/sys/dev/syscons/syscons.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/ehci.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/ehci.h
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/ehci_ixp4xx.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/ehci_mbus.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/ehci_pci.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/ohci.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/ohci.h
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/ohci_atmelarm.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/ohci_pci.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/uhci.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/uhci.h
  projects/tcp_ffcaia2008_head/sys/dev/usb/controller/uhci_pci.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/input/ukbd.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/input/ums.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/net/if_cdce.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/serial/uchcom.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/storage/umass.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/usbdevs
  projects/tcp_ffcaia2008_head/sys/dev/usb/wlan/if_rum.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/wlan/if_uath.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/wlan/if_upgt.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/wlan/if_ural.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/wlan/if_urtw.c
  projects/tcp_ffcaia2008_head/sys/dev/usb/wlan/if_urtwreg.h
  projects/tcp_ffcaia2008_head/sys/dev/usb/wlan/if_urtwvar.h
  projects/tcp_ffcaia2008_head/sys/dev/usb/wlan/if_zyd.c
  projects/tcp_ffcaia2008_head/sys/fs/nfsclient/nfs_clport.c
  projects/tcp_ffcaia2008_head/sys/fs/nfsclient/nfs_clstate.c
  projects/tcp_ffcaia2008_head/sys/fs/nfsclient/nfs_clsubs.c
  projects/tcp_ffcaia2008_head/sys/fs/smbfs/smbfs_vfsops.c
  projects/tcp_ffcaia2008_head/sys/fs/tmpfs/tmpfs_subr.c
  projects/tcp_ffcaia2008_head/sys/geom/part/g_part_gpt.c
  projects/tcp_ffcaia2008_head/sys/i386/conf/GENERIC
  projects/tcp_ffcaia2008_head/sys/i386/conf/NOTES
  projects/tcp_ffcaia2008_head/sys/i386/i386/intr_machdep.c
  projects/tcp_ffcaia2008_head/sys/i386/i386/machdep.c
  projects/tcp_ffcaia2008_head/sys/i386/i386/nexus.c
  projects/tcp_ffcaia2008_head/sys/i386/i386/pmap.c
  projects/tcp_ffcaia2008_head/sys/i386/include/intr_machdep.h
  projects/tcp_ffcaia2008_head/sys/i386/linux/linux_machdep.c
  projects/tcp_ffcaia2008_head/sys/i386/linux/linux_sysvec.c
  projects/tcp_ffcaia2008_head/sys/i386/xen/pmap.c
  projects/tcp_ffcaia2008_head/sys/ia64/conf/GENERIC
  projects/tcp_ffcaia2008_head/sys/ia64/ia64/machdep.c
  projects/tcp_ffcaia2008_head/sys/ia64/ia64/pmap.c
  projects/tcp_ffcaia2008_head/sys/ia64/include/asm.h
  projects/tcp_ffcaia2008_head/sys/ia64/include/param.h
  projects/tcp_ffcaia2008_head/sys/kern/bus_if.m
  projects/tcp_ffcaia2008_head/sys/kern/imgact_elf.c
  projects/tcp_ffcaia2008_head/sys/kern/init_main.c
  projects/tcp_ffcaia2008_head/sys/kern/init_sysent.c
  projects/tcp_ffcaia2008_head/sys/kern/kern_context.c
  projects/tcp_ffcaia2008_head/sys/kern/kern_cpuset.c
  projects/tcp_ffcaia2008_head/sys/kern/kern_exec.c
  projects/tcp_ffcaia2008_head/sys/kern/kern_intr.c
  projects/tcp_ffcaia2008_head/sys/kern/kern_ktrace.c
  projects/tcp_ffcaia2008_head/sys/kern/kern_shutdown.c
  projects/tcp_ffcaia2008_head/sys/kern/kern_sig.c
  projects/tcp_ffcaia2008_head/sys/kern/kern_thr.c
  projects/tcp_ffcaia2008_head/sys/kern/kern_thread.c
  projects/tcp_ffcaia2008_head/sys/kern/sched_ule.c
  projects/tcp_ffcaia2008_head/sys/kern/stack_protector.c
  projects/tcp_ffcaia2008_head/sys/kern/subr_bus.c
  projects/tcp_ffcaia2008_head/sys/kern/subr_taskqueue.c
  projects/tcp_ffcaia2008_head/sys/kern/subr_trap.c
  projects/tcp_ffcaia2008_head/sys/kern/sys_generic.c
  projects/tcp_ffcaia2008_head/sys/kern/sys_process.c
  projects/tcp_ffcaia2008_head/sys/kern/syscalls.c
  projects/tcp_ffcaia2008_head/sys/kern/syscalls.master
  projects/tcp_ffcaia2008_head/sys/kern/systrace_args.c
  projects/tcp_ffcaia2008_head/sys/kern/sysv_shm.c
  projects/tcp_ffcaia2008_head/sys/kern/tty.c
  projects/tcp_ffcaia2008_head/sys/kern/tty_ttydisc.c
  projects/tcp_ffcaia2008_head/sys/kern/uipc_syscalls.c
  projects/tcp_ffcaia2008_head/sys/mips/mips/pm_machdep.c
  projects/tcp_ffcaia2008_head/sys/mips/mips/pmap.c
  projects/tcp_ffcaia2008_head/sys/modules/Makefile
  projects/tcp_ffcaia2008_head/sys/modules/cam/Makefile
  projects/tcp_ffcaia2008_head/sys/modules/dpms/Makefile
  projects/tcp_ffcaia2008_head/sys/modules/iwnfw/Makefile
  projects/tcp_ffcaia2008_head/sys/modules/ubser/Makefile
  projects/tcp_ffcaia2008_head/sys/modules/usb/Makefile
  projects/tcp_ffcaia2008_head/sys/modules/usb/ucom/Makefile
  projects/tcp_ffcaia2008_head/sys/modules/vesa/Makefile
  projects/tcp_ffcaia2008_head/sys/modules/x86bios/Makefile
  projects/tcp_ffcaia2008_head/sys/net/bpf.c
  projects/tcp_ffcaia2008_head/sys/net/flowtable.c
  projects/tcp_ffcaia2008_head/sys/net/if_enc.c
  projects/tcp_ffcaia2008_head/sys/net/if_gif.c
  projects/tcp_ffcaia2008_head/sys/net/pfil.c
  projects/tcp_ffcaia2008_head/sys/net/pfil.h
  projects/tcp_ffcaia2008_head/sys/net80211/ieee80211_hwmp.c
  projects/tcp_ffcaia2008_head/sys/net80211/ieee80211_mesh.c
  projects/tcp_ffcaia2008_head/sys/net80211/ieee80211_mesh.h
  projects/tcp_ffcaia2008_head/sys/net80211/ieee80211_output.c
  projects/tcp_ffcaia2008_head/sys/net80211/ieee80211_proto.h
  projects/tcp_ffcaia2008_head/sys/netgraph/NOTES
  projects/tcp_ffcaia2008_head/sys/netinet/if_ether.c
  projects/tcp_ffcaia2008_head/sys/netinet/in.c
  projects/tcp_ffcaia2008_head/sys/netinet/ip_icmp.c
  projects/tcp_ffcaia2008_head/sys/netinet/ip_input.c
  projects/tcp_ffcaia2008_head/sys/netinet/libalias/alias.c
  projects/tcp_ffcaia2008_head/sys/netinet/sctp_cc_functions.c
  projects/tcp_ffcaia2008_head/sys/netinet/sctp_output.c
  projects/tcp_ffcaia2008_head/sys/netinet6/icmp6.c
  projects/tcp_ffcaia2008_head/sys/netinet6/in6.c
  projects/tcp_ffcaia2008_head/sys/netinet6/in6_ifattach.c
  projects/tcp_ffcaia2008_head/sys/nfsclient/nfs_kdtrace.c
  projects/tcp_ffcaia2008_head/sys/nfsclient/nfs_vnops.c
  projects/tcp_ffcaia2008_head/sys/pc98/conf/GENERIC
  projects/tcp_ffcaia2008_head/sys/pc98/pc98/machdep.c
  projects/tcp_ffcaia2008_head/sys/powerpc/aim/clock.c
  projects/tcp_ffcaia2008_head/sys/powerpc/aim/machdep.c
  projects/tcp_ffcaia2008_head/sys/powerpc/aim/mmu_oea.c
  projects/tcp_ffcaia2008_head/sys/powerpc/aim/mmu_oea64.c
  projects/tcp_ffcaia2008_head/sys/powerpc/aim/mp_cpudep.c
  projects/tcp_ffcaia2008_head/sys/powerpc/aim/platform_chrp.c
  projects/tcp_ffcaia2008_head/sys/powerpc/aim/swtch.S
  projects/tcp_ffcaia2008_head/sys/powerpc/aim/trap_subr.S
  projects/tcp_ffcaia2008_head/sys/powerpc/booke/machdep.c
  projects/tcp_ffcaia2008_head/sys/powerpc/booke/mp_cpudep.c
  projects/tcp_ffcaia2008_head/sys/powerpc/booke/pmap.c
  projects/tcp_ffcaia2008_head/sys/powerpc/include/hid.h
  projects/tcp_ffcaia2008_head/sys/powerpc/include/pcpu.h
  projects/tcp_ffcaia2008_head/sys/powerpc/include/pmap.h
  projects/tcp_ffcaia2008_head/sys/powerpc/include/smp.h
  projects/tcp_ffcaia2008_head/sys/powerpc/include/spr.h
  projects/tcp_ffcaia2008_head/sys/powerpc/powermac/hrowpic.c
  projects/tcp_ffcaia2008_head/sys/powerpc/powerpc/cpu.c
  projects/tcp_ffcaia2008_head/sys/powerpc/powerpc/mmu_if.m
  projects/tcp_ffcaia2008_head/sys/powerpc/powerpc/mp_machdep.c
  projects/tcp_ffcaia2008_head/sys/powerpc/powerpc/pmap_dispatch.c
  projects/tcp_ffcaia2008_head/sys/powerpc/powerpc/stack_machdep.c
  projects/tcp_ffcaia2008_head/sys/powerpc/powerpc/uio_machdep.c
  projects/tcp_ffcaia2008_head/sys/sparc64/conf/GENERIC
  projects/tcp_ffcaia2008_head/sys/sparc64/include/elf.h
  projects/tcp_ffcaia2008_head/sys/sparc64/include/in_cksum.h
  projects/tcp_ffcaia2008_head/sys/sparc64/sparc64/machdep.c
  projects/tcp_ffcaia2008_head/sys/sparc64/sparc64/pmap.c
  projects/tcp_ffcaia2008_head/sys/sun4v/include/elf.h
  projects/tcp_ffcaia2008_head/sys/sun4v/sun4v/machdep.c
  projects/tcp_ffcaia2008_head/sys/sun4v/sun4v/pmap.c
  projects/tcp_ffcaia2008_head/sys/sys/aac_ioctl.h
  projects/tcp_ffcaia2008_head/sys/sys/ata.h
  projects/tcp_ffcaia2008_head/sys/sys/bus.h
  projects/tcp_ffcaia2008_head/sys/sys/interrupt.h
  projects/tcp_ffcaia2008_head/sys/sys/kernel.h
  projects/tcp_ffcaia2008_head/sys/sys/ktrace.h
  projects/tcp_ffcaia2008_head/sys/sys/signalvar.h
  projects/tcp_ffcaia2008_head/sys/sys/syscall.h
  projects/tcp_ffcaia2008_head/sys/sys/syscall.mk
  projects/tcp_ffcaia2008_head/sys/sys/syscallsubr.h
  projects/tcp_ffcaia2008_head/sys/sys/sysproto.h
  projects/tcp_ffcaia2008_head/sys/sys/time.h
  projects/tcp_ffcaia2008_head/sys/sys/ttyqueue.h
  projects/tcp_ffcaia2008_head/sys/tools/fw_stub.awk
  projects/tcp_ffcaia2008_head/sys/tools/makeobjops.awk
  projects/tcp_ffcaia2008_head/sys/vm/pmap.h
  projects/tcp_ffcaia2008_head/sys/vm/swap_pager.c
  projects/tcp_ffcaia2008_head/sys/vm/vm_extern.h
  projects/tcp_ffcaia2008_head/sys/vm/vm_fault.c
  projects/tcp_ffcaia2008_head/sys/vm/vm_glue.c
  projects/tcp_ffcaia2008_head/sys/vm/vm_map.c
  projects/tcp_ffcaia2008_head/tools/regression/fstest/tests/rename/21.t
  projects/tcp_ffcaia2008_head/tools/regression/lib/libc/gen/test-wordexp.c
  projects/tcp_ffcaia2008_head/tools/regression/lib/libutil/test-flopen.c
  projects/tcp_ffcaia2008_head/tools/regression/sigqueue/sigqtest1/sigqtest1.c
  projects/tcp_ffcaia2008_head/tools/regression/sigqueue/sigqtest2/sigqtest2.c
  projects/tcp_ffcaia2008_head/tools/tools/netrate/netsend/netsend.c
  projects/tcp_ffcaia2008_head/usr.bin/bsdiff/bsdiff/bsdiff.1
  projects/tcp_ffcaia2008_head/usr.bin/bsdiff/bspatch/bspatch.1
  projects/tcp_ffcaia2008_head/usr.bin/make/job.c
  projects/tcp_ffcaia2008_head/usr.bin/make/main.c
  projects/tcp_ffcaia2008_head/usr.bin/netstat/route.c
  projects/tcp_ffcaia2008_head/usr.bin/touch/touch.c
  projects/tcp_ffcaia2008_head/usr.bin/vmstat/vmstat.c
  projects/tcp_ffcaia2008_head/usr.sbin/acpi/iasl/Makefile
  projects/tcp_ffcaia2008_head/usr.sbin/crashinfo/crashinfo.sh
  projects/tcp_ffcaia2008_head/usr.sbin/jail/jail.8
  projects/tcp_ffcaia2008_head/usr.sbin/ntp/doc/ntpd.8
  projects/tcp_ffcaia2008_head/usr.sbin/sysinstall/cdrom.c
  projects/tcp_ffcaia2008_head/usr.sbin/sysinstall/tcpip.c
  projects/tcp_ffcaia2008_head/usr.sbin/tzsetup/tzsetup.8
  projects/tcp_ffcaia2008_head/usr.sbin/tzsetup/tzsetup.c

Modified: projects/tcp_ffcaia2008_head/Makefile.inc1
==============================================================================

--- projects/tcp_ffcaia2008_head/Makefile.inc1	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/Makefile.inc1	Fri Oct 30 21:00:58 2009	(r198701)
@@ -599,11 +599,14 @@ installcheck_UGID:
 .if ${MK_INFO} != "no"
 _install-info=	install-info
 .endif
+.if ${MK_ZONEINFO} != "no"
+_zoneinfo=	zic tzsetup
+.endif
 
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
 	date echo egrep find grep ${_install-info} \
 	ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
-	test true uname wc zic
+	test true uname wc ${_zoneinfo}
 
 #
 # distributeworld
@@ -929,6 +932,10 @@ _ar=		usr.bin/ar
 _mklocale=	usr.bin/mklocale
 .endif
 
+.if ${BOOTSTRAPPING} < 900002
+_sed=		usr.bin/sed
+.endif
+
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -954,6 +961,7 @@ bootstrap-tools:
     usr.bin/makewhatis \
     ${_mklocale} \
     usr.bin/rpcgen \
+    ${_sed} \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \
@@ -1033,7 +1041,6 @@ cross-tools:
 .for _tool in \
     gnu/usr.bin/binutils \
     gnu/usr.bin/cc \
-    usr.bin/sed \
     usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
     ${_btxld} \
     ${_crunchide} \
@@ -1122,7 +1129,7 @@ lib/libradius__L secure/lib/libssl__L: s
 _secure_lib_libssh= secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
 .if ${MK_KERBEROS} != "no"
-kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \
+kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \
     lib/libcrypt__L

Modified: projects/tcp_ffcaia2008_head/ObsoleteFiles.inc
==============================================================================
--- projects/tcp_ffcaia2008_head/ObsoleteFiles.inc	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/ObsoleteFiles.inc	Fri Oct 30 21:00:58 2009	(r198701)
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20091027: pselect.3 implemented as syscall
+OLD_FILES+=usr/share/man/man3/pselect.3.gz
+# 20091005: fusword.9 and susword.9 removed
+OLD_FILES+=usr/share/man/man9/fusword.9.gz
+OLD_FILES+=usr/share/man/man9/susword.9.gz
 # 20090909: vesa and dpms promoted to be i386/amd64 common
 OLD_FILES+=usr/include/machine/pc/vesa.h
 OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
@@ -26,6 +31,49 @@ OLD_FILES+=usr/share/man/man8/lukemftpd.
 OLD_FILES+=etc/mtree/BSD.local.dist
 OLD_FILES+=etc/mtree/BSD.x11.dist
 OLD_FILES+=etc/mtree/BSD.x11-4.dist
+# 20090812: net80211 documentation overhaul
+OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz
 # 20090801: vimage.h removed in favour of vnet.h
 OLD_FILES+=usr/include/sys/vimage.h
 # 20090719: library version bump for 8.0
@@ -503,6 +551,8 @@ OLD_FILES+=usr/include/dev/usb/usb_quirk
 OLD_FILES+=usr/include/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h
+OLD_FILES+=usr/sbin/usbdevs
+OLD_FILES+=usr/share/man/man8/usbdevs.8.gz
 # 20090203: removal of pccard header files
 OLD_FILES+=usr/include/pccard/cardinfo.h
 OLD_FILES+=usr/include/pccard/cis.h

Modified: projects/tcp_ffcaia2008_head/UPDATING
==============================================================================
--- projects/tcp_ffcaia2008_head/UPDATING	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/UPDATING	Fri Oct 30 21:00:58 2009	(r198701)
@@ -22,6 +22,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20091025:
+	The iwn(4) driver has been updated to support the 5000 and 5150 series.
+	There's one kernel module for each firmware. Adding "device iwnfw"
+	to the kernel configuration file means including all three firmware
+	images inside the kernel. If you want to include just the one for
+	your wireless card, use the the devices iwn4965fw, iwn5000fw or
+	iwn5150fw.
+
 20090926:
 	The rc.d/network_ipv6, IPv6 configuration script has been integrated
 	into rc.d/netif.  The changes are the following:
@@ -624,6 +632,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
 	userland (libpmc(3)) and the kernel module (hwpmc(4)) in
 	sync.
 
+20081009:
+	atapci kernel module now includes only generic PCI ATA
+	driver. AHCI driver moved to ataahci kernel module.
+	All vendor-specific code moved into separate kernel modules:
+	ataacard, ataacerlabs, ataadaptec, ataamd, ataati, atacenatek,
+	atacypress, atacyrix, atahighpoint, ataintel, ataite, atajmicron,
+	atamarvell, atamicron, atanational, atanetcell, atanvidia,
+	atapromise, ataserverworks, atasiliconimage, atasis, atavia
+
 20080820:
 	The TTY subsystem of the kernel has been replaced by a new
 	implementation, which provides better scalability and an

Modified: projects/tcp_ffcaia2008_head/bin/cat/Makefile
==============================================================================
--- projects/tcp_ffcaia2008_head/bin/cat/Makefile	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/bin/cat/Makefile	Fri Oct 30 21:00:58 2009	(r198701)
@@ -2,6 +2,5 @@
 # $FreeBSD$
 
 PROG=	cat
-WARNS?=	6
 
 .include <bsd.prog.mk>

Modified: projects/tcp_ffcaia2008_head/bin/csh/iconv_stub.c
==============================================================================
--- projects/tcp_ffcaia2008_head/bin/csh/iconv_stub.c	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/bin/csh/iconv_stub.c	Fri Oct 30 21:00:58 2009	(r198701)
@@ -61,9 +61,20 @@ dl_iconv_open(const char *tocode, const 
 		if (iconvlib == NULL)
 			return (iconv_t)-1;
 		iconv_open = (iconv_open_t *)dlfunc(iconvlib, ICONV_OPEN);
+		if (iconv_open == NULL)
+			goto dlfunc_err;
 		dl_iconv = (dl_iconv_t *)dlfunc(iconvlib, ICONV_ENGINE);
+		if (dl_iconv == NULL)
+			goto dlfunc_err;
 		dl_iconv_close = (dl_iconv_close_t *)dlfunc(iconvlib,
 		    ICONV_CLOSE);
+		if (dl_iconv_close == NULL)
+			goto dlfunc_err;
 	}
 	return iconv_open(tocode, fromcode);
+
+dlfunc_err:
+	dlclose(iconvlib);
+	iconvlib = NULL;
+	return (iconv_t)-1;
 }

Modified: projects/tcp_ffcaia2008_head/bin/ls/ls.c
==============================================================================
--- projects/tcp_ffcaia2008_head/bin/ls/ls.c	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/bin/ls/ls.c	Fri Oct 30 21:00:58 2009	(r198701)
@@ -399,7 +399,7 @@ main(int argc, char *argv[])
 	 * If not -F, -d or -l options, follow any symbolic links listed on
 	 * the command line.
 	 */
-	if (!f_longform && !f_listdir && !f_type)
+	if (!f_longform && !f_listdir && (!f_type || f_slash))
 		fts_options |= FTS_COMFOLLOW;
 
 	/*

Modified: projects/tcp_ffcaia2008_head/bin/sh/expand.c
==============================================================================
--- projects/tcp_ffcaia2008_head/bin/sh/expand.c	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/bin/sh/expand.c	Fri Oct 30 21:00:58 2009	(r198701)
@@ -657,7 +657,7 @@ again: /* jump here after setting a vari
 	}
 	varlen = 0;
 	startloc = expdest - stackblock();
-	if (!set && uflag) {
+	if (!set && uflag && *var != '@' && *var != '*') {
 		switch (subtype) {
 		case VSNORMAL:
 		case VSTRIMLEFT:

Modified: projects/tcp_ffcaia2008_head/bin/sh/parser.c
==============================================================================
--- projects/tcp_ffcaia2008_head/bin/sh/parser.c	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/bin/sh/parser.c	Fri Oct 30 21:00:58 2009	(r198701)
@@ -1308,11 +1308,16 @@ parsebackq: {
 	struct jmploc *const savehandler = handler;
 	int savelen;
 	int saveprompt;
+	const int bq_startlinno = plinno;
 
 	if (setjmp(jmploc.loc)) {
 		if (str)
 			ckfree(str);
 		handler = savehandler;
+		if (exception == EXERROR) {
+			startlinno = bq_startlinno;
+			synerror("Error in command substitution");
+		}
 		longjmp(handler->loc, 1);
 	}
 	INTOFF;

Modified: projects/tcp_ffcaia2008_head/bin/sh/sh.1
==============================================================================
--- projects/tcp_ffcaia2008_head/bin/sh/sh.1	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/bin/sh/sh.1	Fri Oct 30 21:00:58 2009	(r198701)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd May 31, 2009
+.Dd October 24, 2009
 .Dt SH 1
 .Os
 .Sh NAME
@@ -296,7 +296,10 @@ sh -T -c "trap 'exit 1' 2 ; some-blockin
 .Ed
 .It Fl u Li nounset
 Write a message to standard error when attempting
-to expand a variable that is not set, and if the
+to expand a variable, a positional parameter or
+the special parameter
+.Va \&!
+that is not set, and if the
 shell is not interactive, exit immediately.
 .It Fl V Li vi
 Enable the built-in

Modified: projects/tcp_ffcaia2008_head/bin/uuidgen/Makefile
==============================================================================
--- projects/tcp_ffcaia2008_head/bin/uuidgen/Makefile	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/bin/uuidgen/Makefile	Fri Oct 30 21:00:58 2009	(r198701)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 PROG=	uuidgen
-WARNS?=	6
 
 .include <bsd.prog.mk>

Modified: projects/tcp_ffcaia2008_head/contrib/gcc/config/i386/i386.c
==============================================================================
--- projects/tcp_ffcaia2008_head/contrib/gcc/config/i386/i386.c	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/contrib/gcc/config/i386/i386.c	Fri Oct 30 21:00:58 2009	(r198701)
@@ -1614,7 +1614,7 @@ override_options (void)
 	     "-mtune=generic instead as appropriate.");
 
   if (!ix86_arch_string)
-    ix86_arch_string = TARGET_64BIT ? "x86-64" : "i386";
+    ix86_arch_string = TARGET_64BIT ? "x86-64" : "i486";
   if (!strcmp (ix86_arch_string, "generic"))
     error ("generic CPU can be used only for -mtune= switch");
   if (!strncmp (ix86_arch_string, "generic", 7))

Modified: projects/tcp_ffcaia2008_head/contrib/ncurses/ncurses/base/lib_getch.c
==============================================================================
--- projects/tcp_ffcaia2008_head/contrib/ncurses/ncurses/base/lib_getch.c	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/contrib/ncurses/ncurses/base/lib_getch.c	Fri Oct 30 21:00:58 2009	(r198701)
@@ -476,6 +476,12 @@ _nc_wgetch(WINDOW *win,
 	    /* resizeterm can push KEY_RESIZE */
 	    if (cooked_key_in_fifo()) {
 		*result = fifo_pull(sp);
+		/*
+		 * Get the ERR from queue -- it is from WINCH,
+		 * so we should take it out, the "error" is handled.
+		 */
+		if (fifo_peek(sp) == -1)
+		    fifo_pull(sp);
 		returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK);
 	    }
 	}

Modified: projects/tcp_ffcaia2008_head/etc/defaults/rc.conf
==============================================================================
--- projects/tcp_ffcaia2008_head/etc/defaults/rc.conf	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/etc/defaults/rc.conf	Fri Oct 30 21:00:58 2009	(r198701)
@@ -600,6 +600,7 @@ harvest_ethernet="YES"	# Entropy device 
 harvest_p_to_p="YES"	# Entropy device harvests point-to-point randomness
 dmesg_enable="YES"	# Save dmesg(8) to /var/run/dmesg.boot
 watchdogd_enable="NO"	# Start the software watchdog daemon
+watchdogd_flags=""	# Flags to watchdogd (if enabled)
 devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing
 							    # devfs(8) rules.
 devfs_system_ruleset=""	# The name (NOT number) of a ruleset to apply to /dev

Modified: projects/tcp_ffcaia2008_head/etc/gettytab
==============================================================================
--- projects/tcp_ffcaia2008_head/etc/gettytab	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/etc/gettytab	Fri Oct 30 21:00:58 2009	(r198701)
@@ -162,7 +162,7 @@ X|Xwindow|X window system:\
 	:fd@:nd@:cd@:rw:sp#9600:
 
 P|Pc|Pc console:\
-	:ht:np:sp#115200:
+	:ht:np:sp#9600:
 
 #
 # Wierdo special case for fast crt's with hardcopy devices

Modified: projects/tcp_ffcaia2008_head/etc/rc.d/faith
==============================================================================
--- projects/tcp_ffcaia2008_head/etc/rc.d/faith	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/etc/rc.d/faith	Fri Oct 30 21:00:58 2009	(r198701)
@@ -3,7 +3,7 @@
 #
 
 # PROVIDE: faith
-# REQUIRE: netif routing
+# REQUIRE: netif
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: projects/tcp_ffcaia2008_head/etc/rc.d/netoptions
==============================================================================
--- projects/tcp_ffcaia2008_head/etc/rc.d/netoptions	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/etc/rc.d/netoptions	Fri Oct 30 21:00:58 2009	(r198701)
@@ -53,7 +53,7 @@ netoptions_inet()
 		${SYSCTL_W} net.inet.tcp.rfc1323=1 >/dev/null
 	else
 		netoptions_init
-		echo -n ' rfc1323 extensions=${tcp_extensions}'
+		echo -n " rfc1323 extensions=${tcp_extensions}"
 		${SYSCTL_W} net.inet.tcp.rfc1323=0 >/dev/null
 	fi
 
@@ -61,13 +61,13 @@ netoptions_inet()
 		${SYSCTL_W} net.inet.tcp.always_keepalive=1 >/dev/null
 	else
 		netoptions_init
-		echo -n ' TCP keepalive=${tcp_keepalive}'
+		echo -n " TCP keepalive=${tcp_keepalive}"
 		${SYSCTL_W} net.inet.tcp.always_keepalive=0 >/dev/null
 	fi
 
 	if checkyesno tcp_drop_synfin; then
 		netoptions_init
-		echo -n ' drop SYN+FIN packets=${tcp_drop_synfin}'
+		echo -n " drop SYN+FIN packets=${tcp_drop_synfin}"
 		${SYSCTL_W} net.inet.tcp.drop_synfin=1 >/dev/null
 	else
 		${SYSCTL_W} net.inet.tcp.drop_synfin=0 >/dev/null

Modified: projects/tcp_ffcaia2008_head/etc/rc.d/stf
==============================================================================
--- projects/tcp_ffcaia2008_head/etc/rc.d/stf	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/etc/rc.d/stf	Fri Oct 30 21:00:58 2009	(r198701)
@@ -3,7 +3,7 @@
 #
 
 # PROVIDE: stf
-# REQUIRE: netif routing
+# REQUIRE: netif
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: projects/tcp_ffcaia2008_head/etc/rc.subr
==============================================================================
--- projects/tcp_ffcaia2008_head/etc/rc.subr	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/etc/rc.subr	Fri Oct 30 21:00:58 2009	(r198701)
@@ -593,7 +593,7 @@ run_rc_command()
 		rc_fast=yes
 		rc_quiet=yes
 		;;
-	force*)				# "force prefix; always run
+	force*)				# "force" prefix; always run
 		rc_force=yes
 		_rc_prefix=force
 		rc_arg=${rc_arg#${_rc_prefix}}
@@ -616,7 +616,7 @@ run_rc_command()
 	esac
 
 	eval _override_command=\$${name}_program
-	command=${command:+${_override_command:-$command}}
+	command=${_override_command:-$command}
 
 	_keywords="start stop restart rcvar $extra_commands"
 	rc_pid=

Modified: projects/tcp_ffcaia2008_head/games/number/Makefile
==============================================================================
--- projects/tcp_ffcaia2008_head/games/number/Makefile	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/games/number/Makefile	Fri Oct 30 21:00:58 2009	(r198701)
@@ -4,4 +4,6 @@
 PROG=	number
 MAN=	number.6
 
+WARNS?=	6
+
 .include <bsd.prog.mk>

Modified: projects/tcp_ffcaia2008_head/games/number/number.c
==============================================================================
--- projects/tcp_ffcaia2008_head/games/number/number.c	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/games/number/number.c	Fri Oct 30 21:00:58 2009	(r198701)
@@ -88,9 +88,7 @@ void	usage(void);
 int lflag;
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	int ch, first;
 	char line[256];
@@ -275,7 +273,7 @@ void
 pfract(len)
 	int len;
 {
-	static char *pref[] = { "", "ten-", "hundred-" };
+	static char const * const pref[] = { "", "ten-", "hundred-" };
 
 	switch(len) {
 	case 1:

Modified: projects/tcp_ffcaia2008_head/gnu/lib/libgcov/Makefile
==============================================================================
--- projects/tcp_ffcaia2008_head/gnu/lib/libgcov/Makefile	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/gnu/lib/libgcov/Makefile	Fri Oct 30 21:00:58 2009	(r198701)
@@ -2,6 +2,7 @@
 
 NO_PROFILE=
 .include <bsd.own.mk>
+MK_SSP=		no
 .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc

Modified: projects/tcp_ffcaia2008_head/kerberos5/lib/libgssapi_krb5/Makefile
==============================================================================
--- projects/tcp_ffcaia2008_head/kerberos5/lib/libgssapi_krb5/Makefile	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/kerberos5/lib/libgssapi_krb5/Makefile	Fri Oct 30 21:00:58 2009	(r198701)
@@ -2,8 +2,8 @@
 
 LIB=	gssapi_krb5
 LDFLAGS= -Wl,-Bsymbolic
-LDADD=	-lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt
-DPADD=	${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \
+LDADD=	-lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt
+DPADD=	${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \
 	${LIBCOM_ERR} ${LIBCRYPT}
 
 INCS=	${KRB5DIR}/lib/gssapi/gssapi/gssapi_krb5.h

Modified: projects/tcp_ffcaia2008_head/kerberos5/lib/libgssapi_spnego/Makefile
==============================================================================
--- projects/tcp_ffcaia2008_head/kerberos5/lib/libgssapi_spnego/Makefile	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/kerberos5/lib/libgssapi_spnego/Makefile	Fri Oct 30 21:00:58 2009	(r198701)
@@ -2,8 +2,8 @@
 
 LIB=	gssapi_spnego
 LDFLAGS= -Wl,-Bsymbolic
-LDADD=	-lasn1
-DPADD=	${LIBASN1}
+LDADD=	-lgssapi -lasn1
+DPADD=	${LIBGSSAPI} ${LIBASN1}
 
 SRCS=	accept_sec_context.c \
 	compat.c \

Modified: projects/tcp_ffcaia2008_head/lib/libbluetooth/bluetooth.3
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libbluetooth/bluetooth.3	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libbluetooth/bluetooth.3	Fri Oct 30 21:00:58 2009	(r198701)
@@ -272,7 +272,7 @@ otherwise 0.
 .Pp
 The
 .Fn bt_devinfo
-function populates prodivded
+function populates provided
 .Vt bt_devinfo
 structure with the information about given Bluetooth device.
 The caller is expected to pass Bluetooth device name in the

Modified: projects/tcp_ffcaia2008_head/lib/libbluetooth/bluetooth.h
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libbluetooth/bluetooth.h	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libbluetooth/bluetooth.h	Fri Oct 30 21:00:58 2009	(r198701)
@@ -163,8 +163,8 @@ int		bt_devclose(int s);
 int		bt_devsend (int s, uint16_t opcode, void *param, size_t plen);
 ssize_t		bt_devrecv (int s, void *buf, size_t size, time_t to);
 int		bt_devreq  (int s, struct bt_devreq *r, time_t to);
-int		bt_devfilter(int s, struct bt_devfilter const *new,
-			     struct bt_devfilter *old);
+int		bt_devfilter(int s, struct bt_devfilter const *newp,
+			     struct bt_devfilter *oldp);
 void		bt_devfilter_pkt_set(struct bt_devfilter *filter, uint8_t type);
 void		bt_devfilter_pkt_clr(struct bt_devfilter *filter, uint8_t type);
 int		bt_devfilter_pkt_tst(struct bt_devfilter const *filter, uint8_t type);

Modified: projects/tcp_ffcaia2008_head/lib/libc/gen/Makefile.inc
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libc/gen/Makefile.inc	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libc/gen/Makefile.inc	Fri Oct 30 21:00:58 2009	(r198701)
@@ -21,7 +21,7 @@ SRCS+=  __getosreldate.c __xuname.c \
 	initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \
 	lockf.c lrand48.c mrand48.c nftw.c nice.c \
 	nlist.c nrand48.c opendir.c \
-	pause.c pmadvise.c popen.c posix_spawn.c pselect.c \
+	pause.c pmadvise.c popen.c posix_spawn.c \
 	psignal.c pw_scan.c pwcache.c \
 	raise.c readdir.c readpassphrase.c rewinddir.c \
 	scandir.c seed48.c seekdir.c sem.c semctl.c \
@@ -62,7 +62,7 @@ MAN+=	alarm.3 arc4random.3 \
 	posix_spawnattr_getpgroup.3 posix_spawnattr_getschedparam.3 \
 	posix_spawnattr_getschedpolicy.3 posix_spawnattr_init.3 \
 	posix_spawnattr_getsigdefault.3 posix_spawnattr_getsigmask.3 \
-	pselect.3 psignal.3 pwcache.3 \
+	psignal.3 pwcache.3 \
 	raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \
 	scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \
 	sem_open.3 sem_post.3 sem_timedwait.3 sem_wait.3 \

Modified: projects/tcp_ffcaia2008_head/lib/libc/gen/Symbol.map
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libc/gen/Symbol.map	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libc/gen/Symbol.map	Fri Oct 30 21:00:58 2009	(r198701)
@@ -223,7 +223,6 @@ FBSD_1.0 {
 	posix_madvise;
 	popen;
 	pclose;
-	pselect;
 	psignal;
 	raise;
 	readdir;
@@ -454,7 +453,6 @@ FBSDprivate_1.0 {
 	__opendir2;
 	__pause;
 	_pause;
-	__pselect;
 	__pw_scan;	/* Used by (at least) libutil */
 	__raise;
 	_raise;

Modified: projects/tcp_ffcaia2008_head/lib/libc/gen/getcwd.c
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libc/gen/getcwd.c	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libc/gen/getcwd.c	Fri Oct 30 21:00:58 2009	(r198701)
@@ -62,13 +62,14 @@ getcwd(pt, size)
 	dev_t dev;
 	ino_t ino;
 	int first;
-	char *bpt, *bup;
+	char *bpt;
 	struct stat s;
 	dev_t root_dev;
 	ino_t root_ino;
-	size_t ptsize, upsize;
+	size_t ptsize;
 	int save_errno;
-	char *ept, *eup, *up, c;
+	char *ept, c;
+	int fd;
 
 	/*
 	 * If no buffer specified by the user, allocate one as necessary.
@@ -106,18 +107,6 @@ getcwd(pt, size)
 	bpt = ept - 1;
 	*bpt = '\0';
 
-	/*
-	 * Allocate 1024 bytes for the string of "../"'s.
-	 * Should always be enough.  If it's not, allocate
-	 * as necessary.  Special case the first stat, it's ".", not "..".
-	 */
-	if ((up = malloc(upsize = 1024)) == NULL)
-		goto err;
-	eup = up + upsize;
-	bup = up;
-	up[0] = '.';
-	up[1] = '\0';
-
 	/* Save root values, so know when to stop. */
 	if (stat("/", &s))
 		goto err;
@@ -128,7 +117,7 @@ getcwd(pt, size)
 
 	for (first = 1;; first = 0) {
 		/* Stat the current level. */
-		if (lstat(up, &s))
+		if (dir != NULL ? _fstat(dirfd(dir), &s) : lstat(".", &s))
 			goto err;
 
 		/* Save current node values. */
@@ -144,32 +133,22 @@ getcwd(pt, size)
 			 * been that way and stuff would probably break.
 			 */
 			bcopy(bpt, pt, ept - bpt);
-			free(up);
+			if (dir)
+				(void) closedir(dir);
 			return (pt);
 		}
 
-		/*
-		 * Build pointer to the parent directory, allocating memory
-		 * as necessary.  Max length is 3 for "../", the largest
-		 * possible component name, plus a trailing NUL.
-		 */
-		while (bup + 3  + MAXNAMLEN + 1 >= eup) {
-			if ((up = reallocf(up, upsize *= 2)) == NULL)
-				goto err;
-			bup = up;
-			eup = up + upsize;
-		}
-		*bup++ = '.';
-		*bup++ = '.';
-		*bup = '\0';
-
 		/* Open and stat parent directory. */
-		if (!(dir = opendir(up)) || _fstat(dirfd(dir), &s))
+		fd = _openat(dir != NULL ? dirfd(dir) : AT_FDCWD,
+				"..", O_RDONLY);
+		if (fd == -1)
 			goto err;
-
-		/* Add trailing slash for next directory. */
-		*bup++ = '/';
-		*bup = '\0';
+		if (dir)
+			(void) closedir(dir);
+		if (!(dir = fdopendir(fd)) || _fstat(dirfd(dir), &s)) {
+			_close(fd);
+			goto err;
+		}
 
 		/*
 		 * If it's a mount point, have to stat each element because
@@ -190,10 +169,10 @@ getcwd(pt, size)
 					goto notfound;
 				if (ISDOT(dp))
 					continue;
-				bcopy(dp->d_name, bup, dp->d_namlen + 1);
 
 				/* Save the first error for later. */
-				if (lstat(up, &s)) {
+				if (fstatat(dirfd(dir), dp->d_name, &s,
+				    AT_SYMLINK_NOFOLLOW)) {
 					if (!save_errno)
 						save_errno = errno;
 					errno = 0;
@@ -227,11 +206,6 @@ getcwd(pt, size)
 			*--bpt = '/';
 		bpt -= dp->d_namlen;
 		bcopy(dp->d_name, bpt, dp->d_namlen);
-		(void) closedir(dir);
-		dir = NULL;
-
-		/* Truncate any file name. */
-		*bup = '\0';
 	}
 
 notfound:
@@ -250,7 +224,6 @@ err:
 		free(pt);
 	if (dir)
 		(void) closedir(dir);
-	free(up);
 
 	errno = save_errno;
 	return (NULL);

Modified: projects/tcp_ffcaia2008_head/lib/libc/gen/wordexp.c
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libc/gen/wordexp.c	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libc/gen/wordexp.c	Fri Oct 30 21:00:58 2009	(r198701)
@@ -28,8 +28,10 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -73,6 +75,24 @@ wordexp(const char * __restrict words, w
 	return (0);
 }
 
+static size_t
+we_read_fully(int fd, char *buffer, size_t len)
+{
+	size_t done;
+	ssize_t nread;
+
+	done = 0;
+	do {
+		nread = _read(fd, buffer + done, len - done);
+		if (nread == -1 && errno == EINTR)
+			continue;
+		if (nread <= 0)
+			break;
+		done += nread;
+	} while (done != len);
+	return done;
+}
+
 /*
  * we_askshell --
  *	Use the `wordexp' /bin/sh builtin function to do most of the work
@@ -90,20 +110,31 @@ we_askshell(const char *words, wordexp_t
 	size_t sofs;			/* Offset into we->we_strings */
 	size_t vofs;			/* Offset into we->we_wordv */
 	pid_t pid;			/* Process ID of child */
+	pid_t wpid;			/* waitpid return value */
 	int status;			/* Child exit status */
+	int error;			/* Our return value */
+	int serrno;			/* errno to return */
 	char *ifs;			/* IFS env. var. */
 	char *np, *p;			/* Handy pointers */
 	char *nstrings;			/* Temporary for realloc() */
 	char **nwv;			/* Temporary for realloc() */
+	sigset_t newsigblock, oldsigblock;
 
+	serrno = errno;
 	if ((ifs = getenv("IFS")) == NULL)
 		ifs = " \t\n";
 
 	if (pipe(pdes) < 0)
 		return (WRDE_NOSPACE);	/* XXX */
+	(void)sigemptyset(&newsigblock);
+	(void)sigaddset(&newsigblock, SIGCHLD);
+	(void)_sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
 	if ((pid = fork()) < 0) {
+		serrno = errno;
 		_close(pdes[0]);
 		_close(pdes[1]);
+		(void)_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
+		errno = serrno;
 		return (WRDE_NOSPACE);	/* XXX */
 	}
 	else if (pid == 0) {
@@ -114,6 +145,7 @@ we_askshell(const char *words, wordexp_t
 		int devnull;
 		char *cmd;
 
+		(void)_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
 		_close(pdes[0]);
 		if (_dup2(pdes[1], STDOUT_FILENO) < 0)
 			_exit(1);
@@ -139,10 +171,11 @@ we_askshell(const char *words, wordexp_t
 	 * the expanded words separated by nulls.
 	 */
 	_close(pdes[1]);
-	if (_read(pdes[0], wbuf, 8) != 8 || _read(pdes[0], bbuf, 8) != 8) {
-		_close(pdes[0]);
-		_waitpid(pid, &status, 0);
-		return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX);
+	if (we_read_fully(pdes[0], wbuf, 8) != 8 ||
+			we_read_fully(pdes[0], bbuf, 8) != 8) {
+		error = flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX;
+		serrno = errno;
+		goto cleanup;
 	}
 	wbuf[8] = bbuf[8] = '\0';
 	nwords = strtol(wbuf, NULL, 16);
@@ -162,33 +195,38 @@ we_askshell(const char *words, wordexp_t
 	if ((nwv = realloc(we->we_wordv, (we->we_wordc + 1 +
 	    (flags & WRDE_DOOFFS ?  we->we_offs : 0)) *
 	    sizeof(char *))) == NULL) {
-		_close(pdes[0]);
-		_waitpid(pid, &status, 0);
-		return (WRDE_NOSPACE);
+		error = WRDE_NOSPACE;
+		goto cleanup;
 	}
 	we->we_wordv = nwv;
 	if ((nstrings = realloc(we->we_strings, we->we_nbytes)) == NULL) {
-		_close(pdes[0]);
-		_waitpid(pid, &status, 0);
-		return (WRDE_NOSPACE);
+		error = WRDE_NOSPACE;
+		goto cleanup;
 	}
 	for (i = 0; i < vofs; i++)
 		if (we->we_wordv[i] != NULL)
 			we->we_wordv[i] += nstrings - we->we_strings;
 	we->we_strings = nstrings;
 
-	if (_read(pdes[0], we->we_strings + sofs, nbytes) != nbytes) {
-		_close(pdes[0]);
-		_waitpid(pid, &status, 0);
-		return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX);
+	if (we_read_fully(pdes[0], we->we_strings + sofs, nbytes) != nbytes) {
+		error = flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX;
+		serrno = errno;
+		goto cleanup;
 	}
 
-	if (_waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) ||
-	    WEXITSTATUS(status) != 0) {
-		_close(pdes[0]);
-		return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX);
-	}
+	error = 0;
+cleanup:
 	_close(pdes[0]);
+	do
+		wpid = _waitpid(pid, &status, 0);
+	while (wpid < 0 && errno == EINTR);
+	(void)_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
+	if (error != 0) {
+		errno = serrno;
+		return (error);
+	}
+	if (wpid < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0)
+		return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX);
 
 	/*
 	 * Break the null-terminated expanded word strings out into

Modified: projects/tcp_ffcaia2008_head/lib/libc/include/namespace.h
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libc/include/namespace.h	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libc/include/namespace.h	Fri Oct 30 21:00:58 2009	(r198701)
@@ -80,6 +80,7 @@
 #define		listen				_listen
 #define		nanosleep			_nanosleep
 #define		open				_open
+#define		openat				_openat
 #define		poll				_poll
 #define		pthread_atfork			_pthread_atfork
 #define		pthread_attr_destroy		_pthread_attr_destroy

Modified: projects/tcp_ffcaia2008_head/lib/libc/include/un-namespace.h
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libc/include/un-namespace.h	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libc/include/un-namespace.h	Fri Oct 30 21:00:58 2009	(r198701)
@@ -61,6 +61,7 @@
 #undef		listen
 #undef		nanosleep
 #undef		open
+#undef		openat
 #undef		poll
 #undef		pthread_atfork
 #undef		pthread_attr_destroy

Modified: projects/tcp_ffcaia2008_head/lib/libc/nls/C.msg
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libc/nls/C.msg	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libc/nls/C.msg	Fri Oct 30 21:00:58 2009	(r198701)
@@ -181,6 +181,16 @@ $ ENOATTR
 87 Attribute not found
 $ EDOOFUS
 88 Programming error
+$ EBADMSG
+89 Bad message
+$ EMULTIHOP
+90 Multihop attempted
+$ ENOLINK
+91 Link has been severed
+$ EPROTO
+92 Protocol error
+$ ENOTCAPABLE
+93 Capabilities insufficient
 $
 $ strsignal() support catalog
 $

Modified: projects/tcp_ffcaia2008_head/lib/libc/sys/Makefile.inc
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libc/sys/Makefile.inc	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libc/sys/Makefile.inc	Fri Oct 30 21:00:58 2009	(r198701)
@@ -83,7 +83,8 @@ MAN+=	abort2.2 accept.2 access.2 acct.2 
 	mq_setattr.2 \
 	msgctl.2 msgget.2 msgrcv.2 msgsnd.2 \
 	msync.2 munmap.2 nanosleep.2 nfssvc.2 ntp_adjtime.2 open.2 \
-	pathconf.2 pipe.2 poll.2 posix_openpt.2 profil.2 ptrace.2 quotactl.2 \
+	pathconf.2 pipe.2 poll.2 posix_openpt.2 profil.2 \
+	pselect.2 ptrace.2 quotactl.2 \
 	read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \
 	rtprio.2
 .if !defined(NO_P1003_1B)

Modified: projects/tcp_ffcaia2008_head/lib/libc/sys/Symbol.map
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libc/sys/Symbol.map	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libc/sys/Symbol.map	Fri Oct 30 21:00:58 2009	(r198701)
@@ -211,6 +211,7 @@ FBSD_1.0 {
 	posix_openpt;
 	preadv;
 	profil;
+	pselect;
 	ptrace;
 	pwritev;
 	quotactl;
@@ -769,6 +770,8 @@ FBSDprivate_1.0 {
 	__sys_olio_listio;
 	_open;
 	__sys_open;
+	_openat;
+	__sys_openat;
 	_pathconf;
 	__sys_pathconf;
 	_pipe;
@@ -779,6 +782,8 @@ FBSDprivate_1.0 {
 	__sys_preadv;
 	_profil;
 	__sys_profil;
+	_pselect;
+	__sys_pselect;
 	_ptrace;
 	__sys_ptrace;
 	_pwritev;

Copied: projects/tcp_ffcaia2008_head/lib/libc/sys/pselect.2 (from r198700, head/lib/libc/sys/pselect.2)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/tcp_ffcaia2008_head/lib/libc/sys/pselect.2	Fri Oct 30 21:00:58 2009	(r198701, copy of r198700, head/lib/libc/sys/pselect.2)
@@ -0,0 +1,122 @@
+.\"
+.\" Copyright 2002 Massachusetts Institute of Technology
+.\"
+.\" Permission to use, copy, modify, and distribute this software and
+.\" its documentation for any purpose and without fee is hereby
+.\" granted, provided that both the above copyright notice and this
+.\" permission notice appear in all copies, that both the above
+.\" copyright notice and this permission notice appear in all
+.\" supporting documentation, and that the name of M.I.T. not be used
+.\" in advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.  M.I.T. makes
+.\" no representations about the suitability of this software for any
+.\" purpose.  It is provided "as is" without express or implied
+.\" warranty.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
+.\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
+.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
+.\" SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd October 27, 2009
+.Dt PSELECT 2
+.Os
+.Sh NAME
+.Nm pselect
+.Nd synchronous I/O multiplexing a la POSIX.1g
+.Sh LIBRARY
+.Lb libc
+.Sh SYNOPSIS
+.In sys/select.h
+.Ft int
+.Fo pselect
+.Fa "int nfds"
+.Fa "fd_set * restrict readfds"
+.Fa "fd_set * restrict writefds"
+.Fa "fd_set * restrict exceptfds"
+.Fa "const struct timespec * restrict timeout"
+.Fa "const sigset_t * restrict newsigmask"
+.Fc
+.Sh DESCRIPTION
+The
+.Fn pselect
+function was introduced by
+.St -p1003.1g-2000
+as a slightly stronger version of
+.Xr select 2 .
+The
+.Fa nfds , readfds , writefds ,
+and
+.Fa exceptfds
+arguments are all identical to the analogous arguments of
+.Fn select .
+The
+.Fa timeout
+argument in
+.Fn pselect
+points to a
+.Vt "const struct timespec"
+rather than the (modifiable)
+.Vt "struct timeval"
+used by
+.Fn select ;
+as in
+.Fn select ,
+a null pointer may be passed to indicate that
+.Fn pselect
+should wait indefinitely.
+Finally,
+.Fa newsigmask
+specifies a signal mask which is set while waiting for input.
+When
+.Fn pselect
+returns, the original signal mask is restored.
+.Pp
+See
+.Xr select 2
+for a more detailed discussion of the semantics of this interface, and
+for macros used to manipulate the
+.Vt "fd_set"
+data type.
+.Sh RETURN VALUES
+The
+.Fn pselect
+function returns the same values and under the same conditions as
+.Fn select .
+.Sh ERRORS
+The
+.Fn pselect
+function may fail for any of the reasons documented for
+.Xr select 2
+and (if a signal mask is provided)
+.Xr sigprocmask 2 .
+.Sh SEE ALSO
+.Xr kqueue 2 ,
+.Xr poll 2 ,
+.Xr select 2 ,
+.Xr sigprocmask 2
+.Sh STANDARDS
+The
+.Fn pselect
+function conforms to
+.St -p1003.1-2001 .
+.Sh HISTORY
+The
+.Fn pselect
+function first appeared in
+.Fx 5.0 .
+.Sh AUTHORS
+The first implementation of
+.Fn pselect
+function and this manual page were written by
+.An Garrett Wollman Aq wollman at FreeBSD.org .

Modified: projects/tcp_ffcaia2008_head/lib/libfetch/common.c
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libfetch/common.c	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libfetch/common.c	Fri Oct 30 21:00:58 2009	(r198701)
@@ -772,7 +772,7 @@ fetch_no_proxy_match(const char *host)
 				break;
 
 		d_len = q - p;
-		if (d_len > 0 && h_len > d_len &&
+		if (d_len > 0 && h_len >= d_len &&
 		    strncasecmp(host + h_len - d_len,
 			p, d_len) == 0) {
 			/* domain name matches */

Modified: projects/tcp_ffcaia2008_head/lib/libpmc/libpmc.c
==============================================================================
--- projects/tcp_ffcaia2008_head/lib/libpmc/libpmc.c	Fri Oct 30 20:28:49 2009	(r198700)
+++ projects/tcp_ffcaia2008_head/lib/libpmc/libpmc.c	Fri Oct 30 21:00:58 2009	(r198701)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
