svn commit: r216624 - in projects/sv: . bin/sh bin/sh/bltin cddl/contrib/opensolaris/lib/libzfs/common contrib/bsnmp/lib contrib/bsnmp/snmp_target contrib/bsnmp/snmp_usm contrib/bsnmp/snmp_vacm con...

Attilio Rao attilio at FreeBSD.org
Tue Dec 21 21:29:03 UTC 2010 

Author: attilio
Date: Tue Dec 21 21:29:02 2010
New Revision: 216624
URL: http://svn.freebsd.org/changeset/base/216624

Log:
  MFC

Added:
  projects/sv/contrib/bsnmp/lib/snmpcrypto.c
     - copied unchanged from r216620, head/contrib/bsnmp/lib/snmpcrypto.c
  projects/sv/contrib/bsnmp/lib/tc.def
     - copied unchanged from r216620, head/contrib/bsnmp/lib/tc.def
  projects/sv/contrib/bsnmp/snmp_target/
     - copied from r216620, head/contrib/bsnmp/snmp_target/
  projects/sv/contrib/bsnmp/snmp_usm/
     - copied from r216620, head/contrib/bsnmp/snmp_usm/
  projects/sv/contrib/bsnmp/snmp_vacm/
     - copied from r216620, head/contrib/bsnmp/snmp_vacm/
  projects/sv/share/man/man4/xen.4
     - copied unchanged from r216620, head/share/man/man4/xen.4
  projects/sv/sys/contrib/dev/acpica/events/evxfgpe.c
     - copied unchanged from r216620, head/sys/contrib/dev/acpica/events/evxfgpe.c
  projects/sv/sys/contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu
     - copied unchanged from r216620, head/sys/contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu
  projects/sv/sys/kern/kern_hhook.c
     - copied unchanged from r216620, head/sys/kern/kern_hhook.c
  projects/sv/sys/kern/kern_khelp.c
     - copied unchanged from r216620, head/sys/kern/kern_khelp.c
  projects/sv/sys/mips/mips/uma_machdep.c
     - copied unchanged from r216620, head/sys/mips/mips/uma_machdep.c
  projects/sv/sys/mips/rmi/dev/iic/
     - copied from r216620, head/sys/mips/rmi/dev/iic/
  projects/sv/sys/sys/hhook.h
     - copied unchanged from r216620, head/sys/sys/hhook.h
  projects/sv/sys/sys/khelp.h
     - copied unchanged from r216620, head/sys/sys/khelp.h
  projects/sv/sys/sys/module_khelp.h
     - copied unchanged from r216620, head/sys/sys/module_khelp.h
  projects/sv/sys/x86/include/bus.h
     - copied unchanged from r216620, head/sys/x86/include/bus.h
  projects/sv/sys/x86/x86/busdma_machdep.c
     - copied unchanged from r216620, head/sys/x86/x86/busdma_machdep.c
  projects/sv/sys/x86/x86/tsc.c
     - copied unchanged from r216620, head/sys/x86/x86/tsc.c
  projects/sv/tools/regression/acltools/tools-nfs4-psarc.test
     - copied unchanged from r216620, head/tools/regression/acltools/tools-nfs4-psarc.test
  projects/sv/tools/regression/bin/sh/builtins/printf3.0
     - copied unchanged from r216620, head/tools/regression/bin/sh/builtins/printf3.0
  projects/sv/tools/regression/bin/sh/builtins/printf4.0
     - copied unchanged from r216620, head/tools/regression/bin/sh/builtins/printf4.0
  projects/sv/tools/regression/bin/sh/expansion/arith7.0
     - copied unchanged from r216620, head/tools/regression/bin/sh/expansion/arith7.0
  projects/sv/tools/regression/bin/sh/expansion/arith8.0
     - copied unchanged from r216620, head/tools/regression/bin/sh/expansion/arith8.0
  projects/sv/tools/regression/bin/sh/expansion/cmdsubst3.0
     - copied unchanged from r216620, head/tools/regression/bin/sh/expansion/cmdsubst3.0
  projects/sv/tools/regression/usr.bin/printf/regress.m5.out
     - copied unchanged from r216620, head/tools/regression/usr.bin/printf/regress.m5.out
  projects/sv/usr.sbin/bsnmpd/modules/snmp_target/
     - copied from r216620, head/usr.sbin/bsnmpd/modules/snmp_target/
  projects/sv/usr.sbin/bsnmpd/modules/snmp_usm/
     - copied from r216620, head/usr.sbin/bsnmpd/modules/snmp_usm/
  projects/sv/usr.sbin/bsnmpd/modules/snmp_vacm/
     - copied from r216620, head/usr.sbin/bsnmpd/modules/snmp_vacm/
  projects/sv/usr.sbin/bsnmpd/tools/
     - copied from r216620, head/usr.sbin/bsnmpd/tools/
Deleted:
  projects/sv/sys/amd64/amd64/busdma_machdep.c
  projects/sv/sys/amd64/amd64/tsc.c
  projects/sv/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu
  projects/sv/sys/i386/i386/busdma_machdep.c
  projects/sv/sys/i386/i386/tsc.c
