svn commit: r200486 - in projects/jbuild: . bin/date bin/sh contrib/bind9 contrib/bind9/bin/named contrib/bind9/lib/dns contrib/bind9/lib/dns/include/dns contrib/bind9/lib/isc/ia64/include/isc cont...

Sun Dec 13 23:27:10 UTC 2009

Author: rodrigc
Date: Sun Dec 13 23:27:08 2009
New Revision: 200486
URL: http://svn.freebsd.org/changeset/base/200486

Log:
  MFTOT

Added:
  projects/jbuild/include/termios.h
     - copied unchanged from r200485, head/include/termios.h
  projects/jbuild/lib/csu/i386-elf/crt1_c.c
     - copied unchanged from r200485, head/lib/csu/i386-elf/crt1_c.c
  projects/jbuild/lib/csu/i386-elf/crt1_s.S
     - copied unchanged from r200485, head/lib/csu/i386-elf/crt1_s.S
  projects/jbuild/lib/libc/gen/_once_stub.c
     - copied unchanged from r200485, head/lib/libc/gen/_once_stub.c
  projects/jbuild/lib/libulog/
     - copied from r200485, head/lib/libulog/
  projects/jbuild/libexec/ulog-helper/
     - copied from r200485, head/libexec/ulog-helper/
  projects/jbuild/share/man/man4/ada.4
     - copied unchanged from r200485, head/share/man/man4/ada.4
  projects/jbuild/share/man/man4/amdsbwd.4
     - copied unchanged from r200485, head/share/man/man4/amdsbwd.4
  projects/jbuild/share/man/man4/man4.powerpc/adb.4
     - copied unchanged from r200485, head/share/man/man4/man4.powerpc/adb.4
  projects/jbuild/share/man/man4/man4.powerpc/akbd.4
     - copied unchanged from r200485, head/share/man/man4/man4.powerpc/akbd.4
  projects/jbuild/share/man/man4/man4.powerpc/ams.4
     - copied unchanged from r200485, head/share/man/man4/man4.powerpc/ams.4
  projects/jbuild/share/man/man4/man4.powerpc/cuda.4
     - copied unchanged from r200485, head/share/man/man4/man4.powerpc/cuda.4
  projects/jbuild/sys/boot/common/md.c
     - copied unchanged from r200485, head/sys/boot/common/md.c
  projects/jbuild/sys/boot/i386/libi386/spinconsole.c
     - copied unchanged from r200485, head/sys/boot/i386/libi386/spinconsole.c
  projects/jbuild/sys/boot/i386/zfsloader/
     - copied from r200485, head/sys/boot/i386/zfsloader/
  projects/jbuild/sys/compat/linux/linux_videodev.h
     - copied unchanged from r200485, head/sys/compat/linux/linux_videodev.h
  projects/jbuild/sys/compat/linux/linux_videodev_compat.h
     - copied unchanged from r200485, head/sys/compat/linux/linux_videodev_compat.h
  projects/jbuild/sys/dev/amdsbwd/
     - copied from r200485, head/sys/dev/amdsbwd/
  projects/jbuild/sys/modules/amdsbwd/
     - copied from r200485, head/sys/modules/amdsbwd/
  projects/jbuild/sys/sys/_termios.h
     - copied unchanged from r200485, head/sys/sys/_termios.h
  projects/jbuild/tools/regression/bin/sh/builtins/cd2.0
     - copied unchanged from r200485, head/tools/regression/bin/sh/builtins/cd2.0
  projects/jbuild/tools/regression/bin/sh/builtins/fc1.0
     - copied unchanged from r200485, head/tools/regression/bin/sh/builtins/fc1.0
  projects/jbuild/tools/regression/bin/sh/builtins/trap3.0
     - copied unchanged from r200485, head/tools/regression/bin/sh/builtins/trap3.0
  projects/jbuild/tools/regression/bin/sh/execution/redir1.0
     - copied unchanged from r200485, head/tools/regression/bin/sh/execution/redir1.0
  projects/jbuild/tools/regression/bin/sh/execution/redir2.0
     - copied unchanged from r200485, head/tools/regression/bin/sh/execution/redir2.0
  projects/jbuild/tools/regression/bpf/bpf_filter/tests/test0084.h
     - copied unchanged from r200485, head/tools/regression/bpf/bpf_filter/tests/test0084.h
  projects/jbuild/tools/regression/kqueue/
     - copied from r200485, head/tools/regression/kqueue/
  projects/jbuild/tools/regression/usr.bin/comm/
     - copied from r200485, head/tools/regression/usr.bin/comm/
  projects/jbuild/tools/tools/nanobsd/pcengines/
     - copied from r200485, head/tools/tools/nanobsd/pcengines/
Deleted:
  projects/jbuild/etc/rc.d/ip6fw
  projects/jbuild/etc/rc.firewall6
  projects/jbuild/lib/csu/i386-elf/crt1.c
  projects/jbuild/sys/dev/ata/ata-usb.c
  projects/jbuild/sys/modules/ata/atausb/
  projects/jbuild/usr.sbin/ndp/gnuc.h