Modified:
  projects/sv/Makefile
  projects/sv/ObsoleteFiles.inc
  projects/sv/UPDATING
  projects/sv/bin/sh/arith_lex.l
  projects/sv/bin/sh/bltin/bltin.h
  projects/sv/bin/sh/expand.c
  projects/sv/bin/sh/jobs.c
  projects/sv/bin/sh/memalloc.c
  projects/sv/bin/sh/memalloc.h
  projects/sv/bin/sh/output.c
  projects/sv/bin/sh/parser.c
  projects/sv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/sv/contrib/bsnmp/lib/asn1.c
  projects/sv/contrib/bsnmp/lib/asn1.h
  projects/sv/contrib/bsnmp/lib/bsnmpclient.3
  projects/sv/contrib/bsnmp/lib/bsnmplib.3
  projects/sv/contrib/bsnmp/lib/snmp.c
  projects/sv/contrib/bsnmp/lib/snmp.h
  projects/sv/contrib/bsnmp/lib/snmpagent.c
  projects/sv/contrib/bsnmp/lib/snmpclient.c
  projects/sv/contrib/bsnmp/lib/snmpclient.h
  projects/sv/contrib/bsnmp/lib/snmppriv.h
  projects/sv/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt
  projects/sv/contrib/bsnmp/snmpd/action.c
  projects/sv/contrib/bsnmp/snmpd/bsnmpd.1
  projects/sv/contrib/bsnmp/snmpd/config.c
  projects/sv/contrib/bsnmp/snmpd/export.c
  projects/sv/contrib/bsnmp/snmpd/main.c
  projects/sv/contrib/bsnmp/snmpd/snmpd.h
  projects/sv/contrib/bsnmp/snmpd/snmpmod.3
  projects/sv/contrib/bsnmp/snmpd/snmpmod.h
  projects/sv/contrib/bsnmp/snmpd/trans_lsock.c
  projects/sv/contrib/bsnmp/snmpd/trans_udp.c
  projects/sv/contrib/bsnmp/snmpd/trap.c
  projects/sv/contrib/bsnmp/snmpd/tree.def
  projects/sv/etc/rc.d/pf
  projects/sv/etc/snmpd.config
  projects/sv/games/factor/factor.c
  projects/sv/include/unistd.h
  projects/sv/lib/csu/amd64/crt1.c
  projects/sv/lib/csu/amd64/crti.S
  projects/sv/lib/csu/amd64/crtn.S
  projects/sv/lib/csu/arm/crt1.c
  projects/sv/lib/csu/arm/crtn.S
  projects/sv/lib/csu/i386-elf/crt1_c.c
  projects/sv/lib/csu/i386-elf/crt1_s.S
  projects/sv/lib/csu/i386-elf/crti.S
  projects/sv/lib/csu/i386-elf/crtn.S
  projects/sv/lib/csu/ia64/Makefile
  projects/sv/lib/csu/ia64/crt1.S
  projects/sv/lib/csu/ia64/crti.S
  projects/sv/lib/csu/ia64/crtn.S
  projects/sv/lib/csu/powerpc/crt1.c
  projects/sv/lib/csu/powerpc/crti.S
  projects/sv/lib/csu/powerpc/crtn.S
  projects/sv/lib/csu/powerpc64/crt1.c
  projects/sv/lib/csu/powerpc64/crti.S
  projects/sv/lib/csu/powerpc64/crtn.S
  projects/sv/lib/csu/sparc64/crt1.c
  projects/sv/lib/csu/sparc64/crti.S
  projects/sv/lib/csu/sparc64/crtn.S
  projects/sv/lib/libbsnmp/libbsnmp/Makefile
  projects/sv/lib/libc/posix1e/acl_is_trivial_np.3
  projects/sv/lib/libc/powerpc64/sys/cerror.S
  projects/sv/lib/libc/powerpc64/sys/ptrace.S
  projects/sv/lib/libc/stdio/freopen.c
  projects/sv/lib/libc/sys/shmat.2
  projects/sv/lib/libc/sys/shmctl.2
  projects/sv/lib/libc/sys/shmget.2
  projects/sv/lib/libipsec/ipsec_dump_policy.c
  projects/sv/lib/libproc/proc_create.c
  projects/sv/lib/libusb/libusb20_compat01.c
  projects/sv/libexec/getty/chat.c
  projects/sv/libexec/getty/main.c
  projects/sv/libexec/rbootd/rbootd.c
  projects/sv/libexec/rlogind/rlogind.c
  projects/sv/libexec/rpc.rwalld/rwalld.c
  projects/sv/libexec/rtld-elf/rtld.c
  projects/sv/release/powerpc/mkisoimages.sh
  projects/sv/sbin/camcontrol/camcontrol.c
  projects/sv/sbin/geom/Makefile.inc
  projects/sv/sbin/geom/class/Makefile.inc
  projects/sv/sbin/geom/class/cache/Makefile
  projects/sv/sbin/geom/class/concat/Makefile
  projects/sv/sbin/geom/class/eli/Makefile
  projects/sv/sbin/geom/class/journal/Makefile
  projects/sv/sbin/geom/class/label/Makefile
  projects/sv/sbin/geom/class/mirror/Makefile
  projects/sv/sbin/geom/class/mountver/Makefile
  projects/sv/sbin/geom/class/multipath/Makefile
  projects/sv/sbin/geom/class/nop/Makefile
  projects/sv/sbin/geom/class/part/Makefile
  projects/sv/sbin/geom/class/part/geom_part.c
  projects/sv/sbin/geom/class/raid3/Makefile
  projects/sv/sbin/geom/class/sched/Makefile
  projects/sv/sbin/geom/class/shsec/Makefile
  projects/sv/sbin/geom/class/stripe/Makefile
  projects/sv/sbin/geom/class/virstor/Makefile
  projects/sv/sbin/geom/core/Makefile
  projects/sv/sbin/geom/core/geom.c
  projects/sv/sbin/hastd/hastd.c
  projects/sv/sbin/hastd/primary.c
  projects/sv/sbin/ifconfig/ifconfig.c
  projects/sv/sbin/ifconfig/ifmedia.c
  projects/sv/sbin/mount/mount_fs.c
  projects/sv/sbin/newfs/newfs.c
  projects/sv/sbin/ping6/ping6.c
  projects/sv/sbin/route/route.c
  projects/sv/sbin/savecore/savecore.c
  projects/sv/share/man/man4/Makefile
  projects/sv/share/man/man4/altq.4
  projects/sv/share/man/man4/ixgb.4
  projects/sv/share/man/man4/ixgbe.4
  projects/sv/share/man/man4/jme.4
  projects/sv/share/man/man4/miibus.4
  projects/sv/share/man/man4/uplcom.4
  projects/sv/share/man/man4/vlan.4
  projects/sv/share/man/man5/rc.conf.5
  projects/sv/share/man/man9/VOP_READDIR.9
  projects/sv/share/misc/committers-ports.dot
  projects/sv/sys/amd64/amd64/fpu.c
  projects/sv/sys/amd64/amd64/identcpu.c
  projects/sv/sys/amd64/amd64/legacy.c
  projects/sv/sys/amd64/amd64/machdep.c
  projects/sv/sys/amd64/conf/XENHVM
  projects/sv/sys/amd64/include/atomic.h
  projects/sv/sys/amd64/include/bus.h
  projects/sv/sys/amd64/include/cpu.h
  projects/sv/sys/cam/cam_periph.c
  projects/sv/sys/cam/scsi/scsi_pass.c
  projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/sv/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
  projects/sv/sys/compat/freebsd32/freebsd32.h
  projects/sv/sys/compat/ndis/hal_var.h
  projects/sv/sys/conf/Makefile.mips
  projects/sv/sys/conf/NOTES
  projects/sv/sys/conf/files
  projects/sv/sys/conf/files.amd64
  projects/sv/sys/conf/files.i386
  projects/sv/sys/conf/files.mips
  projects/sv/sys/conf/files.pc98
  projects/sv/sys/contrib/dev/acpica/changes.txt
  projects/sv/sys/contrib/dev/acpica/common/dmtable.c
  projects/sv/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/sv/sys/contrib/dev/acpica/compiler/aslanalyze.c
  projects/sv/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/sv/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/sv/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/sv/sys/contrib/dev/acpica/debugger/dbcmds.c
  projects/sv/sys/contrib/dev/acpica/debugger/dbdisply.c
  projects/sv/sys/contrib/dev/acpica/debugger/dbexec.c
  projects/sv/sys/contrib/dev/acpica/dispatcher/dswexec.c
  projects/sv/sys/contrib/dev/acpica/events/evevent.c
  projects/sv/sys/contrib/dev/acpica/events/evgpe.c
  projects/sv/sys/contrib/dev/acpica/events/evgpeblk.c
  projects/sv/sys/contrib/dev/acpica/events/evgpeinit.c
  projects/sv/sys/contrib/dev/acpica/events/evgpeutil.c
  projects/sv/sys/contrib/dev/acpica/events/evxface.c
  projects/sv/sys/contrib/dev/acpica/events/evxfevnt.c
  projects/sv/sys/contrib/dev/acpica/executer/exconfig.c
  projects/sv/sys/contrib/dev/acpica/include/acdebug.h
  projects/sv/sys/contrib/dev/acpica/include/acdisasm.h
  projects/sv/sys/contrib/dev/acpica/include/acevents.h
  projects/sv/sys/contrib/dev/acpica/include/acglobal.h
  projects/sv/sys/contrib/dev/acpica/include/aclocal.h
  projects/sv/sys/contrib/dev/acpica/include/acpixf.h
  projects/sv/sys/contrib/dev/acpica/include/actypes.h
  projects/sv/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h
  projects/sv/sys/contrib/dev/acpica/utilities/utglobal.c
  projects/sv/sys/contrib/dev/acpica/utilities/utxface.c
  projects/sv/sys/contrib/dev/wpi/LICENSE
  projects/sv/sys/contrib/octeon-sdk/cvmx-app-init.h
  projects/sv/sys/contrib/octeon-sdk/cvmx-helper-board.c
  projects/sv/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c
  projects/sv/sys/contrib/octeon-sdk/cvmx-pcie.c
  projects/sv/sys/dev/acpi_support/acpi_fujitsu.c
  projects/sv/sys/dev/acpica/acpi.c
  projects/sv/sys/dev/acpica/acpi_battery.c
  projects/sv/sys/dev/acpica/acpi_button.c
  projects/sv/sys/dev/acpica/acpi_cmbat.c
  projects/sv/sys/dev/acpica/acpi_cpu.c
  projects/sv/sys/dev/acpica/acpi_ec.c
  projects/sv/sys/dev/acpica/acpi_hpet.c
  projects/sv/sys/dev/acpica/acpi_smbat.c
  projects/sv/sys/dev/acpica/acpiio.h
  projects/sv/sys/dev/ahci/ahci.c
  projects/sv/sys/dev/alc/if_alc.c
  projects/sv/sys/dev/ale/if_ale.c
  projects/sv/sys/dev/atkbdc/atkbd_atkbdc.c
  projects/sv/sys/dev/atkbdc/atkbdc.c
  projects/sv/sys/dev/atkbdc/atkbdc_isa.c
  projects/sv/sys/dev/atkbdc/atkbdcreg.h
  projects/sv/sys/dev/atkbdc/psm.c
  projects/sv/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c
  projects/sv/sys/dev/cxgb/ulp/tom/cxgb_ddp.c
  projects/sv/sys/dev/cxgb/ulp/tom/cxgb_tom.c
  projects/sv/sys/dev/cxgb/ulp/tom/cxgb_vm.c
  projects/sv/sys/dev/cxgb/ulp/tom/cxgb_vm.h
  projects/sv/sys/dev/drm/drm_irq.c
  projects/sv/sys/dev/hifn/hifn7751.c
  projects/sv/sys/dev/ichwd/ichwd.c
  projects/sv/sys/dev/ichwd/ichwd.h
  projects/sv/sys/dev/ieee488/ibfoo.c
  projects/sv/sys/dev/if_ndis/if_ndis_pccard.c
  projects/sv/sys/dev/if_ndis/if_ndis_pci.c
  projects/sv/sys/dev/iicbus/ds1775.c
  projects/sv/sys/dev/jme/if_jme.c
  projects/sv/sys/dev/jme/if_jmereg.h
  projects/sv/sys/dev/jme/if_jmevar.h
  projects/sv/sys/dev/le/if_le_pci.c
  projects/sv/sys/dev/lmc/if_lmc.c
  projects/sv/sys/dev/malo/if_malo_pci.c
  projects/sv/sys/dev/mii/jmphy.c
  projects/sv/sys/dev/mii/jmphyreg.h
  projects/sv/sys/dev/mps/mps.c
  projects/sv/sys/dev/mps/mps_sas.c
  projects/sv/sys/dev/mps/mpsvar.h
  projects/sv/sys/dev/pci/vga_pci.c
  projects/sv/sys/dev/puc/pucdata.c
  projects/sv/sys/dev/sis/if_sis.c
  projects/sv/sys/dev/sound/pci/atiixp.c
  projects/sv/sys/dev/sound/pci/csa.c
  projects/sv/sys/dev/sound/pci/ich.c
  projects/sv/sys/dev/uart/uart_cpu_amd64.c
  projects/sv/sys/dev/uart/uart_cpu_i386.c
  projects/sv/sys/dev/uart/uart_cpu_pc98.c
  projects/sv/sys/dev/usb/net/if_axe.c
  projects/sv/sys/dev/wpi/if_wpi.c
  projects/sv/sys/fs/devfs/devfs_devs.c
  projects/sv/sys/fs/devfs/devfs_rule.c
  projects/sv/sys/fs/devfs/devfs_vnops.c
  projects/sv/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/sv/sys/geom/part/g_part_mbr.c
  projects/sv/sys/i386/i386/identcpu.c
  projects/sv/sys/i386/i386/legacy.c
  projects/sv/sys/i386/i386/machdep.c
  projects/sv/sys/i386/i386/pmap.c
  projects/sv/sys/i386/include/atomic.h
  projects/sv/sys/i386/include/bus.h
  projects/sv/sys/i386/include/cpu.h
  projects/sv/sys/i386/isa/npx.c
  projects/sv/sys/i386/xen/clock.c
  projects/sv/sys/kern/init_main.c
  projects/sv/sys/kern/kern_conf.c
  projects/sv/sys/kern/kern_fail.c
  projects/sv/sys/kern/kern_fork.c
  projects/sv/sys/kern/kern_resource.c
  projects/sv/sys/kern/kern_thread.c
  projects/sv/sys/kern/kern_umtx.c
  projects/sv/sys/kern/sched_4bsd.c
  projects/sv/sys/kern/sched_ule.c
  projects/sv/sys/kern/subr_acl_nfs4.c
  projects/sv/sys/kern/subr_clock.c
  projects/sv/sys/kern/sys_pipe.c
  projects/sv/sys/kern/sys_process.c
  projects/sv/sys/kern/uipc_syscalls.c
  projects/sv/sys/kern/vfs_bio.c
  projects/sv/sys/mips/adm5120/adm5120_machdep.c
  projects/sv/sys/mips/alchemy/alchemy_machdep.c
  projects/sv/sys/mips/atheros/ar71xx_machdep.c
  projects/sv/sys/mips/cavium/octe/ethernet-common.c
  projects/sv/sys/mips/cavium/octeon_machdep.c
  projects/sv/sys/mips/conf/SWARM
  projects/sv/sys/mips/conf/SWARM64
  projects/sv/sys/mips/conf/SWARM64_SMP
  projects/sv/sys/mips/conf/SWARM_SMP
  projects/sv/sys/mips/conf/XLR
  projects/sv/sys/mips/idt/idt_machdep.c
  projects/sv/sys/mips/include/pmap.h
  projects/sv/sys/mips/include/vmparam.h
  projects/sv/sys/mips/malta/malta_machdep.c
  projects/sv/sys/mips/mips/elf_trampoline.c
  projects/sv/sys/mips/mips/inckern.S
  projects/sv/sys/mips/mips/pmap.c
  projects/sv/sys/mips/mips/vm_machdep.c
  projects/sv/sys/mips/rmi/board.c
  projects/sv/sys/mips/rmi/board.h
  projects/sv/sys/mips/rmi/dev/nlge/if_nlge.c
  projects/sv/sys/mips/rmi/dev/xlr/rge.c
  projects/sv/sys/mips/rmi/files.xlr
  projects/sv/sys/mips/rmi/iodi.c
  projects/sv/sys/mips/rmi/xlr_i2c.c
  projects/sv/sys/mips/rmi/xlr_machdep.c
  projects/sv/sys/mips/rmi/xlr_pci.c
  projects/sv/sys/mips/sentry5/s5_machdep.c
  projects/sv/sys/mips/sibyte/sb_machdep.c
  projects/sv/sys/modules/acpi/acpi/Makefile
  projects/sv/sys/modules/wpifw/Makefile
  projects/sv/sys/net/if.h
  projects/sv/sys/netinet/if_atm.c
  projects/sv/sys/netinet/sctp_indata.c
  projects/sv/sys/netinet/sctp_input.c
  projects/sv/sys/netinet/sctputil.c
  projects/sv/sys/netinet6/nd6.c
  projects/sv/sys/nfsserver/nfs_serv.c
  projects/sv/sys/pc98/include/bus.h
  projects/sv/sys/pc98/pc98/machdep.c
  projects/sv/sys/powerpc/aim/mmu_oea.c
  projects/sv/sys/powerpc/aim/mmu_oea64.c
  projects/sv/sys/powerpc/include/vmparam.h
  projects/sv/sys/sys/fail.h
  projects/sv/sys/sys/osd.h
  projects/sv/sys/sys/param.h
  projects/sv/sys/sys/proc.h
  projects/sv/sys/sys/sleepqueue.h
  projects/sv/sys/sys/turnstile.h
  projects/sv/sys/vm/memguard.c
  projects/sv/sys/vm/vm_extern.h
  projects/sv/sys/vm/vm_fault.c
  projects/sv/sys/vm/vm_map.c
  projects/sv/sys/vm/vm_map.h
  projects/sv/sys/vm/vm_page.c
  projects/sv/sys/vm/vm_page.h
  projects/sv/sys/x86/isa/atrtc.c
  projects/sv/sys/x86/x86/nexus.c
  projects/sv/sys/xen/evtchn/evtchn.c
  projects/sv/sys/xen/xenstore/xenstore.c
  projects/sv/tools/regression/acltools/02.t
  projects/sv/tools/regression/bin/sh/errors/bad-keyword1.0
  projects/sv/tools/regression/bin/sh/execution/func3.0
  projects/sv/tools/regression/sockets/sendfile/sendfile.c
  projects/sv/tools/regression/usr.bin/printf/regress.sh
  projects/sv/usr.bin/apply/apply.1
  projects/sv/usr.bin/apply/apply.c
  projects/sv/usr.bin/banner/banner.6
  projects/sv/usr.bin/banner/banner.c
  projects/sv/usr.bin/basename/basename.1
  projects/sv/usr.bin/basename/basename.c
  projects/sv/usr.bin/biff/biff.1
  projects/sv/usr.bin/biff/biff.c
  projects/sv/usr.bin/calendar/calendars/calendar.freebsd
  projects/sv/usr.bin/cap_mkdb/cap_mkdb.1
  projects/sv/usr.bin/cap_mkdb/cap_mkdb.c
  projects/sv/usr.bin/checknr/checknr.1
  projects/sv/usr.bin/checknr/checknr.c
  projects/sv/usr.bin/chpass/chpass.1
  projects/sv/usr.bin/chpass/table.c
  projects/sv/usr.bin/cksum/cksum.1
  projects/sv/usr.bin/cksum/cksum.c
  projects/sv/usr.bin/cksum/crc.c
  projects/sv/usr.bin/cksum/extern.h
  projects/sv/usr.bin/cksum/print.c
  projects/sv/usr.bin/cksum/sum1.c
  projects/sv/usr.bin/cksum/sum2.c
  projects/sv/usr.bin/cmp/cmp.1
  projects/sv/usr.bin/cmp/cmp.c
  projects/sv/usr.bin/cmp/extern.h
  projects/sv/usr.bin/cmp/misc.c
  projects/sv/usr.bin/cmp/regular.c
  projects/sv/usr.bin/cmp/special.c
  projects/sv/usr.bin/col/col.1
  projects/sv/usr.bin/col/col.c
  projects/sv/usr.bin/colcrt/colcrt.1
  projects/sv/usr.bin/colcrt/colcrt.c
  projects/sv/usr.bin/colrm/colrm.1
  projects/sv/usr.bin/colrm/colrm.c
  projects/sv/usr.bin/column/column.1
  projects/sv/usr.bin/column/column.c
  projects/sv/usr.bin/comm/comm.1
  projects/sv/usr.bin/comm/comm.c
  projects/sv/usr.bin/compress/compress.1
  projects/sv/usr.bin/compress/compress.c
  projects/sv/usr.bin/compress/zopen.3
  projects/sv/usr.bin/compress/zopen.c
  projects/sv/usr.bin/csup/fnmatch.c
  projects/sv/usr.bin/csup/fnmatch.h
  projects/sv/usr.bin/csup/rcsfile.c
  projects/sv/usr.bin/csup/rcsfile.h
  projects/sv/usr.bin/ctags/C.c
  projects/sv/usr.bin/ctags/ctags.1
  projects/sv/usr.bin/ctags/ctags.c
  projects/sv/usr.bin/ctags/ctags.h
  projects/sv/usr.bin/ctags/fortran.c
  projects/sv/usr.bin/ctags/lisp.c
  projects/sv/usr.bin/ctags/print.c
  projects/sv/usr.bin/ctags/tree.c
  projects/sv/usr.bin/ctags/yacc.c
  projects/sv/usr.bin/cut/cut.1
  projects/sv/usr.bin/cut/cut.c
  projects/sv/usr.bin/dirname/dirname.c
  projects/sv/usr.bin/du/du.1
  projects/sv/usr.bin/du/du.c
  projects/sv/usr.bin/env/env.1
  projects/sv/usr.bin/env/env.c
  projects/sv/usr.bin/expand/expand.1
  projects/sv/usr.bin/expand/expand.c
  projects/sv/usr.bin/false/false.1
  projects/sv/usr.bin/false/false.c
  projects/sv/usr.bin/find/extern.h
  projects/sv/usr.bin/find/find.1
  projects/sv/usr.bin/find/find.c
  projects/sv/usr.bin/find/find.h
  projects/sv/usr.bin/find/function.c
  projects/sv/usr.bin/find/ls.c
  projects/sv/usr.bin/find/main.c
  projects/sv/usr.bin/find/misc.c
  projects/sv/usr.bin/find/operator.c
  projects/sv/usr.bin/find/option.c
  projects/sv/usr.bin/finger/extern.h
  projects/sv/usr.bin/finger/finger.1
  projects/sv/usr.bin/finger/finger.c
  projects/sv/usr.bin/finger/finger.h
  projects/sv/usr.bin/finger/lprint.c
  projects/sv/usr.bin/finger/net.c
  projects/sv/usr.bin/finger/sprint.c
  projects/sv/usr.bin/finger/util.c
  projects/sv/usr.bin/fmt/fmt.1
  projects/sv/usr.bin/fold/fold.1
  projects/sv/usr.bin/fold/fold.c
  projects/sv/usr.bin/from/from.1
  projects/sv/usr.bin/from/from.c
  projects/sv/usr.bin/fstat/fstat.1
  projects/sv/usr.bin/fstat/fstat.c
  projects/sv/usr.bin/fstat/fstat.h
  projects/sv/usr.bin/gcore/extern.h
  projects/sv/usr.bin/gcore/gcore.1
  projects/sv/usr.bin/gcore/gcore.c
  projects/sv/usr.bin/gprof/amd64.h
  projects/sv/usr.bin/gprof/aout.c
  projects/sv/usr.bin/gprof/arcs.c
  projects/sv/usr.bin/gprof/arm.h
  projects/sv/usr.bin/gprof/dfn.c
  projects/sv/usr.bin/gprof/elf.c
  projects/sv/usr.bin/gprof/gprof.1
  projects/sv/usr.bin/gprof/gprof.c
  projects/sv/usr.bin/gprof/gprof.h
  projects/sv/usr.bin/gprof/hertz.c
  projects/sv/usr.bin/gprof/i386.h
  projects/sv/usr.bin/gprof/ia64.h
  projects/sv/usr.bin/gprof/lookup.c
  projects/sv/usr.bin/gprof/pathnames.h
  projects/sv/usr.bin/gprof/powerpc.h
  projects/sv/usr.bin/gprof/printgprof.c
  projects/sv/usr.bin/gprof/printlist.c
  projects/sv/usr.bin/gprof/sparc64.h
  projects/sv/usr.bin/head/head.1
  projects/sv/usr.bin/head/head.c
  projects/sv/usr.bin/hexdump/conv.c
  projects/sv/usr.bin/hexdump/display.c
  projects/sv/usr.bin/hexdump/hexdump.1
  projects/sv/usr.bin/hexdump/hexdump.c
  projects/sv/usr.bin/hexdump/hexdump.h
  projects/sv/usr.bin/hexdump/hexsyntax.c
  projects/sv/usr.bin/hexdump/od.1
  projects/sv/usr.bin/hexdump/odsyntax.c
  projects/sv/usr.bin/hexdump/parse.c
  projects/sv/usr.bin/id/groups.1
  projects/sv/usr.bin/id/id.1
  projects/sv/usr.bin/id/id.c
  projects/sv/usr.bin/id/whoami.1
  projects/sv/usr.bin/join/join.1
  projects/sv/usr.bin/join/join.c
  projects/sv/usr.bin/jot/jot.1
  projects/sv/usr.bin/jot/jot.c
  projects/sv/usr.bin/kdump/kdump.1
  projects/sv/usr.bin/kdump/kdump.c
  projects/sv/usr.bin/ktrace/ktrace.1
  projects/sv/usr.bin/ktrace/ktrace.c
  projects/sv/usr.bin/ktrace/ktrace.h
  projects/sv/usr.bin/ktrace/subr.c
  projects/sv/usr.bin/lam/lam.1
  projects/sv/usr.bin/lam/lam.c
  projects/sv/usr.bin/last/last.1
  projects/sv/usr.bin/last/last.c
  projects/sv/usr.bin/lastcomm/lastcomm.1
  projects/sv/usr.bin/lastcomm/lastcomm.c
  projects/sv/usr.bin/lastcomm/pathnames.h
  projects/sv/usr.bin/leave/leave.1
  projects/sv/usr.bin/leave/leave.c
  projects/sv/usr.bin/lock/lock.1
  projects/sv/usr.bin/lock/lock.c
  projects/sv/usr.bin/logger/logger.1
  projects/sv/usr.bin/logger/logger.c
  projects/sv/usr.bin/login/login.1
  projects/sv/usr.bin/login/pathnames.h
  projects/sv/usr.bin/logname/logname.1
  projects/sv/usr.bin/logname/logname.c
  projects/sv/usr.bin/look/look.1
  projects/sv/usr.bin/look/look.c
  projects/sv/usr.bin/look/pathnames.h
  projects/sv/usr.bin/lorder/lorder.1
  projects/sv/usr.bin/lorder/lorder.sh
  projects/sv/usr.bin/m4/TEST/ack.m4
  projects/sv/usr.bin/m4/TEST/hanoi.m4
  projects/sv/usr.bin/m4/TEST/hash.m4
  projects/sv/usr.bin/m4/TEST/sqroot.m4
  projects/sv/usr.bin/m4/TEST/string.m4
  projects/sv/usr.bin/m4/TEST/test.m4
  projects/sv/usr.bin/m4/eval.c
  projects/sv/usr.bin/m4/expr.c
  projects/sv/usr.bin/m4/extern.h
  projects/sv/usr.bin/m4/look.c
  projects/sv/usr.bin/m4/main.c
  projects/sv/usr.bin/m4/mdef.h
  projects/sv/usr.bin/m4/misc.c
  projects/sv/usr.bin/m4/pathnames.h
  projects/sv/usr.bin/m4/stdd.h
  projects/sv/usr.bin/mail/cmd1.c
  projects/sv/usr.bin/mail/cmd2.c
  projects/sv/usr.bin/mail/cmd3.c
  projects/sv/usr.bin/mail/cmdtab.c
  projects/sv/usr.bin/mail/collect.c
  projects/sv/usr.bin/mail/def.h
  projects/sv/usr.bin/mail/edit.c
  projects/sv/usr.bin/mail/extern.h
  projects/sv/usr.bin/mail/fio.c
  projects/sv/usr.bin/mail/getname.c
  projects/sv/usr.bin/mail/glob.h
  projects/sv/usr.bin/mail/head.c
  projects/sv/usr.bin/mail/lex.c
  projects/sv/usr.bin/mail/list.c
  projects/sv/usr.bin/mail/mail.1
  projects/sv/usr.bin/mail/main.c
  projects/sv/usr.bin/mail/names.c
  projects/sv/usr.bin/mail/pathnames.h
  projects/sv/usr.bin/mail/popen.c
  projects/sv/usr.bin/mail/quit.c
  projects/sv/usr.bin/mail/rcv.h
  projects/sv/usr.bin/mail/send.c
  projects/sv/usr.bin/mail/strings.c
  projects/sv/usr.bin/mail/temp.c
  projects/sv/usr.bin/mail/tty.c
  projects/sv/usr.bin/mail/util.c
  projects/sv/usr.bin/mail/v7.local.c
  projects/sv/usr.bin/mail/vars.c
  projects/sv/usr.bin/mail/version.c
  projects/sv/usr.bin/man/man.sh
  projects/sv/usr.bin/mesg/mesg.1
  projects/sv/usr.bin/mkdep/mkdep.1
  projects/sv/usr.bin/mkdep/mkdep.gcc.sh
  projects/sv/usr.bin/mkdep/mkdep.sh
  projects/sv/usr.bin/mkfifo/mkfifo.1
  projects/sv/usr.bin/mkfifo/mkfifo.c
  projects/sv/usr.bin/mklocale/extern.h
  projects/sv/usr.bin/mklocale/ldef.h
  projects/sv/usr.bin/mklocale/lex.l
  projects/sv/usr.bin/mklocale/mklocale.1
  projects/sv/usr.bin/mklocale/yacc.y
  projects/sv/usr.bin/mkstr/mkstr.1
  projects/sv/usr.bin/mkstr/mkstr.c
  projects/sv/usr.bin/mktemp/mktemp.1
  projects/sv/usr.bin/msgs/msgs.1
  projects/sv/usr.bin/msgs/msgs.c
  projects/sv/usr.bin/msgs/pathnames.h
  projects/sv/usr.bin/mt/mt.1
  projects/sv/usr.bin/mt/mt.c
  projects/sv/usr.bin/netstat/atalk.c
  projects/sv/usr.bin/netstat/if.c
  projects/sv/usr.bin/netstat/inet.c
  projects/sv/usr.bin/netstat/inet6.c
  projects/sv/usr.bin/netstat/ipsec.c
  projects/sv/usr.bin/netstat/main.c
  projects/sv/usr.bin/netstat/netstat.1
  projects/sv/usr.bin/netstat/netstat.h
  projects/sv/usr.bin/netstat/pfkey.c
  projects/sv/usr.bin/netstat/route.c
  projects/sv/usr.bin/netstat/unix.c
  projects/sv/usr.bin/nfsstat/nfsstat.1
  projects/sv/usr.bin/nfsstat/nfsstat.c
  projects/sv/usr.bin/nice/nice.1
  projects/sv/usr.bin/nice/nice.c
  projects/sv/usr.bin/nohup/nohup.1
  projects/sv/usr.bin/nohup/nohup.c
  projects/sv/usr.bin/pagesize/pagesize.1
  projects/sv/usr.bin/pagesize/pagesize.sh
  projects/sv/usr.bin/passwd/passwd.1
  projects/sv/usr.bin/paste/paste.1
  projects/sv/usr.bin/paste/paste.c
  projects/sv/usr.bin/printenv/printenv.1
  projects/sv/usr.bin/printenv/printenv.c
  projects/sv/usr.bin/printf/printf.1
  projects/sv/usr.bin/printf/printf.c
  projects/sv/usr.bin/quota/quota.1
  projects/sv/usr.bin/quota/quota.c
  projects/sv/usr.bin/renice/renice.8
  projects/sv/usr.bin/renice/renice.c
  projects/sv/usr.bin/rev/rev.1
  projects/sv/usr.bin/rev/rev.c
  projects/sv/usr.bin/rlogin/rlogin.1
  projects/sv/usr.bin/rs/rs.1
  projects/sv/usr.bin/rs/rs.c
  projects/sv/usr.bin/rsh/rsh.1
  projects/sv/usr.bin/rsh/rsh.c
  projects/sv/usr.bin/rup/rup.1
  projects/sv/usr.bin/ruptime/ruptime.1
  projects/sv/usr.bin/ruptime/ruptime.c
  projects/sv/usr.bin/rusers/rusers.1
  projects/sv/usr.bin/rwall/rwall.1
  projects/sv/usr.bin/rwho/rwho.1
  projects/sv/usr.bin/rwho/rwho.c
  projects/sv/usr.bin/script/script.1
  projects/sv/usr.bin/script/script.c
  projects/sv/usr.bin/shar/shar.1
  projects/sv/usr.bin/shar/shar.sh
  projects/sv/usr.bin/showmount/showmount.8
  projects/sv/usr.bin/showmount/showmount.c
  projects/sv/usr.bin/split/split.1
  projects/sv/usr.bin/split/split.c
  projects/sv/usr.bin/stat/stat.c
  projects/sv/usr.bin/su/su.1
  projects/sv/usr.bin/su/su.c
  projects/sv/usr.bin/systat/cmds.c
  projects/sv/usr.bin/systat/cmdtab.c
  projects/sv/usr.bin/systat/devs.c
  projects/sv/usr.bin/systat/extern.h
  projects/sv/usr.bin/systat/fetch.c
  projects/sv/usr.bin/systat/icmp.c
  projects/sv/usr.bin/systat/icmp6.c
  projects/sv/usr.bin/systat/iostat.c
  projects/sv/usr.bin/systat/ip.c
  projects/sv/usr.bin/systat/ip6.c
  projects/sv/usr.bin/systat/keyboard.c
  projects/sv/usr.bin/systat/main.c
  projects/sv/usr.bin/systat/mbufs.c
  projects/sv/usr.bin/systat/netcmds.c
  projects/sv/usr.bin/systat/netstat.c
  projects/sv/usr.bin/systat/pigs.c
  projects/sv/usr.bin/systat/swap.c
  projects/sv/usr.bin/systat/systat.1
  projects/sv/usr.bin/systat/systat.h
  projects/sv/usr.bin/systat/tcp.c
  projects/sv/usr.bin/systat/vmstat.c
  projects/sv/usr.bin/tail/extern.h
  projects/sv/usr.bin/tail/forward.c
  projects/sv/usr.bin/tail/misc.c
  projects/sv/usr.bin/tail/read.c
  projects/sv/usr.bin/tail/reverse.c
  projects/sv/usr.bin/tail/tail.1
  projects/sv/usr.bin/tail/tail.c
  projects/sv/usr.bin/talk/ctl.c
  projects/sv/usr.bin/talk/ctl_transact.c
  projects/sv/usr.bin/talk/display.c
  projects/sv/usr.bin/talk/get_addrs.c
  projects/sv/usr.bin/talk/get_names.c
  projects/sv/usr.bin/talk/init_disp.c
  projects/sv/usr.bin/talk/invite.c
  projects/sv/usr.bin/talk/io.c
  projects/sv/usr.bin/talk/look_up.c
  projects/sv/usr.bin/talk/msgs.c
  projects/sv/usr.bin/talk/talk.1
  projects/sv/usr.bin/talk/talk.c
  projects/sv/usr.bin/talk/talk.h
  projects/sv/usr.bin/talk/talk_ctl.h
  projects/sv/usr.bin/tcopy/tcopy.1
  projects/sv/usr.bin/tcopy/tcopy.c
  projects/sv/usr.bin/tee/tee.1
  projects/sv/usr.bin/tee/tee.c
  projects/sv/usr.bin/tftp/main.c
  projects/sv/usr.bin/tftp/tftp.1
  projects/sv/usr.bin/tftp/tftp.c
  projects/sv/usr.bin/tftp/tftp.h
  projects/sv/usr.bin/time/time.1
  projects/sv/usr.bin/time/time.c
  projects/sv/usr.bin/touch/touch.1
  projects/sv/usr.bin/touch/touch.c
  projects/sv/usr.bin/tput/clear.sh
  projects/sv/usr.bin/tput/tput.1
  projects/sv/usr.bin/tput/tput.c
  projects/sv/usr.bin/tr/extern.h
  projects/sv/usr.bin/tr/str.c
  projects/sv/usr.bin/tr/tr.1
  projects/sv/usr.bin/tr/tr.c
  projects/sv/usr.bin/true/true.1
  projects/sv/usr.bin/true/true.c
  projects/sv/usr.bin/tset/extern.h
  projects/sv/usr.bin/tset/map.c
  projects/sv/usr.bin/tset/misc.c
  projects/sv/usr.bin/tset/set.c
  projects/sv/usr.bin/tset/term.c
  projects/sv/usr.bin/tset/tset.1
  projects/sv/usr.bin/tset/tset.c
  projects/sv/usr.bin/tset/wrterm.c
  projects/sv/usr.bin/tsort/tsort.1
  projects/sv/usr.bin/tsort/tsort.c
  projects/sv/usr.bin/tty/tty.1
  projects/sv/usr.bin/tty/tty.c
  projects/sv/usr.bin/ul/ul.1
  projects/sv/usr.bin/ul/ul.c
  projects/sv/usr.bin/uname/uname.1
  projects/sv/usr.bin/unexpand/unexpand.c
  projects/sv/usr.bin/uniq/uniq.1
  projects/sv/usr.bin/uniq/uniq.c
  projects/sv/usr.bin/unvis/unvis.1
  projects/sv/usr.bin/unvis/unvis.c
  projects/sv/usr.bin/users/users.1
  projects/sv/usr.bin/users/users.c
  projects/sv/usr.bin/uudecode/uudecode.c
  projects/sv/usr.bin/uuencode/uuencode.1
  projects/sv/usr.bin/uuencode/uuencode.c
  projects/sv/usr.bin/uuencode/uuencode.format.5
  projects/sv/usr.bin/vgrind/RETEST/retest.c
  projects/sv/usr.bin/vgrind/extern.h
  projects/sv/usr.bin/vgrind/pathnames.h
  projects/sv/usr.bin/vgrind/regexp.c
  projects/sv/usr.bin/vgrind/vfontedpr.c
  projects/sv/usr.bin/vgrind/vgrind.1
  projects/sv/usr.bin/vgrind/vgrind.sh
  projects/sv/usr.bin/vgrind/vgrindefs.5
  projects/sv/usr.bin/vgrind/vgrindefs.c
  projects/sv/usr.bin/vgrind/vgrindefs.src
  projects/sv/usr.bin/vis/extern.h
  projects/sv/usr.bin/vis/foldit.c
  projects/sv/usr.bin/vis/vis.1
  projects/sv/usr.bin/vis/vis.c
  projects/sv/usr.bin/vmstat/vmstat.8
  projects/sv/usr.bin/vmstat/vmstat.c
  projects/sv/usr.bin/w/extern.h
  projects/sv/usr.bin/w/pr_time.c
  projects/sv/usr.bin/w/proc_compare.c
  projects/sv/usr.bin/w/uptime.1
  projects/sv/usr.bin/w/w.1
  projects/sv/usr.bin/w/w.c
  projects/sv/usr.bin/wall/ttymsg.c
  projects/sv/usr.bin/wall/wall.1
  projects/sv/usr.bin/wall/wall.c
  projects/sv/usr.bin/wc/wc.1
  projects/sv/usr.bin/wc/wc.c
  projects/sv/usr.bin/what/what.1
  projects/sv/usr.bin/what/what.c
  projects/sv/usr.bin/who/who.1
  projects/sv/usr.bin/whois/whois.1
  projects/sv/usr.bin/whois/whois.c
  projects/sv/usr.bin/write/write.1
  projects/sv/usr.bin/write/write.c
  projects/sv/usr.bin/xargs/pathnames.h
  projects/sv/usr.bin/xargs/xargs.1
  projects/sv/usr.bin/xargs/xargs.c
  projects/sv/usr.bin/xinstall/install.1
  projects/sv/usr.bin/xinstall/xinstall.c
  projects/sv/usr.bin/xstr/pathnames.h
  projects/sv/usr.bin/xstr/xstr.1
  projects/sv/usr.bin/xstr/xstr.c
  projects/sv/usr.bin/yacc/closure.c
  projects/sv/usr.bin/yacc/defs.h
  projects/sv/usr.bin/yacc/error.c
  projects/sv/usr.bin/yacc/lalr.c
  projects/sv/usr.bin/yacc/lr0.c
  projects/sv/usr.bin/yacc/main.c
  projects/sv/usr.bin/yacc/mkpar.c
  projects/sv/usr.bin/yacc/output.c
  projects/sv/usr.bin/yacc/reader.c
  projects/sv/usr.bin/yacc/skeleton.c
  projects/sv/usr.bin/yacc/symtab.c
  projects/sv/usr.bin/yacc/verbose.c
  projects/sv/usr.bin/yacc/warshall.c
  projects/sv/usr.bin/yacc/yacc.1
  projects/sv/usr.bin/yacc/yyfix.1
  projects/sv/usr.bin/yacc/yyfix.sh
  projects/sv/usr.bin/yes/yes.1
  projects/sv/usr.bin/yes/yes.c
  projects/sv/usr.sbin/Makefile.amd64
  projects/sv/usr.sbin/acpi/acpidb/Makefile
  projects/sv/usr.sbin/bsnmpd/Makefile
  projects/sv/usr.sbin/bsnmpd/bsnmpd/Makefile
  projects/sv/usr.sbin/bsnmpd/modules/Makefile
  projects/sv/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def
  projects/sv/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
  projects/sv/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def
  projects/sv/usr.sbin/config/config.y
  projects/sv/usr.sbin/cxgbtool/cxgbtool.c
  projects/sv/usr.sbin/extattrctl/extattrctl.c
  projects/sv/usr.sbin/fwcontrol/fwcontrol.c
  projects/sv/usr.sbin/gpioctl/gpioctl.8
  projects/sv/usr.sbin/iostat/iostat.8
  projects/sv/usr.sbin/iostat/iostat.c
  projects/sv/usr.sbin/lmcconfig/Makefile
  projects/sv/usr.sbin/lmcconfig/lmcconfig.c
  projects/sv/usr.sbin/lpr/common_source/displayq.c
  projects/sv/usr.sbin/lpr/common_source/lp.h
  projects/sv/usr.sbin/lpr/common_source/lp.local.h
  projects/sv/usr.sbin/lpr/common_source/pathnames.h
  projects/sv/usr.sbin/lpr/common_source/rmjob.c
  projects/sv/usr.sbin/lpr/common_source/startdaemon.c
  projects/sv/usr.sbin/lpr/filters/lpf.c
  projects/sv/usr.sbin/lpr/lpc/cmds.c
  projects/sv/usr.sbin/lpr/lpc/cmdtab.c
  projects/sv/usr.sbin/lpr/lpc/extern.h
  projects/sv/usr.sbin/lpr/lpc/lpc.8
  projects/sv/usr.sbin/lpr/lpc/lpc.c
  projects/sv/usr.sbin/lpr/lpc/lpc.h
  projects/sv/usr.sbin/lpr/lpd/extern.h
  projects/sv/usr.sbin/lpr/lpd/lpd.8
  projects/sv/usr.sbin/lpr/lpd/lpd.c
  projects/sv/usr.sbin/lpr/lpd/lpdchar.c
  projects/sv/usr.sbin/lpr/lpd/modes.c
  projects/sv/usr.sbin/lpr/lpd/printjob.c
  projects/sv/usr.sbin/lpr/lpd/recvjob.c
  projects/sv/usr.sbin/lpr/lpq/lpq.1
  projects/sv/usr.sbin/lpr/lpq/lpq.c
  projects/sv/usr.sbin/lpr/lpr/lpr.1
  projects/sv/usr.sbin/lpr/lpr/printcap.5
  projects/sv/usr.sbin/lpr/lprm/lprm.1
  projects/sv/usr.sbin/lpr/lprm/lprm.c
  projects/sv/usr.sbin/lpr/lptest/lptest.1
  projects/sv/usr.sbin/lpr/lptest/lptest.c
  projects/sv/usr.sbin/lpr/pac/pac.8
  projects/sv/usr.sbin/lpr/pac/pac.c
  projects/sv/usr.sbin/mld6query/mld6.c
  projects/sv/usr.sbin/mountd/mountd.c
  projects/sv/usr.sbin/ngctl/main.c
  projects/sv/usr.sbin/ngctl/msg.c
  projects/sv/usr.sbin/portsnap/portsnap/portsnap.sh
  projects/sv/usr.sbin/rpc.lockd/Makefile
  projects/sv/usr.sbin/rpc.lockd/lockd.c
  projects/sv/usr.sbin/rpc.lockd/lockd_lock.c
  projects/sv/usr.sbin/sysinstall/media.c
  projects/sv/usr.sbin/timed/timed/acksend.c
  projects/sv/usr.sbin/timed/timed/byteorder.c
  projects/sv/usr.sbin/timed/timed/candidate.c
  projects/sv/usr.sbin/timed/timed/cksum.c
  projects/sv/usr.sbin/timed/timed/correct.c
  projects/sv/usr.sbin/timed/timed/extern.h
  projects/sv/usr.sbin/timed/timed/globals.h
  projects/sv/usr.sbin/timed/timed/master.c
  projects/sv/usr.sbin/timed/timed/measure.c
  projects/sv/usr.sbin/timed/timed/networkdelta.c
  projects/sv/usr.sbin/timed/timed/pathnames.h
  projects/sv/usr.sbin/timed/timed/readmsg.c
  projects/sv/usr.sbin/timed/timed/slave.c
  projects/sv/usr.sbin/timed/timed/timed.8
  projects/sv/usr.sbin/timed/timed/timed.c
  projects/sv/usr.sbin/timed/timedc/cmds.c
  projects/sv/usr.sbin/timed/timedc/cmdtab.c
  projects/sv/usr.sbin/timed/timedc/extern.h
  projects/sv/usr.sbin/timed/timedc/timedc.8
  projects/sv/usr.sbin/timed/timedc/timedc.c
  projects/sv/usr.sbin/timed/timedc/timedc.h
  projects/sv/usr.sbin/traceroute6/traceroute6.c
  projects/sv/usr.sbin/wpa/hostapd/driver_freebsd.c
Directory Properties:
  projects/sv/   (props changed)
  projects/sv/cddl/contrib/opensolaris/   (props changed)
  projects/sv/contrib/bind9/   (props changed)
  projects/sv/contrib/binutils/   (props changed)
  projects/sv/contrib/bzip2/   (props changed)
  projects/sv/contrib/ee/   (props changed)
  projects/sv/contrib/expat/   (props changed)
  projects/sv/contrib/file/   (props changed)
  projects/sv/contrib/gdb/   (props changed)
  projects/sv/contrib/gdtoa/   (props changed)
  projects/sv/contrib/gnu-sort/   (props changed)
  projects/sv/contrib/groff/   (props changed)
  projects/sv/contrib/less/   (props changed)
  projects/sv/contrib/libpcap/   (props changed)
  projects/sv/contrib/llvm/   (props changed)
  projects/sv/contrib/llvm/tools/clang/   (props changed)
  projects/sv/contrib/ncurses/   (props changed)
  projects/sv/contrib/netcat/   (props changed)
  projects/sv/contrib/ntp/   (props changed)
  projects/sv/contrib/one-true-awk/   (props changed)
  projects/sv/contrib/openbsm/   (props changed)
  projects/sv/contrib/openpam/   (props changed)
  projects/sv/contrib/pf/   (props changed)
  projects/sv/contrib/sendmail/   (props changed)
  projects/sv/contrib/tcpdump/   (props changed)
  projects/sv/contrib/tcsh/   (props changed)
  projects/sv/contrib/top/   (props changed)
  projects/sv/contrib/top/install-sh   (props changed)
  projects/sv/contrib/tzcode/stdtime/   (props changed)
  projects/sv/contrib/tzcode/zic/   (props changed)
  projects/sv/contrib/tzdata/   (props changed)
  projects/sv/contrib/wpa/   (props changed)
  projects/sv/contrib/xz/   (props changed)
  projects/sv/crypto/openssh/   (props changed)
  projects/sv/crypto/openssl/   (props changed)
  projects/sv/lib/libc/   (props changed)
  projects/sv/lib/libc/stdtime/   (props changed)
  projects/sv/lib/libutil/   (props changed)
  projects/sv/lib/libz/   (props changed)
  projects/sv/sbin/   (props changed)
  projects/sv/sbin/ipfw/   (props changed)
  projects/sv/share/mk/bsd.arch.inc.mk   (props changed)
  projects/sv/share/zoneinfo/   (props changed)
  projects/sv/sys/   (props changed)
  projects/sv/sys/amd64/include/xen/   (props changed)
  projects/sv/sys/cddl/contrib/opensolaris/   (props changed)
  projects/sv/sys/contrib/dev/acpica/   (props changed)
  projects/sv/sys/contrib/octeon-sdk/   (props changed)
  projects/sv/sys/contrib/pf/   (props changed)
  projects/sv/sys/contrib/x86emu/   (props changed)
  projects/sv/usr.bin/calendar/   (props changed)
  projects/sv/usr.bin/csup/   (props changed)
  projects/sv/usr.bin/procstat/   (props changed)
  projects/sv/usr.sbin/zic/   (props changed)