Modified:
  projects/jbuild/MAINTAINERS
  projects/jbuild/Makefile.inc1
  projects/jbuild/ObsoleteFiles.inc
  projects/jbuild/UPDATING
  projects/jbuild/bin/date/Makefile
  projects/jbuild/bin/date/date.c
  projects/jbuild/bin/sh/cd.c
  projects/jbuild/bin/sh/error.c
  projects/jbuild/bin/sh/error.h
  projects/jbuild/bin/sh/eval.c
  projects/jbuild/bin/sh/histedit.c
  projects/jbuild/bin/sh/input.c
  projects/jbuild/bin/sh/input.h
  projects/jbuild/bin/sh/jobs.c
  projects/jbuild/bin/sh/main.c
  projects/jbuild/bin/sh/output.c
  projects/jbuild/bin/sh/output.h
  projects/jbuild/bin/sh/parser.c
  projects/jbuild/bin/sh/redir.c
  projects/jbuild/bin/sh/trap.c
  projects/jbuild/bin/sh/var.c
  projects/jbuild/contrib/bind9/CHANGES
  projects/jbuild/contrib/bind9/bin/named/query.c
  projects/jbuild/contrib/bind9/lib/dns/api
  projects/jbuild/contrib/bind9/lib/dns/include/dns/types.h
  projects/jbuild/contrib/bind9/lib/dns/masterdump.c
  projects/jbuild/contrib/bind9/lib/dns/rbtdb.c
  projects/jbuild/contrib/bind9/lib/dns/resolver.c
  projects/jbuild/contrib/bind9/lib/dns/validator.c
  projects/jbuild/contrib/bind9/lib/isc/ia64/include/isc/atomic.h
  projects/jbuild/contrib/bind9/version
  projects/jbuild/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt
  projects/jbuild/contrib/bsnmp/snmp_mibII/mibII.c
  projects/jbuild/contrib/bsnmp/snmp_mibII/mibII.h
  projects/jbuild/contrib/bsnmp/snmp_mibII/mibII_begemot.c
  projects/jbuild/contrib/bsnmp/snmp_mibII/mibII_tree.def
  projects/jbuild/contrib/expat/lib/xmlparse.c
  projects/jbuild/contrib/expat/lib/xmltok_impl.c
  projects/jbuild/contrib/gcc/config/freebsd-spec.h
  projects/jbuild/contrib/groff/tmac/doc-syms
  projects/jbuild/contrib/ipfilter/man/ipf.8
  projects/jbuild/contrib/netcat/FREEBSD-vendor
  projects/jbuild/contrib/ntp/ntpd/ntp_io.c
  projects/jbuild/contrib/telnet/telnet/externs.h
  projects/jbuild/crypto/openssh/sshd.c
  projects/jbuild/crypto/openssl/ssl/s3_lib.c
  projects/jbuild/crypto/openssl/ssl/s3_pkt.c
  projects/jbuild/crypto/openssl/ssl/s3_srvr.c
  projects/jbuild/etc/Makefile
  projects/jbuild/etc/defaults/rc.conf
  projects/jbuild/etc/mtree/BSD.usr.dist
  projects/jbuild/etc/mtree/BSD.var.dist
  projects/jbuild/etc/namedb/named.root
  projects/jbuild/etc/rc.d/Makefile
  projects/jbuild/etc/rc.d/ipfw
  projects/jbuild/etc/rc.d/named
  projects/jbuild/etc/rc.firewall
  projects/jbuild/etc/termcap.small
  projects/jbuild/games/factor/factor.c
  projects/jbuild/include/Makefile
  projects/jbuild/include/signal.h
  projects/jbuild/lib/Makefile
  projects/jbuild/lib/bind/config.h
  projects/jbuild/lib/csu/amd64/Makefile
  projects/jbuild/lib/csu/arm/Makefile
  projects/jbuild/lib/csu/i386-elf/Makefile
  projects/jbuild/lib/csu/ia64/Makefile
  projects/jbuild/lib/csu/mips/Makefile
  projects/jbuild/lib/csu/powerpc/Makefile
  projects/jbuild/lib/csu/sparc64/Makefile
  projects/jbuild/lib/libarchive/archive_read_support_format_cpio.c
  projects/jbuild/lib/libc/compat-43/Makefile.inc
  projects/jbuild/lib/libc/compat-43/Symbol.map
  projects/jbuild/lib/libc/compat-43/sigcompat.c
  projects/jbuild/lib/libc/compat-43/sigpause.2
  projects/jbuild/lib/libc/gen/Makefile.inc
  projects/jbuild/lib/libc/gen/exec.c
  projects/jbuild/lib/libc/gen/fdevname.c
  projects/jbuild/lib/libc/gen/fts.3
  projects/jbuild/lib/libc/gen/fts.c
  projects/jbuild/lib/libc/gen/getcap.c
  projects/jbuild/lib/libc/gen/getlogin.c
  projects/jbuild/lib/libc/gen/getttyent.c
  projects/jbuild/lib/libc/gen/getusershell.c
  projects/jbuild/lib/libc/gen/nlist.c
  projects/jbuild/lib/libc/gen/pause.c
  projects/jbuild/lib/libc/gen/pwcache.c
  projects/jbuild/lib/libc/gen/raise.c
  projects/jbuild/lib/libc/gen/sem_init.3
  projects/jbuild/lib/libc/gen/sleep.c
  projects/jbuild/lib/libc/gen/termios.c
  projects/jbuild/lib/libc/gen/timezone.c
  projects/jbuild/lib/libc/gen/usleep.c
  projects/jbuild/lib/libc/gen/wordexp.c
  projects/jbuild/lib/libc/gmon/gmon.c
  projects/jbuild/lib/libc/include/libc_private.h
  projects/jbuild/lib/libc/net/sctp_send.3
  projects/jbuild/lib/libc/net/sctp_sendmsg.3
  projects/jbuild/lib/libc/nls/es_ES.ISO8859-1.msg
  projects/jbuild/lib/libc/posix1e/acl_to_text.c
  projects/jbuild/lib/libc/rpc/clnt_raw.c
  projects/jbuild/lib/libc/rpc/getnetconfig.c
  projects/jbuild/lib/libc/rpc/getrpcent.c
  projects/jbuild/lib/libc/rpc/key_call.c
  projects/jbuild/lib/libc/rpc/svc.c
  projects/jbuild/lib/libc/rpc/svc_raw.c
  projects/jbuild/lib/libc/stdio/fgetws.c
  projects/jbuild/lib/libc/stdio/findfp.c
  projects/jbuild/lib/libc/stdio/funopen.c
  projects/jbuild/lib/libc/stdio/fvwrite.c
  projects/jbuild/lib/libc/stdio/printf.3
  projects/jbuild/lib/libc/stdio/vfwprintf.c
  projects/jbuild/lib/libc/stdio/xprintf_time.c
  projects/jbuild/lib/libc/stdlib/getenv.3
  projects/jbuild/lib/libc/stdlib/getenv.c
  projects/jbuild/lib/libc/stdlib/malloc.c
  projects/jbuild/lib/libc/stdlib/system.c
  projects/jbuild/lib/libc/stdtime/localtime.c
  projects/jbuild/lib/libc/string/strcat.3
  projects/jbuild/lib/libc/string/strcmp.3
  projects/jbuild/lib/libc/sys/__error.c
  projects/jbuild/lib/libc/sys/setpgid.2
  projects/jbuild/lib/libc/yp/yplib.c
  projects/jbuild/lib/libexpat/libbsdxml.3
  projects/jbuild/lib/libfetch/ftp.c
  projects/jbuild/lib/libkvm/kvm_proc.c
  projects/jbuild/lib/libpam/modules/pam_lastlog/Makefile
  projects/jbuild/lib/libpam/modules/pam_lastlog/pam_lastlog.c
  projects/jbuild/lib/libtacplus/libtacplus.3
  projects/jbuild/lib/libtacplus/taclib.c
  projects/jbuild/lib/libtacplus/taclib.h
  projects/jbuild/lib/libtacplus/taclib_private.h
  projects/jbuild/lib/libusb/libusb10.c
  projects/jbuild/lib/libusb/libusb10.h
  projects/jbuild/lib/libusb/libusb20.3
  projects/jbuild/lib/libusb/libusb20.c
  projects/jbuild/lib/libusb/libusb20.h
  projects/jbuild/lib/libutil/gr_util.c
  projects/jbuild/lib/libutil/libutil.h
  projects/jbuild/lib/libutil/pw_util.c
  projects/jbuild/libexec/Makefile
  projects/jbuild/libexec/rtld-elf/rtld.c
  projects/jbuild/libexec/rtld-elf/rtld.h
  projects/jbuild/release/i386/fixit_crunch.conf
  projects/jbuild/release/pc98/fixit-small_crunch.conf
  projects/jbuild/release/pc98/fixit_crunch.conf
  projects/jbuild/release/picobsd/bridge/PICOBSD
  projects/jbuild/release/picobsd/bridge/crunch.conf
  projects/jbuild/release/picobsd/build/picobsd
  projects/jbuild/rescue/rescue/Makefile
  projects/jbuild/sbin/atacontrol/atacontrol.c
  projects/jbuild/sbin/camcontrol/camcontrol.8
  projects/jbuild/sbin/camcontrol/camcontrol.c
  projects/jbuild/sbin/fsck/fsck.c
  projects/jbuild/sbin/geom/class/mirror/geom_mirror.c
  projects/jbuild/sbin/geom/class/mirror/gmirror.8
  projects/jbuild/sbin/ifconfig/ifconfig.c
  projects/jbuild/sbin/init/Makefile
  projects/jbuild/sbin/init/init.c
  projects/jbuild/sbin/ipfw/dummynet.c
  projects/jbuild/sbin/ipfw/ipfw2.c
  projects/jbuild/sbin/mount_cd9660/mount_cd9660.c
  projects/jbuild/sbin/reboot/Makefile
  projects/jbuild/sbin/reboot/reboot.c
  projects/jbuild/share/examples/Makefile
  projects/jbuild/share/man/man4/Makefile
  projects/jbuild/share/man/man4/ata.4
  projects/jbuild/share/man/man4/ipsec.4
  projects/jbuild/share/man/man4/iwnfw.4
  projects/jbuild/share/man/man4/man4.powerpc/Makefile
  projects/jbuild/share/man/man4/man4.powerpc/pmu.4
  projects/jbuild/share/man/man4/mfi.4
  projects/jbuild/share/man/man4/sctp.4
  projects/jbuild/share/man/man9/VOP_OPENCLOSE.9
  projects/jbuild/share/man/man9/ifnet.9
  projects/jbuild/share/man/man9/sleep.9
  projects/jbuild/share/man/man9/sleepqueue.9
  projects/jbuild/share/misc/bsd-family-tree
  projects/jbuild/share/misc/committers-src.dot
  projects/jbuild/share/mk/bsd.libnames.mk
  projects/jbuild/share/mk/bsd.subdir.mk
  projects/jbuild/share/termcap/termcap.src
  projects/jbuild/sys/amd64/acpica/acpi_switch.S
  projects/jbuild/sys/amd64/amd64/bpf_jit_machdep.c
  projects/jbuild/sys/amd64/amd64/bpf_jit_machdep.h
  projects/jbuild/sys/amd64/amd64/identcpu.c
  projects/jbuild/sys/amd64/amd64/mca.c
  projects/jbuild/sys/amd64/amd64/trap.c
  projects/jbuild/sys/amd64/amd64/vm_machdep.c
  projects/jbuild/sys/amd64/conf/NOTES
  projects/jbuild/sys/amd64/ia32/ia32_syscall.c
  projects/jbuild/sys/amd64/include/mca.h
  projects/jbuild/sys/amd64/include/specialreg.h
  projects/jbuild/sys/arm/arm/trap.c
  projects/jbuild/sys/arm/at91/if_ate.c
  projects/jbuild/sys/arm/conf/AVILA
  projects/jbuild/sys/arm/conf/CAMBRIA
  projects/jbuild/sys/arm/mv/mv_sata.c
  projects/jbuild/sys/boot/Makefile
  projects/jbuild/sys/boot/common/Makefile.inc
  projects/jbuild/sys/boot/forth/loader.conf.5
  projects/jbuild/sys/boot/i386/Makefile
  projects/jbuild/sys/boot/i386/gptboot/gptboot.c
  projects/jbuild/sys/boot/i386/libi386/Makefile
  projects/jbuild/sys/boot/i386/libi386/biosacpi.c
  projects/jbuild/sys/boot/i386/libi386/biosmem.c
  projects/jbuild/sys/boot/i386/libi386/elf32_freebsd.c
  projects/jbuild/sys/boot/i386/libi386/elf64_freebsd.c
  projects/jbuild/sys/boot/i386/libi386/libi386.h
  projects/jbuild/sys/boot/i386/libi386/vidconsole.c
  projects/jbuild/sys/boot/i386/loader/Makefile
  projects/jbuild/sys/boot/i386/loader/conf.c
  projects/jbuild/sys/boot/i386/loader/main.c
  projects/jbuild/sys/boot/i386/zfsboot/zfsboot.c
  projects/jbuild/sys/boot/i386/zfsboot/zfsldr.S
  projects/jbuild/sys/boot/pc98/boot2/Makefile
  projects/jbuild/sys/boot/pc98/boot2/bios.S
  projects/jbuild/sys/boot/pc98/boot2/boot.c
  projects/jbuild/sys/boot/pc98/boot2/boot.h
  projects/jbuild/sys/boot/pc98/boot2/disk.c
  projects/jbuild/sys/boot/pc98/boot2/io.c
  projects/jbuild/sys/boot/pc98/boot2/serial_16550.S
  projects/jbuild/sys/boot/pc98/boot2/sys.c
  projects/jbuild/sys/boot/pc98/btx/btx/btx.S
  projects/jbuild/sys/boot/pc98/libpc98/biosmem.c
  projects/jbuild/sys/boot/pc98/loader/main.c
  projects/jbuild/sys/boot/uboot/common/metadata.c
  projects/jbuild/sys/boot/zfs/zfsimpl.c
  projects/jbuild/sys/cam/ata/ata_all.c
  projects/jbuild/sys/cam/ata/ata_all.h
  projects/jbuild/sys/cam/ata/ata_da.c
  projects/jbuild/sys/cam/ata/ata_pmp.c
  projects/jbuild/sys/cam/ata/ata_xpt.c
  projects/jbuild/sys/cam/cam_ccb.h
  projects/jbuild/sys/cam/cam_periph.h
  projects/jbuild/sys/cam/cam_xpt.c
  projects/jbuild/sys/cam/scsi/scsi_cd.c
  projects/jbuild/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/jbuild/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/jbuild/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/jbuild/sys/compat/freebsd32/freebsd32_proto.h
  projects/jbuild/sys/compat/freebsd32/freebsd32_syscall.h
  projects/jbuild/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/jbuild/sys/compat/freebsd32/freebsd32_sysent.c
  projects/jbuild/sys/compat/freebsd32/syscalls.master
  projects/jbuild/sys/compat/linux/linux_ioctl.c
  projects/jbuild/sys/compat/linux/linux_ioctl.h
  projects/jbuild/sys/compat/svr4/svr4_termios.c
  projects/jbuild/sys/conf/NOTES
  projects/jbuild/sys/conf/files
  projects/jbuild/sys/conf/files.amd64
  projects/jbuild/sys/conf/files.i386
  projects/jbuild/sys/conf/options
  projects/jbuild/sys/dev/aac/aac.c
  projects/jbuild/sys/dev/aac/aac_cam.c
  projects/jbuild/sys/dev/aac/aacvar.h
  projects/jbuild/sys/dev/adb/adb.h
  projects/jbuild/sys/dev/adb/adb_bus.c
  projects/jbuild/sys/dev/adb/adb_mouse.c
  projects/jbuild/sys/dev/ahci/ahci.c
  projects/jbuild/sys/dev/ahci/ahci.h
  projects/jbuild/sys/dev/an/if_an.c
  projects/jbuild/sys/dev/an/if_an_isa.c
  projects/jbuild/sys/dev/an/if_an_pccard.c
  projects/jbuild/sys/dev/an/if_an_pci.c
  projects/jbuild/sys/dev/an/if_anreg.h
  projects/jbuild/sys/dev/ata/ata-all.c
  projects/jbuild/sys/dev/ata/ata-all.h
  projects/jbuild/sys/dev/ata/ata-disk.c
  projects/jbuild/sys/dev/ata/ata-dma.c
  projects/jbuild/sys/dev/ata/ata-lowlevel.c
  projects/jbuild/sys/dev/ata/ata-pci.c
  projects/jbuild/sys/dev/ata/ata-pci.h
  projects/jbuild/sys/dev/ata/ata-queue.c
  projects/jbuild/sys/dev/ata/ata-sata.c
  projects/jbuild/sys/dev/ata/ata_if.m
  projects/jbuild/sys/dev/ata/atapi-cd.c
  projects/jbuild/sys/dev/ata/atapi-cd.h
  projects/jbuild/sys/dev/ata/atapi-fd.c
  projects/jbuild/sys/dev/ata/atapi-tape.c
  projects/jbuild/sys/dev/ata/chipsets/ata-acard.c
  projects/jbuild/sys/dev/ata/chipsets/ata-acerlabs.c
  projects/jbuild/sys/dev/ata/chipsets/ata-ahci.c
  projects/jbuild/sys/dev/ata/chipsets/ata-amd.c
  projects/jbuild/sys/dev/ata/chipsets/ata-ati.c
  projects/jbuild/sys/dev/ata/chipsets/ata-cenatek.c
  projects/jbuild/sys/dev/ata/chipsets/ata-cypress.c
  projects/jbuild/sys/dev/ata/chipsets/ata-cyrix.c
  projects/jbuild/sys/dev/ata/chipsets/ata-highpoint.c
  projects/jbuild/sys/dev/ata/chipsets/ata-intel.c
  projects/jbuild/sys/dev/ata/chipsets/ata-ite.c
  projects/jbuild/sys/dev/ata/chipsets/ata-jmicron.c
  projects/jbuild/sys/dev/ata/chipsets/ata-marvell.c
  projects/jbuild/sys/dev/ata/chipsets/ata-micron.c
  projects/jbuild/sys/dev/ata/chipsets/ata-national.c
  projects/jbuild/sys/dev/ata/chipsets/ata-netcell.c
  projects/jbuild/sys/dev/ata/chipsets/ata-nvidia.c
  projects/jbuild/sys/dev/ata/chipsets/ata-promise.c
  projects/jbuild/sys/dev/ata/chipsets/ata-serverworks.c
  projects/jbuild/sys/dev/ata/chipsets/ata-siliconimage.c
  projects/jbuild/sys/dev/ata/chipsets/ata-sis.c
  projects/jbuild/sys/dev/ata/chipsets/ata-via.c
  projects/jbuild/sys/dev/ath/ath_hal/ah_regdomain.c
  projects/jbuild/sys/dev/bge/if_bge.c
  projects/jbuild/sys/dev/bge/if_bgereg.h
  projects/jbuild/sys/dev/cm/smc90cx6.c
  projects/jbuild/sys/dev/cm/smc90cx6var.h
  projects/jbuild/sys/dev/cxgb/common/cxgb_common.h
  projects/jbuild/sys/dev/cxgb/cxgb_t3fw.h
  projects/jbuild/sys/dev/cxgb/ulp/tom/cxgb_vm.c
  projects/jbuild/sys/dev/e1000/LICENSE
  projects/jbuild/sys/dev/e1000/e1000_80003es2lan.c
  projects/jbuild/sys/dev/e1000/e1000_80003es2lan.h
  projects/jbuild/sys/dev/e1000/e1000_82541.c
  projects/jbuild/sys/dev/e1000/e1000_82571.c
  projects/jbuild/sys/dev/e1000/e1000_82575.c
  projects/jbuild/sys/dev/e1000/e1000_82575.h
  projects/jbuild/sys/dev/e1000/e1000_api.c
  projects/jbuild/sys/dev/e1000/e1000_defines.h
  projects/jbuild/sys/dev/e1000/e1000_hw.h
  projects/jbuild/sys/dev/e1000/e1000_ich8lan.c
  projects/jbuild/sys/dev/e1000/e1000_ich8lan.h
  projects/jbuild/sys/dev/e1000/e1000_mac.c
  projects/jbuild/sys/dev/e1000/e1000_manage.c
  projects/jbuild/sys/dev/e1000/e1000_osdep.h
  projects/jbuild/sys/dev/e1000/e1000_phy.c
  projects/jbuild/sys/dev/e1000/e1000_phy.h
  projects/jbuild/sys/dev/e1000/e1000_regs.h
  projects/jbuild/sys/dev/e1000/if_em.c
  projects/jbuild/sys/dev/e1000/if_em.h
  projects/jbuild/sys/dev/e1000/if_igb.c
  projects/jbuild/sys/dev/e1000/if_igb.h
  projects/jbuild/sys/dev/ep/if_ep.c
  projects/jbuild/sys/dev/ep/if_epvar.h
  projects/jbuild/sys/dev/et/if_et.c
  projects/jbuild/sys/dev/et/if_etreg.h
  projects/jbuild/sys/dev/et/if_etvar.h
  projects/jbuild/sys/dev/fatm/if_fatm.c
  projects/jbuild/sys/dev/fatm/if_fatmvar.h
  projects/jbuild/sys/dev/fe/if_fe_pccard.c
  projects/jbuild/sys/dev/hatm/if_hatm.c
  projects/jbuild/sys/dev/hwpmc/hwpmc_logging.c
  projects/jbuild/sys/dev/hwpmc/hwpmc_mod.c
  projects/jbuild/sys/dev/hwpmc/hwpmc_x86.c
  projects/jbuild/sys/dev/ichsmb/ichsmb_pci.c
  projects/jbuild/sys/dev/if_ndis/if_ndis.c
  projects/jbuild/sys/dev/iir/iir_ctrl.c
  projects/jbuild/sys/dev/isp/isp_freebsd.c
  projects/jbuild/sys/dev/isp/isp_freebsd.h
  projects/jbuild/sys/dev/ixgb/if_ixgb.c
  projects/jbuild/sys/dev/ixgb/if_ixgb.h
  projects/jbuild/sys/dev/ixgbe/ixgbe.c
  projects/jbuild/sys/dev/ixgbe/ixgbe.h
  projects/jbuild/sys/dev/ixgbe/ixgbe_82598.c
  projects/jbuild/sys/dev/ixgbe/ixgbe_82599.c
  projects/jbuild/sys/dev/ixgbe/ixgbe_api.c
  projects/jbuild/sys/dev/ixgbe/ixgbe_api.h
  projects/jbuild/sys/dev/ixgbe/ixgbe_common.c
  projects/jbuild/sys/dev/ixgbe/ixgbe_common.h
  projects/jbuild/sys/dev/ixgbe/ixgbe_osdep.h
  projects/jbuild/sys/dev/ixgbe/ixgbe_phy.c
  projects/jbuild/sys/dev/ixgbe/ixgbe_phy.h
  projects/jbuild/sys/dev/ixgbe/ixgbe_type.h
  projects/jbuild/sys/dev/lge/if_lge.c
  projects/jbuild/sys/dev/lge/if_lgereg.h
  projects/jbuild/sys/dev/lmc/if_lmc.c
  projects/jbuild/sys/dev/lmc/if_lmc.h
  projects/jbuild/sys/dev/malo/if_malo.c
  projects/jbuild/sys/dev/malo/if_malo.h
  projects/jbuild/sys/dev/mwl/if_mwl.c
  projects/jbuild/sys/dev/mwl/if_mwlvar.h
  projects/jbuild/sys/dev/my/if_my.c
  projects/jbuild/sys/dev/my/if_myreg.h
  projects/jbuild/sys/dev/nve/if_nve.c
  projects/jbuild/sys/dev/nve/if_nvereg.h
  projects/jbuild/sys/dev/nxge/if_nxge.c
  projects/jbuild/sys/dev/pci/pci.c
  projects/jbuild/sys/dev/pci/pci_pci.c
  projects/jbuild/sys/dev/pcn/if_pcn.c
  projects/jbuild/sys/dev/pcn/if_pcnreg.h
  projects/jbuild/sys/dev/pdq/if_fea.c
  projects/jbuild/sys/dev/pdq/if_fpa.c
  projects/jbuild/sys/dev/pdq/pdq_freebsd.h
  projects/jbuild/sys/dev/pdq/pdq_ifsubr.c
  projects/jbuild/sys/dev/puc/puc.c
  projects/jbuild/sys/dev/puc/pucdata.c
  projects/jbuild/sys/dev/re/if_re.c
  projects/jbuild/sys/dev/siis/siis.c
  projects/jbuild/sys/dev/siis/siis.h
  projects/jbuild/sys/dev/sn/if_sn.c
  projects/jbuild/sys/dev/sn/if_snvar.h
  projects/jbuild/sys/dev/sound/pci/hda/hdac.c
  projects/jbuild/sys/dev/sound/usb/uaudio.c
  projects/jbuild/sys/dev/ste/if_ste.c
  projects/jbuild/sys/dev/ste/if_stereg.h
  projects/jbuild/sys/dev/syscons/sysmouse.c
  projects/jbuild/sys/dev/ti/if_ti.c
  projects/jbuild/sys/dev/ti/if_tireg.h
  projects/jbuild/sys/dev/tl/if_tl.c
  projects/jbuild/sys/dev/tl/if_tlreg.h
  projects/jbuild/sys/dev/tsec/if_tsec.c
  projects/jbuild/sys/dev/uart/uart_bus_pci.c
  projects/jbuild/sys/dev/uart/uart_core.c
  projects/jbuild/sys/dev/uart/uart_tty.c
  projects/jbuild/sys/dev/usb/controller/at91dci.c
  projects/jbuild/sys/dev/usb/controller/atmegadci.c
  projects/jbuild/sys/dev/usb/controller/avr32dci.c
  projects/jbuild/sys/dev/usb/controller/ehci.c
  projects/jbuild/sys/dev/usb/controller/ehci_pci.c
  projects/jbuild/sys/dev/usb/controller/musb_otg.c
  projects/jbuild/sys/dev/usb/controller/musb_otg.h
  projects/jbuild/sys/dev/usb/controller/ohci.c
  projects/jbuild/sys/dev/usb/controller/uhci.c
  projects/jbuild/sys/dev/usb/controller/uhci_pci.c
  projects/jbuild/sys/dev/usb/controller/uhcireg.h
  projects/jbuild/sys/dev/usb/controller/usb_controller.c
  projects/jbuild/sys/dev/usb/controller/uss820dci.c
  projects/jbuild/sys/dev/usb/input/atp.c
  projects/jbuild/sys/dev/usb/input/uhid.c
  projects/jbuild/sys/dev/usb/input/ukbd.c
  projects/jbuild/sys/dev/usb/net/if_aue.c
  projects/jbuild/sys/dev/usb/net/if_axe.c
  projects/jbuild/sys/dev/usb/net/if_cdce.c
  projects/jbuild/sys/dev/usb/net/if_cue.c
  projects/jbuild/sys/dev/usb/net/if_kue.c
  projects/jbuild/sys/dev/usb/net/if_rue.c
  projects/jbuild/sys/dev/usb/net/if_udav.c
  projects/jbuild/sys/dev/usb/quirk/usb_quirk.c
  projects/jbuild/sys/dev/usb/quirk/usb_quirk.h
  projects/jbuild/sys/dev/usb/serial/u3g.c
  projects/jbuild/sys/dev/usb/serial/uark.c
  projects/jbuild/sys/dev/usb/serial/ubser.c
  projects/jbuild/sys/dev/usb/serial/ucycom.c
  projects/jbuild/sys/dev/usb/serial/ufoma.c
  projects/jbuild/sys/dev/usb/serial/uftdi.c
  projects/jbuild/sys/dev/usb/serial/ugensa.c
  projects/jbuild/sys/dev/usb/serial/umct.c
  projects/jbuild/sys/dev/usb/serial/umodem.c
  projects/jbuild/sys/dev/usb/serial/uplcom.c
  projects/jbuild/sys/dev/usb/serial/usb_serial.h
  projects/jbuild/sys/dev/usb/storage/umass.c
  projects/jbuild/sys/dev/usb/template/usb_template.c
  projects/jbuild/sys/dev/usb/usb_busdma.c
  projects/jbuild/sys/dev/usb/usb_core.h
  projects/jbuild/sys/dev/usb/usb_debug.c
  projects/jbuild/sys/dev/usb/usb_debug.h
  projects/jbuild/sys/dev/usb/usb_dev.c
  projects/jbuild/sys/dev/usb/usb_device.c
  projects/jbuild/sys/dev/usb/usb_generic.c
  projects/jbuild/sys/dev/usb/usb_hid.c
  projects/jbuild/sys/dev/usb/usb_hub.c
  projects/jbuild/sys/dev/usb/usb_hub.h
  projects/jbuild/sys/dev/usb/usb_msctest.c
  projects/jbuild/sys/dev/usb/usb_process.c
  projects/jbuild/sys/dev/usb/usb_request.c
  projects/jbuild/sys/dev/usb/usb_transfer.c
  projects/jbuild/sys/dev/usb/usbdevs
  projects/jbuild/sys/dev/usb/usbdi.h
  projects/jbuild/sys/dev/usb/wlan/if_upgt.c
  projects/jbuild/sys/dev/vge/if_vge.c
  projects/jbuild/sys/dev/vge/if_vgevar.h
  projects/jbuild/sys/dev/vx/if_vx.c
  projects/jbuild/sys/dev/vx/if_vxvar.h
  projects/jbuild/sys/dev/wb/if_wb.c
  projects/jbuild/sys/dev/wb/if_wbreg.h
  projects/jbuild/sys/dev/wl/if_wl.c
  projects/jbuild/sys/dev/xen/blkfront/blkfront.c
  projects/jbuild/sys/dev/xen/blkfront/block.h
  projects/jbuild/sys/dev/xen/console/console.c
  projects/jbuild/sys/dev/xen/netfront/netfront.c
  projects/jbuild/sys/fs/nfs/nfs_commonacl.c
  projects/jbuild/sys/fs/nfs/nfs_commonport.c
  projects/jbuild/sys/fs/nfs/nfs_commonsubs.c
  projects/jbuild/sys/fs/nfs/nfs_var.h
  projects/jbuild/sys/fs/nfs/nfsport.h
  projects/jbuild/sys/fs/nfsclient/nfs_clrpcops.c
  projects/jbuild/sys/fs/nfsclient/nfs_clvnops.c
  projects/jbuild/sys/fs/nfsserver/nfs_nfsdcache.c
  projects/jbuild/sys/fs/nfsserver/nfs_nfsdport.c
  projects/jbuild/sys/fs/nfsserver/nfs_nfsdserv.c
  projects/jbuild/sys/fs/ntfs/ntfs.h
  projects/jbuild/sys/fs/ntfs/ntfs_subr.c
  projects/jbuild/sys/fs/ntfs/ntfs_vfsops.c
  projects/jbuild/sys/fs/portalfs/portal_vnops.c
  projects/jbuild/sys/geom/label/g_label.c
  projects/jbuild/sys/geom/label/g_label.h
  projects/jbuild/sys/geom/label/g_label_ext2fs.c
  projects/jbuild/sys/geom/label/g_label_gpt.c
  projects/jbuild/sys/geom/label/g_label_iso9660.c
  projects/jbuild/sys/geom/label/g_label_msdosfs.c
  projects/jbuild/sys/geom/label/g_label_ntfs.c
  projects/jbuild/sys/geom/label/g_label_reiserfs.c
  projects/jbuild/sys/geom/label/g_label_ufs.c
  projects/jbuild/sys/geom/mirror/g_mirror.c
  projects/jbuild/sys/geom/mirror/g_mirror.h
  projects/jbuild/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
  projects/jbuild/sys/i386/conf/NOTES
  projects/jbuild/sys/i386/i386/bpf_jit_machdep.c
  projects/jbuild/sys/i386/i386/bpf_jit_machdep.h
  projects/jbuild/sys/i386/i386/identcpu.c
  projects/jbuild/sys/i386/i386/machdep.c
  projects/jbuild/sys/i386/i386/mca.c
  projects/jbuild/sys/i386/i386/minidump_machdep.c
  projects/jbuild/sys/i386/i386/trap.c
  projects/jbuild/sys/i386/include/mca.h
  projects/jbuild/sys/i386/include/specialreg.h
  projects/jbuild/sys/i386/xen/exception.s
  projects/jbuild/sys/i386/xen/pmap.c
  projects/jbuild/sys/ia64/ia64/clock.c
  projects/jbuild/sys/ia64/ia64/db_machdep.c
  projects/jbuild/sys/ia64/ia64/exception.S
  projects/jbuild/sys/ia64/ia64/genassym.c
  projects/jbuild/sys/ia64/ia64/interrupt.c
  projects/jbuild/sys/ia64/ia64/machdep.c
  projects/jbuild/sys/ia64/ia64/mp_machdep.c
  projects/jbuild/sys/ia64/ia64/pmap.c
  projects/jbuild/sys/ia64/ia64/trap.c
  projects/jbuild/sys/ia64/include/bus.h
  projects/jbuild/sys/ia64/include/cpufunc.h
  projects/jbuild/sys/ia64/include/ia64_cpu.h
  projects/jbuild/sys/ia64/include/kdb.h
  projects/jbuild/sys/ia64/include/param.h
  projects/jbuild/sys/ia64/include/pcpu.h
  projects/jbuild/sys/ia64/include/pmap.h
  projects/jbuild/sys/kern/kern_descrip.c
  projects/jbuild/sys/kern/kern_jail.c
  projects/jbuild/sys/kern/kern_lock.c
  projects/jbuild/sys/kern/kern_sig.c
  projects/jbuild/sys/kern/kern_sx.c
  projects/jbuild/sys/kern/sched_ule.c
  projects/jbuild/sys/kern/subr_bus.c
  projects/jbuild/sys/kern/subr_sleepqueue.c
  projects/jbuild/sys/kern/sys_process.c
  projects/jbuild/sys/kern/tty.c
  projects/jbuild/sys/kern/vfs_acl.c
  projects/jbuild/sys/kern/vfs_subr.c
  projects/jbuild/sys/kern/vfs_syscalls.c
  projects/jbuild/sys/kern/vfs_vnops.c
  projects/jbuild/sys/mips/adm5120/if_admsw.c
  projects/jbuild/sys/mips/adm5120/if_admswvar.h
  projects/jbuild/sys/mips/mips/trap.c
  projects/jbuild/sys/modules/Makefile
  projects/jbuild/sys/net/bpf_jitter.c
  projects/jbuild/sys/net/bpf_jitter.h
  projects/jbuild/sys/net/if.c
  projects/jbuild/sys/net/if_dead.c
  projects/jbuild/sys/net/if_var.h
  projects/jbuild/sys/net/radix.c
  projects/jbuild/sys/net/rtsock.c
  projects/jbuild/sys/net80211/ieee80211_hostap.c
  projects/jbuild/sys/netinet/in.h
  projects/jbuild/sys/netinet/in_mcast.c
  projects/jbuild/sys/netinet/ip_carp.c
  projects/jbuild/sys/netinet/ip_fw.h
  projects/jbuild/sys/netinet/ipfw/ip_dummynet.c
  projects/jbuild/sys/netinet/ipfw/ip_fw2.c
  projects/jbuild/sys/netinet/raw_ip.c
  projects/jbuild/sys/netinet/sctp_constants.h
  projects/jbuild/sys/netinet6/in6_mcast.c
  projects/jbuild/sys/netinet6/raw_ip6.c
  projects/jbuild/sys/netipsec/ipcomp_var.h
  projects/jbuild/sys/netipsec/ipsec_mbuf.c
  projects/jbuild/sys/netipsec/xform_ipcomp.c
  projects/jbuild/sys/nfsclient/bootp_subr.c
  projects/jbuild/sys/nfsclient/krpc_subr.c
  projects/jbuild/sys/nfsclient/nfs_vfsops.c
  projects/jbuild/sys/nfsclient/nfs_vnops.c
  projects/jbuild/sys/nfsserver/nfs_serv.c
  projects/jbuild/sys/opencrypto/crypto.c
  projects/jbuild/sys/opencrypto/cryptosoft.c
  projects/jbuild/sys/opencrypto/deflate.c
  projects/jbuild/sys/opencrypto/deflate.h
  projects/jbuild/sys/pc98/conf/NOTES
  projects/jbuild/sys/powerpc/aim/machdep.c
  projects/jbuild/sys/powerpc/aim/ofw_machdep.c
  projects/jbuild/sys/powerpc/aim/trap.c
  projects/jbuild/sys/powerpc/booke/machdep.c
  projects/jbuild/sys/powerpc/booke/trap.c
  projects/jbuild/sys/powerpc/conf/GENERIC
  projects/jbuild/sys/powerpc/include/cpu.h
  projects/jbuild/sys/powerpc/include/md_var.h
  projects/jbuild/sys/powerpc/include/vmparam.h
  projects/jbuild/sys/powerpc/mpc85xx/pci_ocp.c
  projects/jbuild/sys/powerpc/powermac/ata_dbdma.c
  projects/jbuild/sys/powerpc/powermac/ata_kauai.c
  projects/jbuild/sys/powerpc/powermac/ata_macio.c
  projects/jbuild/sys/powerpc/powerpc/cpu.c
  projects/jbuild/sys/powerpc/psim/ata_iobus.c
  projects/jbuild/sys/sparc64/sparc64/stack_machdep.c
  projects/jbuild/sys/sparc64/sparc64/trap.c
  projects/jbuild/sys/sun4v/sun4v/stack_machdep.c
  projects/jbuild/sys/sun4v/sun4v/trap.c
  projects/jbuild/sys/sys/_lockmgr.h
  projects/jbuild/sys/sys/ata.h
  projects/jbuild/sys/sys/bio.h
  projects/jbuild/sys/sys/bus.h
  projects/jbuild/sys/sys/elf_common.h
  projects/jbuild/sys/sys/jail.h
  projects/jbuild/sys/sys/param.h
  projects/jbuild/sys/sys/sdt.h
  projects/jbuild/sys/sys/signal.h
  projects/jbuild/sys/sys/signalvar.h
  projects/jbuild/sys/sys/sleepqueue.h
  projects/jbuild/sys/sys/termios.h
  projects/jbuild/sys/sys/tty.h
  projects/jbuild/sys/vm/uma_int.h
  projects/jbuild/sys/vm/vm.h
  projects/jbuild/sys/vm/vm_extern.h
  projects/jbuild/sys/vm/vm_fault.c
  projects/jbuild/sys/vm/vm_map.c
  projects/jbuild/sys/vm/vm_map.h
  projects/jbuild/tools/regression/bin/sh/builtins/cd1.0
  projects/jbuild/tools/regression/bin/sh/errors/backquote-error1.0
  projects/jbuild/tools/regression/bin/sh/parser/for1.0
  projects/jbuild/tools/regression/bpf/bpf_filter/Makefile
  projects/jbuild/tools/regression/bpf/bpf_filter/bpf_test.c
  projects/jbuild/tools/regression/bpf/bpf_filter/tests/test0075.h
  projects/jbuild/tools/regression/bpf/bpf_filter/tests/test0076.h
  projects/jbuild/tools/regression/bpf/bpf_filter/tests/test0077.h
  projects/jbuild/tools/regression/bpf/bpf_filter/tests/test0078.h
  projects/jbuild/tools/regression/bpf/bpf_filter/tests/test0080.h
  projects/jbuild/tools/regression/environ/Makefile.envctl
  projects/jbuild/tools/regression/environ/envctl.c
  projects/jbuild/tools/regression/environ/envtest.t
  projects/jbuild/tools/regression/usr.bin/Makefile
  projects/jbuild/tools/tools/sysbuild/sysbuild.sh
  projects/jbuild/tools/tools/tinybsd/tinybsd
  projects/jbuild/usr.bin/Makefile
  projects/jbuild/usr.bin/calendar/calendar.c
  projects/jbuild/usr.bin/calendar/calendars/calendar.freebsd
  projects/jbuild/usr.bin/calendar/day.c
  projects/jbuild/usr.bin/calendar/ostern.c
  projects/jbuild/usr.bin/calendar/paskha.c
  projects/jbuild/usr.bin/comm/comm.1
  projects/jbuild/usr.bin/comm/comm.c
  projects/jbuild/usr.bin/gcore/Makefile
  projects/jbuild/usr.bin/gcore/elfcore.c
  projects/jbuild/usr.bin/gcore/gcore.1
  projects/jbuild/usr.bin/gcore/gcore.c
  projects/jbuild/usr.bin/jbuild/Makefile
  projects/jbuild/usr.bin/lastcomm/pathnames.h
  projects/jbuild/usr.bin/ldd/ldd.1
  projects/jbuild/usr.bin/make/arch.c
  projects/jbuild/usr.bin/make/dir.c
  projects/jbuild/usr.bin/make/for.c
  projects/jbuild/usr.bin/make/globals.h
  projects/jbuild/usr.bin/make/lst.c
  projects/jbuild/usr.bin/make/lst.h
  projects/jbuild/usr.bin/make/make.c
  projects/jbuild/usr.bin/make/proc.c
  projects/jbuild/usr.bin/make/str.c
  projects/jbuild/usr.bin/make/targ.c
  projects/jbuild/usr.bin/make/var.c
  projects/jbuild/usr.bin/mktemp/mktemp.c
  projects/jbuild/usr.bin/netstat/if.c
  projects/jbuild/usr.bin/netstat/ipsec.c
  projects/jbuild/usr.bin/netstat/main.c
  projects/jbuild/usr.bin/netstat/netstat.1
  projects/jbuild/usr.bin/netstat/netstat.h
  projects/jbuild/usr.bin/perror/perror.c
  projects/jbuild/usr.bin/pr/egetopt.c
  projects/jbuild/usr.bin/systat/Makefile
  projects/jbuild/usr.bin/systat/vmstat.c
  projects/jbuild/usr.bin/talk/ctl_transact.c
  projects/jbuild/usr.bin/talk/display.c
  projects/jbuild/usr.bin/talk/get_addrs.c
  projects/jbuild/usr.bin/talk/get_iface.c
  projects/jbuild/usr.bin/talk/get_names.c
  projects/jbuild/usr.bin/talk/invite.c
  projects/jbuild/usr.bin/talk/look_up.c
  projects/jbuild/usr.bin/talk/talk.c
  projects/jbuild/usr.bin/talk/talk.h
  projects/jbuild/usr.bin/tset/extern.h
  projects/jbuild/usr.bin/tset/map.c
  projects/jbuild/usr.bin/tset/misc.c
  projects/jbuild/usr.bin/tset/set.c
  projects/jbuild/usr.bin/tset/term.c
  projects/jbuild/usr.bin/tset/tset.c
  projects/jbuild/usr.bin/tset/wrterm.c
  projects/jbuild/usr.bin/unifdef/unifdef.1
  projects/jbuild/usr.bin/unifdef/unifdef.c
  projects/jbuild/usr.bin/unifdef/unifdefall.sh
  projects/jbuild/usr.bin/users/Makefile
  projects/jbuild/usr.bin/users/users.c
  projects/jbuild/usr.bin/vis/foldit.c
  projects/jbuild/usr.bin/w/Makefile
  projects/jbuild/usr.bin/w/w.c
  projects/jbuild/usr.bin/wall/Makefile
  projects/jbuild/usr.bin/wall/wall.c
  projects/jbuild/usr.bin/who/Makefile
  projects/jbuild/usr.bin/who/who.c
  projects/jbuild/usr.bin/write/Makefile
  projects/jbuild/usr.bin/write/write.c
  projects/jbuild/usr.bin/xinstall/xinstall.c
  projects/jbuild/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
  projects/jbuild/usr.sbin/cron/cron/cron.c
  projects/jbuild/usr.sbin/freebsd-update/freebsd-update.sh
  projects/jbuild/usr.sbin/inetd/inetd.c
  projects/jbuild/usr.sbin/jail/jail.8
  projects/jbuild/usr.sbin/jls/jls.c
  projects/jbuild/usr.sbin/lastlogin/Makefile
  projects/jbuild/usr.sbin/lastlogin/lastlogin.c
  projects/jbuild/usr.sbin/mergemaster/mergemaster.sh
  projects/jbuild/usr.sbin/mountd/exports.5
  projects/jbuild/usr.sbin/nfsd/nfsv4.4
  projects/jbuild/usr.sbin/nfsd/stablerestart.5
  projects/jbuild/usr.sbin/pw/pw_user.c
  projects/jbuild/usr.sbin/repquota/repquota.c
  projects/jbuild/usr.sbin/sysinstall/user.c
  projects/jbuild/usr.sbin/syslogd/syslogd.c
  projects/jbuild/usr.sbin/ypserv/yp_main.c
  projects/jbuild/usr.sbin/ypserv/yp_server.c
  projects/jbuild/usr.sbin/ypserv/ypserv.8
Directory Properties:
  projects/jbuild/   (props changed)
  projects/jbuild/cddl/contrib/opensolaris/   (props changed)
  projects/jbuild/contrib/bind9/   (props changed)
  projects/jbuild/contrib/cpio/   (props changed)
  projects/jbuild/contrib/ee/   (props changed)
  projects/jbuild/contrib/expat/   (props changed)
  projects/jbuild/contrib/gdb/   (props changed)
  projects/jbuild/contrib/gdtoa/   (props changed)
  projects/jbuild/contrib/less/   (props changed)
  projects/jbuild/contrib/libpcap/   (props changed)
  projects/jbuild/contrib/ncurses/   (props changed)
  projects/jbuild/contrib/netcat/   (props changed)
  projects/jbuild/contrib/ntp/   (props changed)
  projects/jbuild/contrib/openbsm/   (props changed)
  projects/jbuild/contrib/openpam/   (props changed)
  projects/jbuild/contrib/pf/   (props changed)
  projects/jbuild/contrib/sendmail/   (props changed)
  projects/jbuild/contrib/tcpdump/   (props changed)
  projects/jbuild/contrib/tcsh/   (props changed)
  projects/jbuild/contrib/top/   (props changed)
  projects/jbuild/contrib/wpa/   (props changed)
  projects/jbuild/crypto/openssh/   (props changed)
  projects/jbuild/crypto/openssl/   (props changed)
  projects/jbuild/lib/libc/   (props changed)
  projects/jbuild/lib/libc/stdtime/   (props changed)
  projects/jbuild/lib/libusb/libusb.3   (props changed)
  projects/jbuild/lib/libutil/   (props changed)
  projects/jbuild/sbin/ipfw/   (props changed)
  projects/jbuild/share/zoneinfo/   (props changed)
  projects/jbuild/sys/   (props changed)
  projects/jbuild/sys/amd64/include/xen/   (props changed)
  projects/jbuild/sys/cddl/contrib/opensolaris/   (props changed)
  projects/jbuild/sys/contrib/dev/acpica/   (props changed)
  projects/jbuild/sys/contrib/pf/   (props changed)
  projects/jbuild/sys/dev/xen/xenpci/   (props changed)
  projects/jbuild/usr.bin/procstat/   (props changed)
  projects/jbuild/usr.sbin/zic/   (props changed)