Modified: projects/sv/Makefile
==============================================================================
--- projects/sv/Makefile	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/Makefile	Tue Dec 21 21:29:02 2010	(r216624)
@@ -271,7 +271,7 @@ make: .PHONY
 
 tinderbox:
 	cd ${.CURDIR} && \
-		DOING_TINDERBOX=YES ${MAKE} ${JFLAG} universe
+		DOING_TINDERBOX=YES ${MAKE} JFLAG=${JFLAG} universe
 
 #
 # universe
@@ -281,7 +281,15 @@ tinderbox:
 # existing system is.
 #
 .if make(universe) || make(universe_kernels) || make(tinderbox)
-TARGETS?=amd64 i386 ia64 pc98 powerpc sparc64 sun4v mips
+TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v
+TARGET_ARCHES_arm?=	arm armeb
+TARGET_ARCHES_mips?=	mipsel mipseb
+TARGET_ARCHES_powerpc?=	powerpc powerpc64
+TARGET_ARCHES_pc98?=	i386
+TARGET_ARCHES_sun4v?=	sparc64
+.for target in ${TARGETS}
+TARGET_ARCHES_${target}?= ${target}
+.endfor
 
 .if defined(DOING_TINDERBOX)
 FAILFILE=tinderbox.failed
@@ -301,16 +309,24 @@ universe_prologue:
 .for target in ${TARGETS}
 universe: universe_${target}
 .ORDER: universe_prologue universe_${target} universe_epilogue