Modified: projects/jbuild/MAINTAINERS
==============================================================================

--- projects/jbuild/MAINTAINERS	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/MAINTAINERS	Sun Dec 13 23:27:08 2009	(r200486)
@@ -124,6 +124,8 @@ usr.bin/bluetooth	emax	Pre-commit review
 usr.sbin/bluetooth	emax	Pre-commit review preferred.
 gnu/usr.bin/send-pr	bugmaster	Pre-commit review requested.
 ncurses		rafan	Heads-up appreciated, try not to break it.
+*env(3)		secteam	Due to the problematic security history of this
+			code, please have patches reviewed by secteam.
 
 Following are the entries from the Makefiles, and a few other sources.
 Please remove stale entries from both their origin, and this file.

Modified: projects/jbuild/Makefile.inc1
==============================================================================
--- projects/jbuild/Makefile.inc1	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/Makefile.inc1	Sun Dec 13 23:27:08 2009	(r200486)
@@ -1103,8 +1103,8 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
-		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
-		${_lib_libypclnt} lib/libz lib/msun \
+		lib/libradius lib/libsbuf lib/libtacplus lib/libulog \
+		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
 		${_secure_lib_libssl} lib/libdwarf lib/libproc
 

Modified: projects/jbuild/ObsoleteFiles.inc
==============================================================================
--- projects/jbuild/ObsoleteFiles.inc	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/ObsoleteFiles.inc	Sun Dec 13 23:27:08 2009	(r200486)
@@ -14,8 +14,14 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20091202: unify rc.firewall and rc.firewall6.
+OLD_FILES+=etc/rc.d/ip6fw
+OLD_FILES+=etc/rc.firewall6
+OLD_FILES+=usr/share/examples/etc/rc.firewall6
 # 20091117: removal of rc.early(8) link
 OLD_FILES+=usr/share/man/man8/rc.early.8.gz