-universe_${target}:
-.if !defined(MAKE_JUST_KERNELS)
+universe_${target}: universe_${target}_prologue
+universe_${target}_prologue:
 	@echo ">> ${target} started on `LC_ALL=C date`"
+.if !defined(MAKE_JUST_KERNELS)
+.for target_arch in ${TARGET_ARCHES_${target}}
+universe_${target}: universe_${target}_${target_arch}
+universe_${target}_${target_arch}: universe_${target}_prologue
+	@echo ">> ${target}.${target_arch} buildworld started on `LC_ALL=C date`"
 	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
 	    ${MAKE} ${JFLAG} buildworld \
 	    TARGET=${target} \
-	    > _.${target}.buildworld 2>&1 || \
-	    (echo "${target} world failed," \
-	    "check _.${target}.buildworld for details" | ${MAKEFAIL}))
-	@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
+	    TARGET_ARCH=${target_arch} \
+	    > _.${target}.${target_arch}.buildworld 2>&1 || \
+	    (echo "${target}.${target_arch} world failed," \
+	    "check _.${target}.${target_arch}.buildworld for details" | \
+	    ${MAKEFAIL}))
+	@echo ">> ${target}.${target_arch} buildworld completed on `LC_ALL=C date`"
+.endfor
 .endif
 .if !defined(MAKE_JUST_WORLDS)
 .if exists(${.CURDIR}/sys/${target}/conf/NOTES)
@@ -333,9 +349,15 @@ KERNCONFS!=	cd ${.CURDIR}/sys/${TARGET}/
 		! -name DEFAULTS ! -name NOTES
 universe_kernconfs:
 .for kernel in ${KERNCONFS}
+TARGET_ARCH_${kernel}!=	cd ${.CURDIR}/sys/${TARGET}/conf && \
+			config -m ${.CURDIR}/sys/${TARGET}/conf/${kernel} | \
+			cut -f 2
+universe_kernconfs: universe_kernconf_${TARGET}_${kernel}
+universe_kernconf_${TARGET}_${kernel}:
 	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
 	    ${MAKE} ${JFLAG} buildkernel \
 	    TARGET=${TARGET} \
+	    TARGET_ARCH=${TARGET_ARCH_${kernel}} \
 	    KERNCONF=${kernel} \
 	    > _.${TARGET}.${kernel} 2>&1 || \
 	    (echo "${TARGET} ${kernel} kernel failed," \

Modified: projects/sv/ObsoleteFiles.inc
==============================================================================
--- projects/sv/ObsoleteFiles.inc	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/ObsoleteFiles.inc	Tue Dec 21 21:29:02 2010	(r216624)
@@ -284,6 +284,8 @@ OLD_FILES+=usr/share/man/man9/ieee80211_
 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
+# 20101208: libbsnmp was moved to usr/lib
+OLD_LIBS+=lib/libbsnmp.so.5
 # 20090719: library version bump for 8.0
 OLD_LIBS+=lib/libalias.so.6
 OLD_LIBS+=lib/libavl.so.1

Modified: projects/sv/UPDATING
==============================================================================
--- projects/sv/UPDATING	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/UPDATING	Tue Dec 21 21:29:02 2010	(r216624)
@@ -1136,8 +1136,8 @@ COMMON ITEMS:
 	<reboot in single user>				[3]
 	mergemaster -p					[5]
 	make installworld
-	make delete-old
 	mergemaster -i					[4]
+	make delete-old					[6]
 	<reboot>
 
 
@@ -1174,8 +1174,8 @@ COMMON ITEMS:
 	<reboot in single user>				[3]
 	mergemaster -p					[5]
 	make installworld
-	make delete-old
 	mergemaster -i					[4]
+	make delete-old					[6]
 	<reboot>
 
 	Make sure that you've read the UPDATING file to understand the
@@ -1218,6 +1218,10 @@ COMMON ITEMS:
 	install) after the buildworld before this step if you last updated
 	from current before 20020224 or from -stable before 20020408.
 
+	[6] This only deletes old files and directories. Old libraries
+	can be deleted by "make delete-old-libs", but you have to make
+	sure that no program is using those libraries anymore.
+
 	[8] In order to have a kernel that can run the 4.x binaries needed to
 	do an installworld, you must include the COMPAT_FREEBSD4 option in
 	your kernel.  Failure to do so may leave you with a system that is

Modified: projects/sv/bin/sh/arith_lex.l
==============================================================================
--- projects/sv/bin/sh/arith_lex.l	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/bin/sh/arith_lex.l	Tue Dec 21 21:29:02 2010	(r216624)
@@ -74,12 +74,12 @@ int yylex(void);
 			return ARITH_NUM;
 		}
 
-0[0-7]+		{
+0[0-7]*		{
 			yylval.l_value = strtoarith_t(yytext, NULL, 8);
 			return ARITH_NUM;
 		}
 
-[0-9]+		{
+[1-9][0-9]*	{
 			yylval.l_value = strtoarith_t(yytext, NULL, 10);
 			return ARITH_NUM;
 		}

Modified: projects/sv/bin/sh/bltin/bltin.h
==============================================================================
--- projects/sv/bin/sh/bltin/bltin.h	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/bin/sh/bltin/bltin.h	Tue Dec 21 21:29:02 2010	(r216624)
@@ -57,21 +57,12 @@
 #define fwrite(ptr, size, nmemb, file) outbin(ptr, (size) * (nmemb), file)
 #define fflush flushout
 #define INITARGS(argv)
-#define warnx1(a, b, c) {				\
-	char buf[64];					\
-	(void)snprintf(buf, sizeof(buf), a);		\
-	error("%s", buf);				\
-}
-#define warnx2(a, b, c) {				\
-	char buf[64];					\
-	(void)snprintf(buf, sizeof(buf), a, b);		\
-	error("%s", buf);				\
-}
-#define warnx3(a, b, c) {				\
-	char buf[64];					\
-	(void)snprintf(buf, sizeof(buf), a, b, c);	\
-	error("%s", buf);				\
-}
+#define warnx(...) do {					\
+	out2fmt_flush("%s: ", commandname);		\
+	out2fmt_flush(__VA_ARGS__);			\
+	out2fmt_flush("\n");				\
+	} while (0)
+#define errx(exitstatus, ...) error(__VA_ARGS__)
 
 #else
 #undef NULL

Modified: projects/sv/bin/sh/expand.c
==============================================================================
--- projects/sv/bin/sh/expand.c	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/bin/sh/expand.c	Tue Dec 21 21:29:02 2010	(r216624)
@@ -132,11 +132,22 @@ collate_range_cmp(int c1, int c2)
 void
 expandhere(union node *arg, int fd)
 {
-	herefd = fd;
 	expandarg(arg, (struct arglist *)NULL, 0);
 	xwrite(fd, stackblock(), expdest - stackblock());
 }
 
+static char *
+stputs_quotes(const char *data, const char *syntax, char *p)
+{
+	while (*data) {
+		CHECKSTRSPACE(2, p);
+		if (syntax[(int)*data] == CCTL)
+			USTPUTC(CTLESC, p);
+		USTPUTC(*data++, p);
+	}
+	return (p);
+}
+#define STPUTS_QUOTES(data, syntax, p) p = stputs_quotes((data), syntax, p)
 
 /*
  * Perform expansions on an argument, placing the resulting list of arguments
@@ -334,11 +345,10 @@ done:
 	if (*home == '\0')
 		goto lose;
 	*p = c;
-	while ((c = *home++) != '\0') {
-		if (quotes && SQSYNTAX[(int)c] == CCTL)
-			STPUTC(CTLESC, expdest);
-		STPUTC(c, expdest);
-	}
+	if (quotes)
+		STPUTS_QUOTES(home, SQSYNTAX, expdest);
+	else
+		STPUTS(home, expdest);
 	return (p);
 lose:
 	*p = c;
@@ -458,7 +468,6 @@ expbackq(union node *cmd, int quoted, in
 	char lastc;
 	int startloc = dest - stackblock();
 	char const *syntax = quoted? DQSYNTAX : BASESYNTAX;
-	int saveherefd;
 	int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);
 	int nnl;
 
@@ -466,15 +475,12 @@ expbackq(union node *cmd, int quoted, in
 	saveifs = ifsfirst;
 	savelastp = ifslastp;
 	saveargbackq = argbackq;
-	saveherefd = herefd;
-	herefd = -1;
 	p = grabstackstr(dest);
 	evalbackcmd(cmd, &in);
 	ungrabstackstr(p, dest);
 	ifsfirst = saveifs;
 	ifslastp = savelastp;
 	argbackq = saveargbackq;
-	herefd = saveherefd;
 
 	p = in.buf;
 	lastc = '\0';
@@ -493,8 +499,6 @@ expbackq(union node *cmd, int quoted, in
 		}
 		lastc = *p++;
 		if (lastc != '\0') {
-			if (quotes && syntax[(int)lastc] == CCTL)
-				STPUTC(CTLESC, dest);
 			if (lastc == '\n') {
 				nnl++;
 			} else {
@@ -502,6 +506,8 @@ expbackq(union node *cmd, int quoted, in
 					nnl--;
 					STPUTC('\n', dest);
 				}
+				if (quotes && syntax[(int)lastc] == CCTL)
+					STPUTC(CTLESC, dest);
 				STPUTC(lastc, dest);
 			}
 		}
@@ -533,16 +539,13 @@ subevalvar(char *p, char *str, int strlo
 	char *loc = NULL;
 	char *q;
 	int c = 0;
-	int saveherefd = herefd;
 	struct nodelist *saveargbackq = argbackq;
 	int amount;
 
-	herefd = -1;
 	argstr(p, (subtype == VSTRIMLEFT || subtype == VSTRIMLEFTMAX ||
 	    subtype == VSTRIMRIGHT || subtype == VSTRIMRIGHTMAX ?
 	    EXP_CASE : 0) | EXP_TILDE);
 	STACKSTRNUL(expdest);
-	herefd = saveherefd;
 	argbackq = saveargbackq;
 	startp = stackblock() + startloc;
 	if (str == NULL)
@@ -554,8 +557,6 @@ subevalvar(char *p, char *str, int strlo
 		amount = startp - expdest;
 		STADJUST(amount, expdest);
 		varflags &= ~VSNUL;
-		if (c != 0)
-			*loc = c;
 		return 1;
 
 	case VSQUESTION:
@@ -723,12 +724,10 @@ again: /* jump here after setting a vari
 					varlen++;
 			}
 			else {
-				while (*val) {
-					if (quotes &&
-					    syntax[(int)*val] == CCTL)
-						STPUTC(CTLESC, expdest);
-					STPUTC(*val++, expdest);
-				}
+				if (quotes)
+					STPUTS_QUOTES(val, syntax, expdest);
+				else
+					STPUTS(val, expdest);
 
 			}
 		}
@@ -877,7 +876,14 @@ varisset(char *name, int nulok)
 	return 1;
 }
 
-
+static void
+strtodest(const char *p, int flag, int subtype, int quoted)
+{
+	if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH)
+		STPUTS_QUOTES(p, quoted ? DQSYNTAX : BASESYNTAX, expdest);
+	else
+		STPUTS(p, expdest);
+}
 
 /*
  * Add the value of a specialized variable to the stack string.
@@ -891,21 +897,6 @@ varvalue(char *name, int quoted, int sub
 	int i;
 	char sep;
 	char **ap;
-	char const *syntax;
-
-#define STRTODEST(p) \
-	do {\
-	if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) { \
-		syntax = quoted? DQSYNTAX : BASESYNTAX; \
-		while (*p) { \
-			if (syntax[(int)*p] == CCTL) \
-				STPUTC(CTLESC, expdest); \
-			STPUTC(*p++, expdest); \
-		} \
-	} else \
-		STPUTS(p, expdest); \
-	} while (0)
-
 
 	switch (*name) {
 	case '$':
@@ -931,7 +922,7 @@ numvar:
 	case '@':
 		if (flag & EXP_FULL && quoted) {
 			for (ap = shellparam.p ; (p = *ap++) != NULL ; ) {
-				STRTODEST(p);
+				strtodest(p, flag, subtype, quoted);
 				if (*ap)
 					STPUTC('\0', expdest);
 			}
@@ -944,21 +935,21 @@ numvar:
 		else
 			sep = ' ';
 		for (ap = shellparam.p ; (p = *ap++) != NULL ; ) {
-			STRTODEST(p);
+			strtodest(p, flag, subtype, quoted);
 			if (*ap && sep)
 				STPUTC(sep, expdest);
 		}
 		break;
 	case '0':
 		p = arg0;
-		STRTODEST(p);
+		strtodest(p, flag, subtype, quoted);
 		break;
 	default:
 		if (is_digit(*name)) {
 			num = atoi(name);
 			if (num > 0 && num <= shellparam.nparam) {
 				p = shellparam.p[num - 1];
-				STRTODEST(p);
+				strtodest(p, flag, subtype, quoted);
 			}
 		}
 		break;

Modified: projects/sv/bin/sh/jobs.c
==============================================================================
--- projects/sv/bin/sh/jobs.c	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/bin/sh/jobs.c	Tue Dec 21 21:29:02 2010	(r216624)
@@ -153,10 +153,8 @@ out:				out2fmt_flush("sh: can't access 
 				mflag = 0;
 				return;
 			}
-			if (initialpgrp == -1)
-				initialpgrp = getpgrp();
-			else if (initialpgrp != getpgrp()) {
-				killpg(0, SIGTTIN);
+			if (initialpgrp != getpgrp()) {
+				kill(0, SIGTTIN);
 				continue;
 			}
 		} while (0);
@@ -222,7 +220,6 @@ fgcmd(int argc __unused, char **argv)
 int
 bgcmd(int argc, char **argv)
 {
-	char s[64];
 	struct job *jp;
 
 	do {
@@ -233,8 +230,7 @@ bgcmd(int argc, char **argv)
 			continue;
 		restartjob(jp);
 		jp->foreground = 0;
-		fmtstr(s, 64, "[%td] ", jp - jobtab + 1);
-		out1str(s);
+		out1fmt("[%td] ", jp - jobtab + 1);
 		printjobcmd(jp);
 	} while (--argc > 1);
 	return 0;
@@ -251,7 +247,7 @@ restartjob(struct job *jp)
 		return;
 	setcurjob(jp);
 	INTOFF;
-	killpg(jp->ps[0].pid, SIGCONT);
+	kill(-jp->ps[0].pid, SIGCONT);
 	for (ps = jp->ps, i = jp->nprocs ; --i >= 0 ; ps++) {
 		if (WIFSTOPPED(ps->status)) {
 			ps->status = -1;
@@ -951,9 +947,7 @@ waitforjob(struct job *jp, int *origstat
 	if (! JOBS || jp->state == JOBDONE)
 		freejob(jp);
 	if (int_pending()) {
-		if (WIFSIGNALED(status) && WTERMSIG(status) == SIGINT)
-			kill(getpid(), SIGINT);
-		else
+		if (!WIFSIGNALED(status) || WTERMSIG(status) != SIGINT)
 			CLEAR_PENDING_INT;
 	}
 #if JOBS

Modified: projects/sv/bin/sh/memalloc.c
==============================================================================
--- projects/sv/bin/sh/memalloc.c	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/bin/sh/memalloc.c	Tue Dec 21 21:29:02 2010	(r216624)
@@ -128,7 +128,6 @@ static struct stackmark *markp;
 char *stacknxt;
 int stacknleft;
 int sstrnleft;
-int herefd = -1;
 
 
 static void
@@ -309,11 +308,6 @@ growstackstr(void)
 	int len;
 
 	len = stackblocksize();
-	if (herefd >= 0 && len >= 1024) {
-		xwrite(herefd, stackblock(), len);
-		sstrnleft = len;
-		return stackblock();
-	}
 	return growstrstackblock(len);
 }
 

Modified: projects/sv/bin/sh/memalloc.h
==============================================================================
--- projects/sv/bin/sh/memalloc.h	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/bin/sh/memalloc.h	Tue Dec 21 21:29:02 2010	(r216624)
@@ -46,7 +46,6 @@ struct stackmark {
 extern char *stacknxt;
 extern int stacknleft;
 extern int sstrnleft;
-extern int herefd;
 
 pointer ckmalloc(size_t);
 pointer ckrealloc(pointer, int);

Modified: projects/sv/bin/sh/output.c
==============================================================================
--- projects/sv/bin/sh/output.c	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/bin/sh/output.c	Tue Dec 21 21:29:02 2010	(r216624)
@@ -64,8 +64,7 @@ __FBSDID("$FreeBSD$");
 
 
 #define OUTBUFSIZ BUFSIZ
-#define BLOCK_OUT -2		/* output to a fixed block of memory */
-#define MEM_OUT -3		/* output to dynamically allocated memory */
+#define MEM_OUT -2		/* output to dynamically allocated memory */
 #define OUTPUT_ERR 01		/* error occurred on output */
 
 static int doformat_wr(void *, const char *, int);