+# 20091117: usr/share/zoneinfo/GMT link removed
+OLD_FILES+=usr/share/zoneinfo/GMT
 # 20091027: pselect.3 implemented as syscall
 OLD_FILES+=usr/share/man/man3/pselect.3.gz
 # 20091005: fusword.9 and susword.9 removed

Modified: projects/jbuild/UPDATING
==============================================================================
--- projects/jbuild/UPDATING	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/UPDATING	Sun Dec 13 23:27:08 2009	(r200486)
@@ -42,6 +42,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
 	Applications that require wireless scan results (e.g. ifconfig(8))
 	from net80211 need to be recompiled.
 
+	Applications such as wpa_supplicant(8) may require a full world
+	build without using NO_CLEAN in order to get synchronized with the
+	new structure.
+
 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"

Modified: projects/jbuild/bin/date/Makefile
==============================================================================
--- projects/jbuild/bin/date/Makefile	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/date/Makefile	Sun Dec 13 23:27:08 2009	(r200486)
@@ -3,7 +3,7 @@
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
+DPADD=	${LIBULOG}
+LDADD=	-lulog
 
 .include <bsd.prog.mk>

Modified: projects/jbuild/bin/date/date.c
==============================================================================
--- projects/jbuild/bin/date/date.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/date/date.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -48,11 +48,12 @@ __FBSDID("$FreeBSD$");
 #include <ctype.h>
 #include <err.h>
 #include <locale.h>
-#include <libutil.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
+#define	_ULOG_POSIX_NAMES
+#include <ulog.h>
 #include <unistd.h>
 
 #include "extern.h"