@@ -180,18 +179,12 @@ outbin(const void *data, size_t len, str
 		outc(*p++, file);
 }
 
-static char out_junk[16];
-
 void
 emptyoutbuf(struct output *dest)
 {
 	int offset;
 
-	if (dest->fd == BLOCK_OUT) {
-		dest->nextc = out_junk;
-		dest->nleft = sizeof out_junk;
-		dest->flags |= OUTPUT_ERR;
-	} else if (dest->buf == NULL) {
+	if (dest->buf == NULL) {
 		INTOFF;
 		dest->buf = ckmalloc(dest->bufsize);
 		dest->nextc = dest->buf;
@@ -282,18 +275,12 @@ void
 fmtstr(char *outbuf, int length, const char *fmt, ...)
 {
 	va_list ap;
-	struct output strout;
 
-	strout.nextc = outbuf;
-	strout.nleft = length;
-	strout.fd = BLOCK_OUT;
-	strout.flags = 0;
+	INTOFF;
 	va_start(ap, fmt);
-	doformat(&strout, fmt, ap);
+	vsnprintf(outbuf, length, fmt, ap);
 	va_end(ap);
-	outc('\0', &strout);
-	if (strout.flags & OUTPUT_ERR)
-		outbuf[length - 1] = '\0';
+	INTON;
 }
 
 static int

Modified: projects/sv/bin/sh/parser.c
==============================================================================
--- projects/sv/bin/sh/parser.c	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/bin/sh/parser.c	Tue Dec 21 21:29:02 2010	(r216624)
@@ -887,8 +887,6 @@ xxreadtoken(void)
 	startlinno = plinno;
 	for (;;) {	/* until token or start of word found */
 		c = pgetc_macro();
-		if (c == ' ' || c == '\t')
-			continue;		/* quick check for white space first */
 		switch (c) {
 		case ' ': case '\t':
 			continue;

Modified: projects/sv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Tue Dec 21 21:29:02 2010	(r216624)
@@ -48,11 +48,13 @@
 
 static int read_efi_label(nvlist_t *config, diskaddr_t *sb);
 
+#ifdef sun
 #if defined(__i386) || defined(__amd64)
 #define	BOOTCMD	"installgrub(1M)"
 #else
 #define	BOOTCMD	"installboot(1M)"
 #endif
+#endif	/* sun */
 
 /*
  * ====================================================================
@@ -1889,14 +1891,15 @@ zpool_vdev_attach(zpool_handle_t *zhp,
 
 	if (ret == 0) {
 		if (rootpool) {
-			/*
-			 * XXX - This should be removed once we can
-			 * automatically install the bootblocks on the
-			 * newly attached disk.
-			 */
-			(void) fprintf(stderr, dgettext(TEXT_DOMAIN, "Please "
-			    "be sure to invoke %s to make '%s' bootable.\n"),
-			    BOOTCMD, new_disk);
+			(void) fprintf(stderr, dgettext(TEXT_DOMAIN, "If "
+			    "you boot from pool '%s', you may need to update\n"
+			    "boot code on newly attached disk '%s'.\n\n"
+			    "Assuming you use GPT partitioning and 'da0' is "
+			    "your new boot disk\n"
+			    "you may use the following command:\n\n"
+			    "\tgpart bootcode -b /boot/pmbr -p "
+			    "/boot/gptzfsboot -i 1 da0\n\n"),
+			    zhp->zpool_name, new_disk);
 		}
 		return (0);
 	}

Modified: projects/sv/contrib/bsnmp/lib/asn1.c
==============================================================================
--- projects/sv/contrib/bsnmp/lib/asn1.c	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/contrib/bsnmp/lib/asn1.c	Tue Dec 21 21:29:02 2010	(r216624)
@@ -196,7 +196,7 @@ asn_put_temp_header(struct asn_buf *b, u
 	return (ret);
 }
 enum asn_err
-asn_commit_header(struct asn_buf *b, u_char *ptr)
+asn_commit_header(struct asn_buf *b, u_char *ptr, size_t *moved)
 {
 	asn_len_t len;
 	u_int lenlen, shift;
@@ -215,6 +215,8 @@ asn_commit_header(struct asn_buf *b, u_c
 		memmove(ptr + 1 + lenlen, ptr + TEMP_LEN, len);
 		b->asn_ptr -= shift;
 		b->asn_len += shift;
+		if (moved != NULL)
+			*moved = shift;
 	}
 	return (ASN_ERR_OK);
 }
@@ -913,6 +915,20 @@ asn_skip(struct asn_buf *b, asn_len_t le
 }
 
 /*
+ * Add a padding
+ */
+enum asn_err
+asn_pad(struct asn_buf *b, asn_len_t len)
+{
+	if (b->asn_len < len)
+		return (ASN_ERR_EOBUF);
+	b->asn_ptr += len;
+	b->asn_len -= len;
+
+	return (ASN_ERR_OK);
+}
+
+/*
  * Compare two OIDs.
  *
  * o1 < o2 : -1

Modified: projects/sv/contrib/bsnmp/lib/asn1.h
==============================================================================
--- projects/sv/contrib/bsnmp/lib/asn1.h	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/contrib/bsnmp/lib/asn1.h	Tue Dec 21 21:29:02 2010	(r216624)
@@ -93,7 +93,7 @@ enum asn_err asn_get_header(struct asn_b
 enum asn_err asn_put_header(struct asn_buf *, u_char, asn_len_t);
 
 enum asn_err asn_put_temp_header(struct asn_buf *, u_char, u_char **);
-enum asn_err asn_commit_header(struct asn_buf *, u_char *);
+enum asn_err asn_commit_header(struct asn_buf *, u_char *, size_t *);
 
 enum asn_err asn_get_integer_raw(struct asn_buf *, asn_len_t, int32_t *);
 enum asn_err asn_get_integer(struct asn_buf *, int32_t *);
@@ -129,6 +129,7 @@ enum asn_err asn_get_timeticks(struct as
 enum asn_err asn_put_timeticks(struct asn_buf *, uint32_t);
 
 enum asn_err asn_skip(struct asn_buf *, asn_len_t);
+enum asn_err asn_pad(struct asn_buf *, asn_len_t);
 
 /*
  * Utility functions for OIDs

Modified: projects/sv/contrib/bsnmp/lib/bsnmpclient.3
==============================================================================
--- projects/sv/contrib/bsnmp/lib/bsnmpclient.3	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/contrib/bsnmp/lib/bsnmpclient.3	Tue Dec 21 21:29:02 2010	(r216624)
@@ -31,7 +31,7 @@
 .\"
 .\" $Begemot: bsnmp/lib/bsnmpclient.3,v 1.12 2005/10/04 08:46:50 brandt_h Exp $
 .\"
-.Dd October 4, 2005
+.Dd September 9, 2010
 .Dt BSNMPCLIENT 3
 .Os
 .Sh NAME
@@ -52,7 +52,8 @@
 .Nm snmp_table_cb_f ,
 .Nm snmp_table_fetch ,
 .Nm snmp_table_fetch_async ,
-.Nm snmp_dialog
+.Nm snmp_dialog ,
+.Nm snmp_discover_engine
 .Nd "SNMP client library"
 .Sh LIBRARY
 Begemot SNMP library
@@ -102,44 +103,56 @@ Begemot SNMP library
 .Fn snmp_table_fetch_async "const struct snmp_table *descr" "void *list" "snmp_table_cb_f callback" "void *uarg"
 .Ft int
 .Fn snmp_dialog "struct snmp_pdu *req" "struct snmp_pdu *resp"
+.Ft int
+.Fn snmp_discover_engine "void"
 .Sh DESCRIPTION
 The SNMP library contains routines to easily build SNMP client applications
-that use SNMP versions 1 or 2.
+that use SNMP versions 1, 2 or 3.
 Most of the routines use a
 .Vt struct snmp_client :
 .Bd -literal -offset indent
 struct snmp_client {
-	enum snmp_version version;
-	int	trans;	/* transport type to use */
+	enum snmp_version	version;
+	int			trans;	/* which transport to use */
 
 	/* these two are read-only for the application */
-	char	*cport;	/* port number as string */
-	char	*chost;	/* host name or IP address as string */
+	char			*cport;	/* port number as string */
+	char			*chost;	/* host name or IP address as string */
+
+	char			read_community[SNMP_COMMUNITY_MAXLEN + 1];
+	char			write_community[SNMP_COMMUNITY_MAXLEN + 1];
+
+	/* SNMPv3 specific fields */
+	int32_t			identifier;
+	int32_t			security_model;
+	struct snmp_engine	engine;
+	struct snmp_user	user;
 
-	char	read_community[SNMP_COMMUNITY_MAXLEN + 1];
-	char	write_community[SNMP_COMMUNITY_MAXLEN + 1];
+	/* SNMPv3 Access control - VACM*/
+	uint32_t		clen;
+	uint8_t			cengine[SNMP_ENGINE_ID_SIZ];
+	char			cname[SNMP_CONTEXT_NAME_SIZ];
 
-	struct timeval	timeout;
-	u_int	retries;
+	struct timeval		timeout;
+	u_int			retries;
 
-	int	dump_pdus;
+	int			dump_pdus;
 
-	size_t	txbuflen;
-	size_t	rxbuflen;
+	size_t			txbuflen;
+	size_t			rxbuflen;
 
-	int	fd;
+	int			fd;
 
-	int32_t	next_reqid;
-	int32_t	max_reqid;
-	int32_t	min_reqid;
+	int32_t			next_reqid;
+	int32_t			max_reqid;
+	int32_t			min_reqid;
 
-	char	error[SNMP_STRERROR_LEN];
+	char			error[SNMP_STRERROR_LEN];
 
-	snmp_timeout_start_f timeout_start;
-	snmp_timeout_stop_f timeout_stop;
+	snmp_timeout_start_f	timeout_start;
+	snmp_timeout_stop_f	timeout_stop;
 
-	/* private */
-	char	local_path[sizeof(SNMP_LOCAL_PATH)];
+	char			local_path[sizeof(SNMP_LOCAL_PATH)];
 };
 .Ed
 .Pp
@@ -194,6 +207,23 @@ The default is
 The community name to be used for SET requests.
 The default is
 .Sq private .
+.It Va identifier
+The message indentifier value to be used with SNMPv3 PDUs. Incremented with
+each transmitted PDU.
+.It Va security_model
+The security model to be used with SNMPv3 PDUs. Currently only User-Based
+Security model specified by RFC 3414 (value 3) is supported.
+.It Va engine
+The authorative SNMP engine parameters to be used with SNMPv3 PDUs.
+.It Va user
+The USM SNMP user credentials to be used with SNMPv3 PDUs.
+.It Va clen
+The length of the context engine id to be used with SNMPv3 PDUs.
+.It Va cengine
+The context engine id to be used with SNMPv3 PDUs. Default is empty.
+.It Va cname
+The context name to be used with SNMPv3 PDUs. Default is
+.Sq "" .
 .It Va timeout
 The maximum time to wait for responses to requests.
 If the time elapses, the request is resent up to
@@ -617,6 +647,21 @@ returns -1.
 If a response was received 0 is returned.
 .Pp
 The function
+.Fn snmp_discover_engine
+is used to discover the authorative snmpEngineId of a remote SNMPv3 agent.
+A request PDU with empty USM user name is sent and the client's engine
+parameters are set according to the snmpEngine parameters received in the
+response PDU.
+If the client is configured to use authentication and/or privacy and the
+snmpEngineBoots and/or snmpEngineTime in the response had zero values, an
+additional request (possibly encrypted) with the appropriate user credentials
+is sent to fetch the missing values.
+Note, that the function blocks until the discovery proccess is completed.
+If no response could be received after all timeouts and retries, or the
+response contained errors the function returns -1.
+If the discovery proccess was completed 0 is returned.
+.Pp
+The function
 .Fn snmp_parse_server
 is used to parse an SNMP server specification string and fill in the
 fields of a

Modified: projects/sv/contrib/bsnmp/lib/bsnmplib.3
==============================================================================
--- projects/sv/contrib/bsnmp/lib/bsnmplib.3	Tue Dec 21 21:12:18 2010	(r216623)
+++ projects/sv/contrib/bsnmp/lib/bsnmplib.3	Tue Dec 21 21:29:02 2010	(r216624)
@@ -1,4 +1,10 @@
 .\"
+.\" Copyright (c) 2010 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" Portions of this documentation were written by Shteryana Sotirova Shopova
+.\" under sponsorship from the FreeBSD Foundation.
+.\"
 .\" Copyright (c) 2004-2005
 .\"	Hartmut Brandt.
 .\"	All rights reserved.
@@ -31,7 +37,7 @@
 .\"
 .\" $Begemot: bsnmp/lib/bsnmplib.3,v 1.9 2005/10/04 08:46:51 brandt_h Exp $
 .\"
-.Dd October 4, 2005
+.Dd December 19, 2010
 .Dt BSNMPLIB 3
 .Os
 .Sh NAME
@@ -39,9 +45,16 @@
 .Nm snmp_value_parse ,
 .Nm snmp_value_copy ,
 .Nm snmp_pdu_free ,
-.Nm snmp_code snmp_pdu_decode ,
-.Nm snmp_code snmp_pdu_encode ,
+.Nm snmp_pdu_decode ,
+.Nm snmp_pdu_encode ,
+.Nm snmp_pdu_decode_header ,
+.Nm snmp_pdu_decode_scoped ,
+.Nm snmp_pdu_decode_secmode ,
+.Nm snmp_pdu_init_secparams ,
 .Nm snmp_pdu_dump ,
+.Nm snmp_passwd_to_keys ,
+.Nm snmp_get_local_keys ,
+.Nm snmp_calc_keychange ,
 .Nm TRUTH_MK ,
 .Nm TRUTH_GET ,
 .Nm TRUTH_OK
@@ -64,8 +77,22 @@ Begemot SNMP library
 .Fn snmp_pdu_decode "struct asn_buf *buf" "struct snmp_pdu *pdu" "int32_t *ip"
 .Ft enum snmp_code
 .Fn snmp_pdu_encode "struct snmp_pdu *pdu" "struct asn_buf *buf"
+.Ft enum snmp_code
+.Fn snmp_pdu_decode_header "struct snmp_pdu *pdu" "struct asn_buf *buf"
+.Ft enum snmp_code
+.Fn snmp_pdu_decode_scoped "struct asn_buf *buf" "struct snmp_pdu *pdu" "int32_t *ip"
+.Ft enum snmp_code
+.Fn snmp_pdu_decode_secmode "struct asn_buf *buf" "struct snmp_pdu *pdu"
+.Ft void
+.Fn snmp_pdu_init_secparams "struct snmp_pdu *pdu"
 .Ft void
 .Fn snmp_pdu_dump "const struct snmp_pdu *pdu"
+.Ft enum snmp_code
+.Fn snmp_passwd_to_keys "struct snmp_user *user" "char *passwd"
+.Ft enum snmp_code
+.Fn snmp_get_local_keys "struct snmp_user *user" "uint8_t *eid" "uint32_t elen"
+.Ft enum snmp_code
+.Fn snmp_calc_keychange "struct snmp_user *user" "uint8_t *keychange"
 .Ft int
 .Fn TRUTH_MK "F"
 .Ft int
@@ -73,8 +100,8 @@ Begemot SNMP library
 .Ft int
 .Fn TRUTH_OK "T"
 .Sh DESCRIPTION
-The SNMP library contains routines to handle SNMP version 1 and 2 PDUs.
-There are two basic structures used throughout the library:
+The SNMP library contains routines to handle SNMP version 1, 2 and 3 PDUs.
+There are several basic structures used throughout the library:
 .Bd -literal -offset indent
 struct snmp_value {
 	struct asn_oid		var;
@@ -134,34 +161,134 @@ is not zero,
 .Fa v.octetstring.octets
 points to a string allocated by
 .Xr malloc 3 .
+.Pp
+.Bd -literal -offset indent
+#define	SNMP_ENGINE_ID_SIZ		32
+
+struct snmp_engine {
+	uint8_t			engine_id[SNMP_ENGINE_ID_SIZ];
+	uint32_t		engine_len;
+	int32_t			engine_boots;
+	int32_t			engine_time;
+	int32_t			max_msg_size;
+};
+.Ed
+.Pp
+This structure represents an SNMP engine as specified by the SNMP Management
+Architecture described in RFC 3411.
+.Pp
+.Bd -literal -offset indent
+#define	SNMP_ADM_STR32_SIZ		(32 + 1)
+#define	SNMP_AUTH_KEY_SIZ		40
+#define	SNMP_PRIV_KEY_SIZ		32
+
+enum snmp_usm_level {
+	SNMP_noAuthNoPriv = 1,
+	SNMP_authNoPriv = 2,
+	SNMP_authPriv = 3
+};
+
+struct snmp_user {
+	char				sec_name[SNMP_ADM_STR32_SIZ];
+	enum snmp_authentication	auth_proto;
+	enum snmp_privacy		priv_proto;
+	uint8_t				auth_key[SNMP_AUTH_KEY_SIZ];
+	uint8_t				priv_key[SNMP_PRIV_KEY_SIZ];
+};
+.Ed
+.Pp
+This structure represents an SNMPv3 user as specified by the User-based
+Security Model (USM) described in RFC 3414. The field
+.Fa sec_name
+is a human readable string containing the security user name.
+.Fa auth_proto
+contains the id of the authentication protocol in use by the user and may be one
+of:
+.Bd -literal -offset indent
+enum snmp_authentication {
+	SNMP_AUTH_NOAUTH = 0,
+	SNMP_AUTH_HMAC_MD5,
+	SNMP_AUTH_HMAC_SHA
+};
+.Ed
+.Fa priv_proto
+contains the id of the privacy protocol in use by the user and may be one
+of:
+.Bd -literal -offset indent
+enum snmp_privacy {
+	SNMP_PRIV_NOPRIV = 0,
+	SNMP_PRIV_DES = 1,
+	SNMP_PRIV_AES
+};
+.Ed
+.Fa auth_key
+and
+.Fa priv_key
+contain the authentication and privacy keys for the user.
+.Pp
 .Bd -literal -offset indent
-#define SNMP_COMMUNITY_MAXLEN	128
-#define SNMP_MAX_BINDINGS	100
+#define SNMP_COMMUNITY_MAXLEN		128
+#define SNMP_MAX_BINDINGS		100
+#define	SNMP_CONTEXT_NAME_SIZ		(32 + 1)
+#define	SNMP_TIME_WINDOW		150
+
+#define	SNMP_USM_AUTH_SIZE		12
+#define	SNMP_USM_PRIV_SIZE		8
+
+#define	SNMP_MSG_AUTH_FLAG		0x1
+#define	SNMP_MSG_PRIV_FLAG		0x2
+#define	SNMP_MSG_REPORT_FLAG		0x4
+
+#define	SNMP_MPM_SNMP_V1		0
+#define	SNMP_MPM_SNMP_V2c		1
+#define	SNMP_MPM_SNMP_V3		3
 
 struct snmp_pdu {
-	char		community[SNMP_COMMUNITY_MAXLEN + 1];
-	enum snmp_version version;
-	u_int		type;
+	char			community[SNMP_COMMUNITY_MAXLEN + 1];
+	enum snmp_version	version;
+	u_int			type;
+
+	/* SNMPv3 PDU header fields */
+	int32_t			identifier;
+	uint8_t			flags;
+	int32_t			security_model;
+	struct snmp_engine	engine;
+
+	/* Associated USM user parameters */
+	struct snmp_user	user;
+	uint8_t			msg_digest[SNMP_USM_AUTH_SIZE];
+	uint8_t			msg_salt[SNMP_USM_PRIV_SIZE];
+
+	/*  View-based Access Model */
+	uint32_t		context_engine_len;
+	uint8_t			context_engine[SNMP_ENGINE_ID_SIZ];
+	char			context_name[SNMP_CONTEXT_NAME_SIZ];
 
 	/* trap only */
-	struct asn_oid	enterprise;
-	u_char		agent_addr[4];
-	int32_t		generic_trap;
-	int32_t		specific_trap;
-	u_int32_t	time_stamp;
+	struct asn_oid		enterprise;
+	u_char			agent_addr[4];
+	int32_t			generic_trap;
+	int32_t			specific_trap;
+	uint32_t		time_stamp;
 
 	/* others */
-	int32_t		request_id;
-	int32_t		error_status;
-	int32_t		error_index;
+	int32_t			request_id;
+	int32_t			error_status;
+	int32_t			error_index;
 
 	/* fixes for encoding */
-	u_char		*outer_ptr;
-	u_char		*pdu_ptr;
-	u_char		*vars_ptr;
+	size_t			outer_len;
+	size_t			scoped_len;
+	u_char			*outer_ptr;
+	u_char			*digest_ptr;
+	u_char			*encrypted_ptr;
+	u_char			*scoped_ptr;
+	u_char			*pdu_ptr;
+	u_char			*vars_ptr;
 
-	struct snmp_value bindings[SNMP_MAX_BINDINGS];
-	u_int		nbindings;
+
+	struct snmp_value	bindings[SNMP_MAX_BINDINGS];
+	u_int			nbindings;
 };
 .Ed
 This structure contains a decoded SNMP PDU.
@@ -172,11 +299,25 @@ enum snmp_version {
 	SNMP_Verr = 0,
 	SNMP_V1 = 1,
 	SNMP_V2c,
+	SNMP_V3
 };
 .Ed
 and
 .Fa type
 is the type of the PDU.
+.Fa security_model
+is the security model used for SNMPv3 PDUs. The only supported

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

More information about the svn-src-projects mailing list