@@ -181,6 +182,7 @@ main(int argc, char *argv[])
 static void
 setthetime(const char *fmt, const char *p, int jflag, int nflag)
 {
+	struct utmpx utx;
 	struct tm *lt;
 	struct timeval tv;
 	const char *dot, *t;
@@ -271,12 +273,16 @@ setthetime(const char *fmt, const char *
 	if (!jflag) {
 		/* set the time */
 		if (nflag || netsettime(tval)) {
-			logwtmp("|", "date", "");
+			utx.ut_type = OLD_TIME;
+			gettimeofday(&utx.ut_tv, NULL);
+			pututxline(&utx);
 			tv.tv_sec = tval;
 			tv.tv_usec = 0;
 			if (settimeofday(&tv, (struct timezone *)NULL))
 				err(1, "settimeofday (timeval)");
-			logwtmp("{", "date", "");
+			utx.ut_type = NEW_TIME;
+			gettimeofday(&utx.ut_tv, NULL);
+			pututxline(&utx);
 		}
 
 		if ((p = getlogin()) == NULL)

Modified: projects/jbuild/bin/sh/cd.c
==============================================================================
--- projects/jbuild/bin/sh/cd.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/cd.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -70,7 +70,7 @@ STATIC int docd(char *, int, int);
 STATIC char *getcomponent(void);
 STATIC char *findcwd(char *);
 STATIC void updatepwd(char *);
-STATIC char *getpwd2(char *, size_t);
+STATIC char *getpwd2(void);
 
 STATIC char *curdir = NULL;	/* current working directory */
 STATIC char *prevdir;		/* previous working directory */
@@ -263,10 +263,8 @@ findcwd(char *dir)
 	 * any more because we traversed a symbolic link or something
 	 * we couldn't stat().
 	 */
-	if (dir == NULL || curdir == NULL)  {
-		p = stalloc(PATH_MAX);
-		return getpwd2(p, PATH_MAX);
-	}
+	if (dir == NULL || curdir == NULL)
+		return getpwd2();
 	cdcomppath = stalloc(strlen(dir) + 1);
 	scopy(dir, cdcomppath);
 	STARTSTACKSTR(new);
@@ -313,7 +311,7 @@ updatepwd(char *dir)
 int
 pwdcmd(int argc, char **argv)
 {
-	char buf[PATH_MAX];
+	char *p;
 	int ch, phys;
 
 	optreset = 1; optind = 1; opterr = 0; /* initialize getopt */
@@ -341,9 +339,9 @@ pwdcmd(int argc, char **argv)
 		out1str(curdir);
 		out1c('\n');
 	} else {
-		if (getcwd(buf, sizeof(buf)) == NULL)
+		if ((p = getpwd2()) == NULL)
 			error(".: %s", strerror(errno));
-		out1str(buf);
+		out1str(p);
 		out1c('\n');
 	}
 
@@ -356,36 +354,45 @@ pwdcmd(int argc, char **argv)
 char *
 getpwd(void)
 {
-	char buf[PATH_MAX];
 	char *p;
 
 	if (curdir)
 		return curdir;
 
-	p = getpwd2(buf, sizeof(buf));
+	p = getpwd2();
 	if (p != NULL)
 		curdir = savestr(p);
 
 	return curdir;
 }
 
+#define MAXPWD 256
+
 /*
  * Return the current directory.
  */
 STATIC char *
-getpwd2(char *buf, size_t size)
+getpwd2(void)
 {
-	if (getcwd(buf, size) == NULL) {
-		char *pwd = getenv("PWD");
-		struct stat stdot, stpwd;
-
-		if (pwd && *pwd == '/' && stat(".", &stdot) != -1 &&
-		    stat(pwd, &stpwd) != -1 &&
-		    stdot.st_dev == stpwd.st_dev &&
-		    stdot.st_ino == stpwd.st_ino) {
+	struct stat stdot, stpwd;
+	char *pwd;
+	int i;
+
+	for (i = MAXPWD;; i *= 2) {
+		pwd = stalloc(i);
+		if (getcwd(pwd, i) != NULL)
 			return pwd;
-		}
-		return NULL;
+		stunalloc(pwd);
+		if (errno != ERANGE)
+			break;
+	}
+
+	pwd = getenv("PWD");
+	if (pwd && *pwd == '/' && stat(".", &stdot) != -1 &&
+	    stat(pwd, &stpwd) != -1 &&
+	    stdot.st_dev == stpwd.st_dev &&
+	    stdot.st_ino == stpwd.st_ino) {
+		return pwd;
 	}
-	return buf;
+	return NULL;
 }

Modified: projects/jbuild/bin/sh/error.c
==============================================================================
--- projects/jbuild/bin/sh/error.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/error.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -73,11 +73,15 @@ static void exverror(int, const char *, 
  * Called to raise an exception.  Since C doesn't include exceptions, we
  * just do a longjmp to the exception handler.  The type of exception is
  * stored in the global variable "exception".
+ *
+ * Interrupts are disabled; they should be reenabled when the exception is
+ * caught.
  */
 
 void
 exraise(int e)
 {
+	INTOFF;
 	if (handler == NULL)
 		abort();
 	exception = e;
@@ -138,8 +142,15 @@ onint(void)
 static void
 exverror(int cond, const char *msg, va_list ap)
 {
-	CLEAR_PENDING_INT;
-	INTOFF;
+	/*
+	 * An interrupt trumps an error.  Certain places catch error
+	 * exceptions or transform them to a plain nonzero exit code
+	 * in child processes, and if an error exception can be handled,
+	 * an interrupt can be handled as well.
+	 *
+	 * exraise() will disable interrupts for the exception handler.
+	 */
+	FORCEINTON;
 
 #ifdef DEBUG
 	if (msg)

Modified: projects/jbuild/bin/sh/error.h
==============================================================================
--- projects/jbuild/bin/sh/error.h	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/error.h	Sun Dec 13 23:27:08 2009	(r200486)
@@ -72,6 +72,8 @@ extern volatile sig_atomic_t intpending;
 
 #define INTOFF suppressint++
 #define INTON { if (--suppressint == 0 && intpending) onint(); }
+#define is_int_on() suppressint
+#define SETINTON(s) suppressint = (s)
 #define FORCEINTON {suppressint = 0; if (intpending) onint();}
 #define CLEAR_PENDING_INT intpending = 0
 #define int_pending() intpending

Modified: projects/jbuild/bin/sh/eval.c
==============================================================================
--- projects/jbuild/bin/sh/eval.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/eval.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -593,6 +593,7 @@ evalcommand(union node *cmd, int flags, 
 	char *savecmdname;
 	struct shparam saveparam;
 	struct localvar *savelocalvars;
+	struct parsefile *savetopfile;
 	volatile int e;
 	char *lastarg;
 	int realstatus;
@@ -781,7 +782,6 @@ evalcommand(union node *cmd, int flags, 
 		savelocalvars = localvars;
 		localvars = NULL;
 		reffunc(cmdentry.u.func);
-		INTON;
 		savehandler = handler;
 		if (setjmp(jmploc.loc)) {
 			if (exception == EXSHELLPROC)
@@ -797,6 +797,7 @@ evalcommand(union node *cmd, int flags, 
 			longjmp(handler->loc, 1);
 		}
 		handler = &jmploc;
+		INTON;
 		for (sp = varlist.list ; sp ; sp = sp->next)
 			mklocal(sp->text);
 		funcnest++;
@@ -833,6 +834,7 @@ evalcommand(union node *cmd, int flags, 
 			mode |= REDIR_BACKQ;
 		}
 		savecmdname = commandname;
+		savetopfile = getcurrentfile();
 		cmdenviron = varlist.list;
 		e = -1;
 		savehandler = handler;
@@ -867,6 +869,7 @@ cmddone:
 			if ((e != EXERROR && e != EXEXEC)
 			    || cmdentry.special)
 				exraise(e);
+			popfilesupto(savetopfile);
 			FORCEINTON;
 		}
 		if (cmdentry.u.index != EXECCMD)
@@ -880,7 +883,6 @@ cmddone:
 #ifdef DEBUG
 		trputs("normal command:  ");  trargs(argv);
 #endif
-		clearredir();
 		redirect(cmd->ncmd.redirect, 0);
 		for (sp = varlist.list ; sp ; sp = sp->next)
 			setvareq(sp->text, VEXPORT|VSTACK);

Modified: projects/jbuild/bin/sh/histedit.c
==============================================================================
--- projects/jbuild/bin/sh/histedit.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/histedit.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -92,7 +92,7 @@ histedit(void)
 			if (hist != NULL)
 				sethistsize(histsizeval());
 			else
-				out2str("sh: can't initialize history\n");
+				out2fmt_flush("sh: can't initialize history\n");
 		}
 		if (editing && !el && isatty(0)) { /* && isatty(2) ??? */
 			/*
@@ -114,7 +114,7 @@ histedit(void)
 				el_set(el, EL_PROMPT, getprompt);
 			} else {
 bad:
-				out2str("sh: can't initialize editing\n");
+				out2fmt_flush("sh: can't initialize editing\n");
 			}
 			INTON;
 		} else if (!editing && el) {
@@ -336,6 +336,7 @@ histcmd(int argc, char **argv)
 			if (sflg) {
 				if (displayhist) {
 					out2str(s);
+					flushout(out2);
 				}
 				evalstring(s, 0);
 				if (displayhist && hist) {

Modified: projects/jbuild/bin/sh/input.c
==============================================================================
--- projects/jbuild/bin/sh/input.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/input.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -215,7 +215,7 @@ retry:
                                 if (flags >= 0 && flags & O_NONBLOCK) {
                                         flags &=~ O_NONBLOCK;
                                         if (fcntl(0, F_SETFL, flags) >= 0) {
-						out2str("sh: turning off NDELAY mode\n");
+						out2fmt_flush("sh: turning off NDELAY mode\n");
                                                 goto retry;
                                         }
                                 }
@@ -359,7 +359,7 @@ pushstring(char *s, int len, void *ap)
 	struct strpush *sp;
 
 	INTOFF;
-/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/
+/*out2fmt_flush("*** calling pushstring: %s, %d\n", s, len);*/
 	if (parsefile->strpush) {
 		sp = ckmalloc(sizeof (struct strpush));
 		sp->prev = parsefile->strpush;
@@ -386,7 +386,7 @@ popstring(void)
 	parsenextc = sp->prevstring;
 	parsenleft = sp->prevnleft;
 	parselleft = sp->prevlleft;
-/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
+/*out2fmt_flush("*** calling popstring: restoring to '%s'\n", parsenextc);*/
 	if (sp->ap)
 		sp->ap->flag &= ~ALIASINUSE;
 	parsefile->strpush = sp->prev;
@@ -509,6 +509,32 @@ popfile(void)
 
 
 /*
+ * Return current file (to go back to it later using popfilesupto()).
+ */
+
+struct parsefile *
+getcurrentfile(void)
+{
+	return parsefile;
+}
+
+
+/*
+ * Pop files until the given file is on top again. Useful for regular
+ * builtins that read shell commands from files or strings.
+ * If the given file is not an active file, an error is raised.
+ */
+
+void
+popfilesupto(struct parsefile *file)
+{
+	while (parsefile != file && parsefile != &basepf)
+		popfile();
+	if (parsefile != file)
+		error("popfilesupto() misused");
+}
+
+/*
  * Return to top level.
  */
 

Modified: projects/jbuild/bin/sh/input.h
==============================================================================
--- projects/jbuild/bin/sh/input.h	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/input.h	Sun Dec 13 23:27:08 2009	(r200486)
@@ -45,6 +45,8 @@ extern int parsenleft;		/* number of cha
 extern char *parsenextc;	/* next character in input buffer */
 extern int init_editline;	/* 0 == not setup, 1 == OK, -1 == failed */
 
+struct parsefile;
+
 char *pfgets(char *, int);
 int pgetc(void);
 int preadbuffer(void);
@@ -56,6 +58,8 @@ void setinputfile(char *, int);
 void setinputfd(int, int);
 void setinputstring(char *, int);
 void popfile(void);
+struct parsefile *getcurrentfile(void);
+void popfilesupto(struct parsefile *);
 void popallfiles(void);
 void closescript(void);
 

Modified: projects/jbuild/bin/sh/jobs.c
==============================================================================
--- projects/jbuild/bin/sh/jobs.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/jobs.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -146,7 +146,7 @@ setjobctl(int on)
 		do { /* while we are in the background */
 			initialpgrp = tcgetpgrp(ttyfd);
 			if (initialpgrp < 0) {
-out:				out2str("sh: can't access tty; job control turned off\n");
+out:				out2fmt_flush("sh: can't access tty; job control turned off\n");
 				mflag = 0;
 				return;
 			}
@@ -1046,7 +1046,7 @@ stoppedjobs(void)
 		if (jp->used == 0)
 			continue;
 		if (jp->state == JOBSTOPPED) {
-			out2str("You have stopped jobs.\n");
+			out2fmt_flush("You have stopped jobs.\n");
 			job_warning = 2;
 			return (1);
 		}

Modified: projects/jbuild/bin/sh/main.c
==============================================================================
--- projects/jbuild/bin/sh/main.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/main.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -154,7 +154,7 @@ main(int argc, char *argv[])
 	setstackmark(&smark);
 	procargs(argc, argv);
 	if (getpwd() == NULL && iflag)
-		out2str("sh: cannot determine working directory\n");
+		out2fmt_flush("sh: cannot determine working directory\n");
 	if (getpwd() != NULL)
 		setvar ("PWD", getpwd(), VEXPORT);
 	if (argv[0] && argv[0][0] == '-') {
@@ -223,7 +223,7 @@ cmdloop(int top)
 			if (!stoppedjobs()) {
 				if (!Iflag)
 					break;
-				out2str("\nUse \"exit\" to leave shell.\n");
+				out2fmt_flush("\nUse \"exit\" to leave shell.\n");
 			}
 			numeof++;
 		} else if (n != NULL && nflag == 0) {

Modified: projects/jbuild/bin/sh/output.c
==============================================================================
--- projects/jbuild/bin/sh/output.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/output.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
 static int doformat_wr(void *, const char *, int);
 
 struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0};
-struct output errout = {NULL, 0, NULL, 100, 2, 0};
+struct output errout = {NULL, 0, NULL, 256, 2, 0};
 struct output memout = {NULL, 0, NULL, 0, MEM_OUT, 0};
 struct output *out1 = &output;
 struct output *out2 = &errout;
@@ -124,8 +124,6 @@ outstr(const char *p, struct output *fil
 {
 	while (*p)
 		outc(*p++, file);
-	if (file == out2)
-		flushout(file);
 }
 
 /* Like outstr(), but quote for re-input into the shell. */
@@ -255,7 +253,7 @@ out1fmt(const char *fmt, ...)
 }
 
 void
-dprintf(const char *fmt, ...)
+out2fmt_flush(const char *fmt, ...)
 {
 	va_list ap;
 

Modified: projects/jbuild/bin/sh/output.h
==============================================================================
--- projects/jbuild/bin/sh/output.h	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/output.h	Sun Dec 13 23:27:08 2009	(r200486)
@@ -65,7 +65,7 @@ void flushout(struct output *);
 void freestdout(void);
 void outfmt(struct output *, const char *, ...) __printflike(2, 3);
 void out1fmt(const char *, ...) __printflike(1, 2);
-void dprintf(const char *, ...) __printflike(1, 2);
+void out2fmt_flush(const char *, ...) __printflike(1, 2);
 void fmtstr(char *, int, const char *, ...) __printflike(3, 4);
 void doformat(struct output *, const char *, va_list) __printflike(2, 0);
 int xwrite(int, char *, int);

Modified: projects/jbuild/bin/sh/parser.c
==============================================================================
--- projects/jbuild/bin/sh/parser.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/parser.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -1312,6 +1312,7 @@ parsebackq: {
 	int saveprompt;
 	const int bq_startlinno = plinno;
 
+	str = NULL;
 	if (setjmp(jmploc.loc)) {
 		if (str)
 			ckfree(str);
@@ -1323,7 +1324,6 @@ parsebackq: {
 		longjmp(handler->loc, 1);
 	}
 	INTOFF;
-	str = NULL;
 	savelen = out - stackblock();
 	if (savelen > 0) {
 		str = ckmalloc(savelen);
@@ -1563,7 +1563,10 @@ setprompt(int which)
 #ifndef NO_HISTORY
 	if (!el)
 #endif
+	{
 		out2str(getprompt(NULL));
+		flushout(out2);
+	}
 }
 
 /*

Modified: projects/jbuild/bin/sh/redir.c
==============================================================================
--- projects/jbuild/bin/sh/redir.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/redir.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
 
 
 #define EMPTY -2		/* marks an unused slot in redirtab */
+#define CLOSED -1		/* fd was not open before redir */
 #define PIPESIZE 4096		/* amount of buffering in a pipe */
 
 
@@ -101,7 +102,6 @@ redirect(union node *redir, int flags)
 	struct redirtab *sv = NULL;
 	int i;
 	int fd;
-	int try;
 	char memory[10];	/* file descriptors to write to memory */
 
 	for (i = 10 ; --i >= 0 ; )
@@ -116,38 +116,30 @@ redirect(union node *redir, int flags)
 	}
 	for (n = redir ; n ; n = n->nfile.next) {
 		fd = n->nfile.fd;
-		try = 0;
 		if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) &&
 		    n->ndup.dupfd == fd)
 			continue; /* redirect from/to same file descriptor */
 
 		if ((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) {
 			INTOFF;
-again:
 			if ((i = fcntl(fd, F_DUPFD, 10)) == -1) {
 				switch (errno) {
 				case EBADF:
-					if (!try) {
-						openredirect(n, memory);
-						try++;
-						goto again;
-					}
-					/* FALLTHROUGH*/
+					i = CLOSED;
+					break;
 				default:
 					INTON;
 					error("%d: %s", fd, strerror(errno));
 					break;
 				}
-			}
-			if (!try) {
-				sv->renamed[fd] = i;
-			}
+			} else
+				(void)fcntl(i, F_SETFD, FD_CLOEXEC);
+			sv->renamed[fd] = i;
 			INTON;
 		}
 		if (fd == 0)
 			fd0_redirected++;
-		if (!try)
-			openredirect(n, memory);
+		openredirect(n, memory);
 	}
 	if (memory[1])
 		out1 = &memout;
@@ -166,8 +158,11 @@ openredirect(union node *redir, char mem
 
 	/*
 	 * We suppress interrupts so that we won't leave open file
-	 * descriptors around.  This may not be such a good idea because
-	 * an open of a device or a fifo can block indefinitely.
+	 * descriptors around.  Because the signal handler remains
+	 * installed and we do not use system call restart, interrupts
+	 * will still abort blocking opens such as fifos (they will fail
+	 * with EINTR). There is, however, a race condition if an interrupt
+	 * arrives after INTOFF and before open blocks.
 	 */
 	INTOFF;
 	memory[fd] = 0;

Modified: projects/jbuild/bin/sh/trap.c
==============================================================================
--- projects/jbuild/bin/sh/trap.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/trap.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -149,6 +149,7 @@ trapcmd(int argc, char **argv)
 {
 	char *action;
 	int signo;
+	int errors = 0;
 
 	if (argc <= 1) {
 		for (signo = 0 ; signo < sys_nsig ; signo++) {
@@ -183,8 +184,10 @@ trapcmd(int argc, char **argv)
 		}
 	}
 	while (*argv) {
-		if ((signo = sigstring_to_signum(*argv)) == -1)
-			error("bad signal %s", *argv);
+		if ((signo = sigstring_to_signum(*argv)) == -1) {
+			out2fmt_flush("trap: bad signal %s\n", *argv);
+			errors = 1;
+		}
 		INTOFF;
 		if (action)
 			action = savestr(action);
@@ -196,7 +199,7 @@ trapcmd(int argc, char **argv)
 		INTON;
 		argv++;
 	}
-	return 0;
+	return errors;
 }
 
 

Modified: projects/jbuild/bin/sh/var.c
==============================================================================
--- projects/jbuild/bin/sh/var.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/bin/sh/var.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -195,7 +195,9 @@ setvarsafe(char *name, char *val, int fl
 	struct jmploc jmploc;
 	struct jmploc *const savehandler = handler;
 	int err = 0;
+	int inton;
 
+	inton = is_int_on();
 	if (setjmp(jmploc.loc))
 		err = 1;
 	else {
@@ -203,6 +205,7 @@ setvarsafe(char *name, char *val, int fl
 		setvar(name, val, flags);
 	}
 	handler = savehandler;
+	SETINTON(inton);
 	return err;
 }
 

Modified: projects/jbuild/contrib/bind9/CHANGES
==============================================================================
--- projects/jbuild/contrib/bind9/CHANGES	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/contrib/bind9/CHANGES	Sun Dec 13 23:27:08 2009	(r200486)
@@ -1,3 +1,9 @@
+	--- 9.6.1-P2 released ---
+
+2772.	[security]	When validating, track whether pending data was from
+			the additional section or not and only return it if
+			validates as secure. [RT #20438]
+
 	--- 9.6.1-P1 released ---
 
 2640.	[security]	A specially crafted update packet will cause named

Modified: projects/jbuild/contrib/bind9/bin/named/query.c
==============================================================================
--- projects/jbuild/contrib/bind9/bin/named/query.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/contrib/bind9/bin/named/query.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.313.20.7 2009/03/13 01:38:51 marka Exp $ */
+/* $Id: query.c,v 1.313.20.7.12.1 2009/11/18 23:58:04 marka Exp $ */
 
 /*! \file */
 
@@ -116,6 +116,8 @@
 #define DNS_GETDB_NOLOG 0x02U
 #define DNS_GETDB_PARTIAL 0x04U
 
+#define PENDINGOK(x)	(((x) & DNS_DBFIND_PENDINGOK) != 0)
+
 typedef struct client_additionalctx {
 	ns_client_t *client;
 	dns_rdataset_t *rdataset;
@@ -1761,8 +1763,8 @@ query_addadditional2(void *arg, dns_name
 	 */
 	if (result == ISC_R_SUCCESS &&
 	    additionaltype == dns_rdatasetadditional_fromcache &&
-	    (rdataset->trust == dns_trust_pending ||
-	     rdataset->trust == dns_trust_glue) &&
+	    (DNS_TRUST_PENDING(rdataset->trust) ||
+	     DNS_TRUST_GLUE(rdataset->trust)) &&
 	    !validate(client, db, fname, rdataset, sigrdataset)) {
 		dns_rdataset_disassociate(rdataset);
 		if (dns_rdataset_isassociated(sigrdataset))
@@ -1801,8 +1803,8 @@ query_addadditional2(void *arg, dns_name
 	 */
 	if (result == ISC_R_SUCCESS &&
 	    additionaltype == dns_rdatasetadditional_fromcache &&
-	    (rdataset->trust == dns_trust_pending ||
-	     rdataset->trust == dns_trust_glue) &&
+	    (DNS_TRUST_PENDING(rdataset->trust) ||
+	     DNS_TRUST_GLUE(rdataset->trust)) &&
 	    !validate(client, db, fname, rdataset, sigrdataset)) {
 		dns_rdataset_disassociate(rdataset);
 		if (dns_rdataset_isassociated(sigrdataset))
@@ -2601,14 +2603,14 @@ query_addbestns(ns_client_t *client) {
 	/*
 	 * Attempt to validate RRsets that are pending or that are glue.
 	 */
-	if ((rdataset->trust == dns_trust_pending ||
-	     (sigrdataset != NULL && sigrdataset->trust == dns_trust_pending))
+	if ((DNS_TRUST_PENDING(rdataset->trust) ||
+	     (sigrdataset != NULL && DNS_TRUST_PENDING(sigrdataset->trust)))
 	    && !validate(client, db, fname, rdataset, sigrdataset) &&
-	    (client->query.dboptions & DNS_DBFIND_PENDINGOK) == 0)
+	    !PENDINGOK(client->query.dboptions))
 		goto cleanup;
 
-	if ((rdataset->trust == dns_trust_glue ||
-	     (sigrdataset != NULL && sigrdataset->trust == dns_trust_glue)) &&
+	if ((DNS_TRUST_GLUE(rdataset->trust) ||
+	     (sigrdataset != NULL && DNS_TRUST_GLUE(sigrdataset->trust))) &&
 	    !validate(client, db, fname, rdataset, sigrdataset) &&
 	    SECURE(client) && WANTDNSSEC(client))
 		goto cleanup;
@@ -3716,6 +3718,8 @@ query_find(ns_client_t *client, dns_fetc
 	dns_rdataset_t *noqname;
 	isc_boolean_t resuming;
 	int line = -1;
+	dns_rdataset_t tmprdataset;
+	unsigned int dboptions;
 
 	CTRACE("query_find");
 
@@ -3933,9 +3937,49 @@ query_find(ns_client_t *client, dns_fetc
 	/*
 	 * Now look for an answer in the database.
 	 */
+	dboptions = client->query.dboptions;
+	if (sigrdataset == NULL && client->view->enablednssec) {
+		/*
+		 * If the client doesn't want DNSSEC we still want to
+		 * look for any data pending validation to save a remote
+		 * lookup if possible.
+		 */
+		dns_rdataset_init(&tmprdataset);
+		sigrdataset = &tmprdataset;
+		dboptions |= DNS_DBFIND_PENDINGOK;
+	}
+ refind:
 	result = dns_db_find(db, client->query.qname, version, type,
-			     client->query.dboptions, client->now,
-			     &node, fname, rdataset, sigrdataset);
+			     dboptions, client->now, &node, fname,
+			     rdataset, sigrdataset);
+	/*
+	 * If we have found pending data try to validate it.
+	 * If the data does not validate as secure and we can't
+	 * use the unvalidated data requery the database with
+	 * pending disabled to prevent infinite looping.
+	 */
+	if (result != ISC_R_SUCCESS || !DNS_TRUST_PENDING(rdataset->trust))
+		goto validation_done;
+	if (validate(client, db, fname, rdataset, sigrdataset))
+		goto validation_done;
+	if (rdataset->trust != dns_trust_pending_answer ||
+	    !PENDINGOK(client->query.dboptions)) {
+		dns_rdataset_disassociate(rdataset);
+		if (sigrdataset != NULL &&
+		    dns_rdataset_isassociated(sigrdataset))
+			dns_rdataset_disassociate(sigrdataset);
+		if (sigrdataset == &tmprdataset)
+			sigrdataset = NULL;
+		dns_db_detachnode(db, &node);
+		dboptions &= ~DNS_DBFIND_PENDINGOK;
+		goto refind;
+	}
+ validation_done:
+	if (sigrdataset == &tmprdataset) {
+		if (dns_rdataset_isassociated(sigrdataset))
+			dns_rdataset_disassociate(sigrdataset);
+		sigrdataset = NULL;
+	}
 
  resume:
 	CTRACE("query_find: resume");

Modified: projects/jbuild/contrib/bind9/lib/dns/api
==============================================================================
--- projects/jbuild/contrib/bind9/lib/dns/api	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/contrib/bind9/lib/dns/api	Sun Dec 13 23:27:08 2009	(r200486)
@@ -1,3 +1,3 @@
-LIBINTERFACE = 52
+LIBINTERFACE = 53
 LIBREVISION = 0
-LIBAGE = 2
+LIBAGE = 0

Modified: projects/jbuild/contrib/bind9/lib/dns/include/dns/types.h
==============================================================================
--- projects/jbuild/contrib/bind9/lib/dns/include/dns/types.h	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/contrib/bind9/lib/dns/include/dns/types.h	Sun Dec 13 23:27:08 2009	(r200486)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.130.50.3 2009/01/29 22:40:35 jinmei Exp $ */
+/* $Id: types.h,v 1.130.50.3.12.1 2009/11/18 23:58:04 marka Exp $ */
 
 #ifndef DNS_TYPES_H
 #define DNS_TYPES_H 1
@@ -258,40 +258,52 @@ enum {
 	dns_trust_none = 0,
 #define dns_trust_none			((dns_trust_t)dns_trust_none)
 
-	/*% Subject to DNSSEC validation but has not yet been validated */
-	dns_trust_pending = 1,
-#define dns_trust_pending		((dns_trust_t)dns_trust_pending)
+	/*%
+	 * Subject to DNSSEC validation but has not yet been validated
+	 * dns_trust_pending_additional (from the additional section).
+	 */
+	dns_trust_pending_additional = 1,
+#define dns_trust_pending_additional \
+		 ((dns_trust_t)dns_trust_pending_additional)
+
+	dns_trust_pending_answer = 2,
+#define dns_trust_pending_answer	((dns_trust_t)dns_trust_pending_answer)
 
 	/*% Received in the additional section of a response. */
-	dns_trust_additional = 2,
+	dns_trust_additional = 3,
 #define dns_trust_additional		((dns_trust_t)dns_trust_additional)
 
 	/* Received in a referral response. */
-	dns_trust_glue = 3,
+	dns_trust_glue = 4,
 #define dns_trust_glue			((dns_trust_t)dns_trust_glue)
 
 	/* Answer from a non-authoritative server */
-	dns_trust_answer = 4,
+	dns_trust_answer = 5,
 #define dns_trust_answer		((dns_trust_t)dns_trust_answer)
 
 	/*  Received in the authority section as part of an
 	    authoritative response */
-	dns_trust_authauthority = 5,
+	dns_trust_authauthority = 6,
 #define dns_trust_authauthority		((dns_trust_t)dns_trust_authauthority)
 
 	/* Answer from an authoritative server */
-	dns_trust_authanswer = 6,
+	dns_trust_authanswer = 7,
 #define dns_trust_authanswer		((dns_trust_t)dns_trust_authanswer)
 
 	/* Successfully DNSSEC validated */
-	dns_trust_secure = 7,
+	dns_trust_secure = 8,
 #define dns_trust_secure		((dns_trust_t)dns_trust_secure)
 
 	/* This server is authoritative */
-	dns_trust_ultimate = 8
+	dns_trust_ultimate = 9
 #define dns_trust_ultimate		((dns_trust_t)dns_trust_ultimate)
 };
 
+#define DNS_TRUST_PENDING(x)		((x) == dns_trust_pending_answer || \
+					 (x) == dns_trust_pending_additional)
+#define DNS_TRUST_GLUE(x)		((x) == dns_trust_glue)
+
+
 /*%
  * Name checking severities.
  */

Modified: projects/jbuild/contrib/bind9/lib/dns/masterdump.c
==============================================================================
--- projects/jbuild/contrib/bind9/lib/dns/masterdump.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/contrib/bind9/lib/dns/masterdump.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.94.50.2 2009/01/18 23:47:40 tbox Exp $ */
+/* $Id: masterdump.c,v 1.94.50.2.12.1 2009/11/18 23:58:04 marka Exp $ */
 
 /*! \file */
 
@@ -775,7 +775,8 @@ dump_order_compare(const void *a, const 
 
 static const char *trustnames[] = {
 	"none",
-	"pending",
+	"pending-additional",
+	"pending-answer",
 	"additional",
 	"glue",
 	"answer",

Modified: projects/jbuild/contrib/bind9/lib/dns/rbtdb.c
==============================================================================
--- projects/jbuild/contrib/bind9/lib/dns/rbtdb.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/contrib/bind9/lib/dns/rbtdb.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.270.12.6 2009/05/06 23:34:30 jinmei Exp $ */
+/* $Id: rbtdb.c,v 1.270.12.6.10.1 2009/11/18 23:58:04 marka Exp $ */
 
 /*! \file */
 
@@ -4005,7 +4005,7 @@ cache_zonecut_callback(dns_rbtnode_t *no
 	}
 
 	if (dname_header != NULL &&
-	    (dname_header->trust != dns_trust_pending ||
+	    (!DNS_TRUST_PENDING(dname_header->trust) ||
 	     (search->options & DNS_DBFIND_PENDINGOK) != 0)) {
 		/*
 		 * We increment the reference count on node to ensure that
@@ -4548,7 +4548,7 @@ cache_find(dns_db_t *db, dns_name_t *nam
 	if (found == NULL ||
 	    (found->trust == dns_trust_glue &&
 	     ((options & DNS_DBFIND_GLUEOK) == 0)) ||
-	    (found->trust == dns_trust_pending &&
+	    (DNS_TRUST_PENDING(found->trust) &&
 	     ((options & DNS_DBFIND_PENDINGOK) == 0))) {
 		/*
 		 * If there is an NS rdataset at this node, then this is the

Modified: projects/jbuild/contrib/bind9/lib/dns/resolver.c
==============================================================================
--- projects/jbuild/contrib/bind9/lib/dns/resolver.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/contrib/bind9/lib/dns/resolver.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.384.14.14 2009/06/02 23:47:13 tbox Exp $ */
+/* $Id: resolver.c,v 1.384.14.14.8.1 2009/11/18 23:58:04 marka Exp $ */
 
 /*! \file */
 
@@ -4293,6 +4293,7 @@ cache_name(fetchctx_t *fctx, dns_name_t 
 		 * for it, unless it is glue.
 		 */
 		if (secure_domain && rdataset->trust != dns_trust_glue) {
+			dns_trust_t trust;
 			/*
 			 * RRSIGs are validated as part of validating the
 			 * type they cover.
@@ -4329,12 +4330,34 @@ cache_name(fetchctx_t *fctx, dns_name_t 
 			}
 
 			/*
+			 * Reject out of bailiwick additional records
+			 * without RRSIGs as they can't possibly validate
+			 * as "secure" and as we will never never want to
+			 * store these as "answers" after validation.
+			 */
+			if (rdataset->trust == dns_trust_additional &&
+			    sigrdataset == NULL && EXTERNAL(rdataset))
+				continue;
+				
+			/*
+                         * XXXMPA: If we store as "answer" after validating
+                         * then we need to do bailiwick processing and
+                         * also need to track whether RRsets are in or
+                         * out of bailiwick.  This will require a another 
+                         * pending trust level.
+                         *
 			 * Cache this rdataset/sigrdataset pair as
-			 * pending data.
+			 * pending data.  Track whether it was additional
+			 * or not.
 			 */
-			rdataset->trust = dns_trust_pending;
+			if (rdataset->trust == dns_trust_additional)
+				trust = dns_trust_pending_additional;
+			else
+				trust = dns_trust_pending_answer;
+
+			rdataset->trust = trust;
 			if (sigrdataset != NULL)
-				sigrdataset->trust = dns_trust_pending;
+				sigrdataset->trust = trust;
 			if (!need_validation || !ANSWER(rdataset)) {
 				addedrdataset = ardataset;
 				result = dns_db_addrdataset(fctx->cache, node,
@@ -4682,7 +4705,7 @@ ncache_message(fetchctx_t *fctx, dns_adb
 			for (trdataset = ISC_LIST_HEAD(tname->list);
 			     trdataset != NULL;
 			     trdataset = ISC_LIST_NEXT(trdataset, link))
-				trdataset->trust = dns_trust_pending;
+				trdataset->trust = dns_trust_pending_answer;
 			result = dns_message_nextname(fctx->rmessage,
 						      DNS_SECTION_AUTHORITY);
 		}

Modified: projects/jbuild/contrib/bind9/lib/dns/validator.c
==============================================================================
--- projects/jbuild/contrib/bind9/lib/dns/validator.c	Sun Dec 13 20:36:42 2009	(r200485)
+++ projects/jbuild/contrib/bind9/lib/dns/validator.c	Sun Dec 13 23:27:08 2009	(r200486)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.164.12.9 2009/05/07 23:47:12 tbox Exp $ */
+/* $Id: validator.c,v 1.164.12.9.8.1 2009/11/18 23:58:04 marka Exp $ */

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