svn commit: r240222 - in projects/fuse: . bin/cat bin/cp bin/date bin/dd bin/getfacl bin/mv bin/setfacl cddl/contrib/dtracetoolkit cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs ...

Fri Sep 7 23:18:15 UTC 2012

Author: attilio
Date: Fri Sep  7 23:18:13 2012
New Revision: 240222
URL: http://svn.freebsd.org/changeset/base/240222

Log:
  MFC

Added:
     - copied from r240221, head/contrib/atf/
  projects/fuse/lib/libpmc/pmc.ivybridge.3
     - copied unchanged from r240221, head/lib/libpmc/pmc.ivybridge.3
  projects/fuse/sys/dev/random/ivy.c
     - copied unchanged from r240221, head/sys/dev/random/ivy.c
  projects/fuse/sys/libkern/jenkins_hash.c
     - copied unchanged from r240221, head/sys/libkern/jenkins_hash.c
  projects/fuse/sys/modules/ct/
     - copied from r240221, head/sys/modules/ct/
Directory Properties:
  projects/fuse/contrib/atf/   (props changed)
Deleted:
  projects/fuse/crypto/openssh/version.c
  projects/fuse/sys/dev/random/nehemiah.h
  projects/fuse/sys/libkern/jenkins.h
  projects/fuse/sys/sys/device_port.h
Modified:
  projects/fuse/Makefile.inc1
  projects/fuse/bin/cat/cat.1
  projects/fuse/bin/cp/cp.1
  projects/fuse/bin/date/date.c
  projects/fuse/bin/dd/dd.c
  projects/fuse/bin/dd/misc.c
  projects/fuse/bin/getfacl/getfacl.1
  projects/fuse/bin/mv/mv.1
  projects/fuse/bin/mv/mv.c
  projects/fuse/bin/setfacl/merge.c
  projects/fuse/bin/setfacl/setfacl.1
  projects/fuse/bin/setfacl/setfacl.c
  projects/fuse/cddl/contrib/dtracetoolkit/execsnoop
  projects/fuse/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  projects/fuse/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/fuse/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5
  projects/fuse/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  projects/fuse/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/fuse/cddl/lib/libdtrace/psinfo.d
  projects/fuse/cddl/usr.bin/ctfconvert/ctfconvert.1
  projects/fuse/cddl/usr.bin/ctfmerge/ctfmerge.1
  projects/fuse/cddl/usr.sbin/dtruss/dtruss.1
  projects/fuse/cddl/usr.sbin/plockstat/plockstat.1
  projects/fuse/contrib/binutils/binutils/readelf.c
  projects/fuse/contrib/bsnmp/snmpd/trap.c
  projects/fuse/contrib/dtc/dtc-lexer.l
  projects/fuse/contrib/gdb/gdb/dwarf2loc.h
  projects/fuse/crypto/openssh/ChangeLog
  projects/fuse/crypto/openssh/INSTALL
  projects/fuse/crypto/openssh/LICENCE
  projects/fuse/crypto/openssh/PROTOCOL.certkeys
  projects/fuse/crypto/openssh/PROTOCOL.mux
  projects/fuse/crypto/openssh/README
  projects/fuse/crypto/openssh/addrmatch.c
  projects/fuse/crypto/openssh/audit-bsm.c
  projects/fuse/crypto/openssh/auth-krb5.c
  projects/fuse/crypto/openssh/auth-options.c
  projects/fuse/crypto/openssh/auth-passwd.c
  projects/fuse/crypto/openssh/auth.c
  projects/fuse/crypto/openssh/auth2-pubkey.c
  projects/fuse/crypto/openssh/auth2.c
  projects/fuse/crypto/openssh/authfile.c
  projects/fuse/crypto/openssh/channels.c
  projects/fuse/crypto/openssh/channels.h
  projects/fuse/crypto/openssh/clientloop.c
  projects/fuse/crypto/openssh/clientloop.h
  projects/fuse/crypto/openssh/compat.c
  projects/fuse/crypto/openssh/compat.h
  projects/fuse/crypto/openssh/config.h.in
  projects/fuse/crypto/openssh/defines.h
  projects/fuse/crypto/openssh/dh.c
  projects/fuse/crypto/openssh/dns.c
  projects/fuse/crypto/openssh/dns.h
  projects/fuse/crypto/openssh/entropy.c
  projects/fuse/crypto/openssh/entropy.h
  projects/fuse/crypto/openssh/jpake.c
  projects/fuse/crypto/openssh/kex.c
  projects/fuse/crypto/openssh/key.c
  projects/fuse/crypto/openssh/key.h
  projects/fuse/crypto/openssh/mac.c
  projects/fuse/crypto/openssh/misc.c
  projects/fuse/crypto/openssh/moduli
  projects/fuse/crypto/openssh/moduli.c
  projects/fuse/crypto/openssh/monitor.c
  projects/fuse/crypto/openssh/mux.c
  projects/fuse/crypto/openssh/myproposal.h
  projects/fuse/crypto/openssh/openbsd-compat/bsd-cygwin_util.c
  projects/fuse/crypto/openssh/openbsd-compat/bsd-cygwin_util.h
  projects/fuse/crypto/openssh/openbsd-compat/bsd-misc.h
  projects/fuse/crypto/openssh/openbsd-compat/getcwd.c
  projects/fuse/crypto/openssh/openbsd-compat/getgrouplist.c
  projects/fuse/crypto/openssh/openbsd-compat/getrrsetbyname.c
  projects/fuse/crypto/openssh/openbsd-compat/glob.c
  projects/fuse/crypto/openssh/openbsd-compat/inet_ntop.c
  projects/fuse/crypto/openssh/openbsd-compat/mktemp.c
  projects/fuse/crypto/openssh/openbsd-compat/openbsd-compat.h
  projects/fuse/crypto/openssh/openbsd-compat/openssl-compat.h
  projects/fuse/crypto/openssh/openbsd-compat/port-linux.c
  projects/fuse/crypto/openssh/openbsd-compat/setenv.c
  projects/fuse/crypto/openssh/openbsd-compat/sha2.c
  projects/fuse/crypto/openssh/openbsd-compat/sha2.h
  projects/fuse/crypto/openssh/openbsd-compat/strlcpy.c
  projects/fuse/crypto/openssh/packet.c
  projects/fuse/crypto/openssh/packet.h
  projects/fuse/crypto/openssh/readconf.c
  projects/fuse/crypto/openssh/readconf.h
  projects/fuse/crypto/openssh/roaming.h
  projects/fuse/crypto/openssh/roaming_client.c
  projects/fuse/crypto/openssh/roaming_common.c
  projects/fuse/crypto/openssh/sandbox-rlimit.c
  projects/fuse/crypto/openssh/sandbox-systrace.c
  projects/fuse/crypto/openssh/scp.1
  projects/fuse/crypto/openssh/scp.c
  projects/fuse/crypto/openssh/servconf.c
  projects/fuse/crypto/openssh/servconf.h
  projects/fuse/crypto/openssh/serverloop.c
  projects/fuse/crypto/openssh/session.c
  projects/fuse/crypto/openssh/sftp-client.c
  projects/fuse/crypto/openssh/sftp-glob.c
  projects/fuse/crypto/openssh/sftp.1
  projects/fuse/crypto/openssh/sftp.c
  projects/fuse/crypto/openssh/ssh-add.1
  projects/fuse/crypto/openssh/ssh-add.c
  projects/fuse/crypto/openssh/ssh-ecdsa.c
  projects/fuse/crypto/openssh/ssh-keygen.1
  projects/fuse/crypto/openssh/ssh-keygen.c
  projects/fuse/crypto/openssh/ssh-pkcs11-client.c
  projects/fuse/crypto/openssh/ssh-pkcs11-helper.c
  projects/fuse/crypto/openssh/ssh.1
  projects/fuse/crypto/openssh/ssh.c
  projects/fuse/crypto/openssh/ssh_config
  projects/fuse/crypto/openssh/ssh_config.5
  projects/fuse/crypto/openssh/ssh_namespace.h
  projects/fuse/crypto/openssh/sshconnect.c
  projects/fuse/crypto/openssh/sshconnect2.c
  projects/fuse/crypto/openssh/sshd.8
  projects/fuse/crypto/openssh/sshd.c
  projects/fuse/crypto/openssh/sshd_config
  projects/fuse/crypto/openssh/sshd_config.5
  projects/fuse/crypto/openssh/umac.c
  projects/fuse/crypto/openssh/version.h
  projects/fuse/etc/rc.d/initrandom
  projects/fuse/etc/rc.d/sshd
  projects/fuse/include/rpc/auth.h
  projects/fuse/include/rpc/auth_unix.h
  projects/fuse/include/rpc/xdr.h
  projects/fuse/include/stdatomic.h
  projects/fuse/lib/libc/amd64/SYS.h
  projects/fuse/lib/libc/amd64/Symbol.map
  projects/fuse/lib/libc/amd64/gen/rfork_thread.S
  projects/fuse/lib/libc/amd64/sys/brk.S
  projects/fuse/lib/libc/amd64/sys/exect.S
  projects/fuse/lib/libc/amd64/sys/getcontext.S
  projects/fuse/lib/libc/amd64/sys/pipe.S
  projects/fuse/lib/libc/amd64/sys/ptrace.S
  projects/fuse/lib/libc/amd64/sys/reboot.S
  projects/fuse/lib/libc/amd64/sys/sbrk.S
  projects/fuse/lib/libc/amd64/sys/setlogin.S
  projects/fuse/lib/libc/amd64/sys/vfork.S
  projects/fuse/lib/libc/gen/sysctl.c
  projects/fuse/lib/libc/i386/SYS.h
  projects/fuse/lib/libc/i386/Symbol.map
  projects/fuse/lib/libc/i386/gen/rfork_thread.S
  projects/fuse/lib/libc/i386/sys/Ovfork.S
  projects/fuse/lib/libc/i386/sys/brk.S
  projects/fuse/lib/libc/i386/sys/cerror.S
  projects/fuse/lib/libc/i386/sys/exect.S
  projects/fuse/lib/libc/i386/sys/getcontext.S
  projects/fuse/lib/libc/i386/sys/ptrace.S
  projects/fuse/lib/libc/i386/sys/sbrk.S
  projects/fuse/lib/libc/i386/sys/syscall.S
  projects/fuse/lib/libc/rpc/auth_des.c
  projects/fuse/lib/libc/rpc/auth_unix.c
  projects/fuse/lib/libc/rpc/authunix_prot.c
  projects/fuse/lib/libc/rpc/clnt_perror.c
  projects/fuse/lib/libc/rpc/clnt_vc.c
  projects/fuse/lib/libc/rpc/rpc_generic.c
  projects/fuse/lib/libc/rpc/rpc_soc.3
  projects/fuse/lib/libc/rpc/rpcb_clnt.c
  projects/fuse/lib/libc/rpc/svc_auth_des.c
  projects/fuse/lib/libc/rpc/svc_auth_unix.c
  projects/fuse/lib/libc/rpc/svc_run.c
  projects/fuse/lib/libc/stdlib/rand.3
  projects/fuse/lib/libc/stdlib/random.3
  projects/fuse/lib/libc/sys/wait.2
  projects/fuse/lib/libpmc/Makefile
  projects/fuse/lib/libpmc/libpmc.c
  projects/fuse/lib/libpmc/pmc.sandybridge.3
  projects/fuse/lib/libproc/Makefile
  projects/fuse/lib/libproc/proc_sym.c
  projects/fuse/lib/libproc/test/t1-bkpt/t1-bkpt.c
  projects/fuse/lib/libproc/test/t3-name2sym/t3-name2sym.c
  projects/fuse/lib/libprocstat/libprocstat.h
  projects/fuse/libexec/rbootd/rbootd.c
  projects/fuse/libexec/rbootd/rmpproto.c
  projects/fuse/libexec/rpc.rstatd/rstat_proc.c
  projects/fuse/libexec/save-entropy/save-entropy.sh
  projects/fuse/release/picobsd/tinyware/login/pico-login.c
  projects/fuse/sbin/adjkerntz/adjkerntz.c
  projects/fuse/secure/lib/libssh/Makefile
  projects/fuse/share/man/man4/arcmsr.4
  projects/fuse/share/man/man4/random.4
  projects/fuse/share/man/man9/hash.9
  projects/fuse/sys/amd64/amd64/pmap.c
  projects/fuse/sys/amd64/conf/GENERIC
  projects/fuse/sys/amd64/conf/NOTES
  projects/fuse/sys/arm/arm/busdma_machdep.c
  projects/fuse/sys/arm/arm/pmap.c
  projects/fuse/sys/arm/include/pmap.h
  projects/fuse/sys/cam/scsi/scsi_low.c
  projects/fuse/sys/cam/scsi/scsi_low.h
  projects/fuse/sys/cam/scsi/scsi_low_pisa.c
  projects/fuse/sys/cam/scsi/scsi_low_pisa.h
  projects/fuse/sys/cddl/compat/opensolaris/sys/sid.h
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/fuse/sys/conf/NOTES
  projects/fuse/sys/conf/files
  projects/fuse/sys/conf/files.amd64
  projects/fuse/sys/conf/files.i386
  projects/fuse/sys/conf/kern.pre.mk
  projects/fuse/sys/conf/options.amd64
  projects/fuse/sys/conf/options.i386
  projects/fuse/sys/dev/amr/amr.c
  projects/fuse/sys/dev/amr/amr_pci.c
  projects/fuse/sys/dev/amr/amrvar.h
  projects/fuse/sys/dev/arcmsr/arcmsr.c
  projects/fuse/sys/dev/arcmsr/arcmsr.h
  projects/fuse/sys/dev/ath/ath_dfs/null/dfs_null.c
  projects/fuse/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
  projects/fuse/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c
  projects/fuse/sys/dev/ath/if_ath_tx.c
  projects/fuse/sys/dev/atkbdc/psm.c
  projects/fuse/sys/dev/bxe/if_bxe.c
  projects/fuse/sys/dev/ct/bshw_machdep.c
  projects/fuse/sys/dev/ct/ct.c
  projects/fuse/sys/dev/ct/ct_isa.c
  projects/fuse/sys/dev/ct/ctvar.h
  projects/fuse/sys/dev/gxemul/disk/gxemul_disk.c
  projects/fuse/sys/dev/hptmv/entry.c
  projects/fuse/sys/dev/hwpmc/hwpmc_core.c
  projects/fuse/sys/dev/hwpmc/hwpmc_core.h
  projects/fuse/sys/dev/hwpmc/hwpmc_intel.c
  projects/fuse/sys/dev/hwpmc/pmc_events.h
  projects/fuse/sys/dev/isp/isp_pci.c
  projects/fuse/sys/dev/ixgbe/ixgbe.c
  projects/fuse/sys/dev/ixgbe/ixgbe.h
  projects/fuse/sys/dev/ixgbe/ixgbe_82599.c
  projects/fuse/sys/dev/ixgbe/ixgbe_osdep.h
  projects/fuse/sys/dev/ncv/ncr53c500.c
  projects/fuse/sys/dev/ncv/ncr53c500_pccard.c
  projects/fuse/sys/dev/ncv/ncr53c500var.h
  projects/fuse/sys/dev/nsp/nsp.c
  projects/fuse/sys/dev/nsp/nsp_pccard.c
  projects/fuse/sys/dev/nsp/nspvar.h
  projects/fuse/sys/dev/pci/pcireg.h
  projects/fuse/sys/dev/random/nehemiah.c
  projects/fuse/sys/dev/random/probe.c
  projects/fuse/sys/dev/sound/usb/uaudioreg.h
  projects/fuse/sys/dev/stg/tmc18c30.c
  projects/fuse/sys/dev/stg/tmc18c30_pccard.c
  projects/fuse/sys/dev/stg/tmc18c30var.h
  projects/fuse/sys/dev/twe/twe.c
  projects/fuse/sys/dev/twe/twe_compat.h
  projects/fuse/sys/dev/twe/twe_freebsd.c
  projects/fuse/sys/dev/twe/twevar.h
  projects/fuse/sys/dev/usb/controller/dwc_otgreg.h
  projects/fuse/sys/dev/usb/serial/uchcom.c
  projects/fuse/sys/dev/usb/usbdevs
  projects/fuse/sys/geom/geom_subr.c
  projects/fuse/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
  projects/fuse/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c
  projects/fuse/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
  projects/fuse/sys/gnu/fs/xfs/xfs_alloc.c
  projects/fuse/sys/gnu/fs/xfs/xfs_vfsops.c
  projects/fuse/sys/i386/conf/GENERIC
  projects/fuse/sys/i386/conf/NOTES
  projects/fuse/sys/i386/i386/pmap.c
  projects/fuse/sys/i386/xen/pmap.c
  projects/fuse/sys/kern/kern_exit.c
  projects/fuse/sys/kern/kern_thread.c
  projects/fuse/sys/kern/subr_hints.c
  projects/fuse/sys/kern/subr_param.c
  projects/fuse/sys/kern/sys_procdesc.c
  projects/fuse/sys/kern/uipc_socket.c
  projects/fuse/sys/kern/uipc_usrreq.c
  projects/fuse/sys/mips/conf/BERI_DE4_MDROOT
  projects/fuse/sys/mips/conf/BERI_SIM_MDROOT
  projects/fuse/sys/mips/include/pmap.h
  projects/fuse/sys/mips/include/pte.h
  projects/fuse/sys/mips/mips/busdma_machdep.c
  projects/fuse/sys/mips/mips/pmap.c
  projects/fuse/sys/modules/Makefile
  projects/fuse/sys/modules/dtrace/dtraceall/Makefile
  projects/fuse/sys/modules/dtrace/dtraceall/dtraceall.c
  projects/fuse/sys/modules/random/Makefile
  projects/fuse/sys/modules/xfs/Makefile
  projects/fuse/sys/net/flowtable.c
  projects/fuse/sys/net/if_bridge.c
  projects/fuse/sys/net/if_ethersubr.c
  projects/fuse/sys/net/if_var.h
  projects/fuse/sys/netinet/if_ether.c
  projects/fuse/sys/netinet/ip_var.h
  projects/fuse/sys/netinet/ipfw/ip_fw2.c
  projects/fuse/sys/netinet/ipfw/ip_fw_log.c
  projects/fuse/sys/netinet/ipfw/ip_fw_pfil.c
  projects/fuse/sys/netinet/ipfw/ip_fw_private.h
  projects/fuse/sys/netinet/sctp_asconf.c
  projects/fuse/sys/netinet/sctp_auth.c
  projects/fuse/sys/netinet/sctp_cc_functions.c
  projects/fuse/sys/netinet/sctp_header.h
  projects/fuse/sys/netinet/sctp_indata.c
  projects/fuse/sys/netinet/sctp_input.c
  projects/fuse/sys/netinet/sctp_input.h
  projects/fuse/sys/netinet/sctp_output.c
  projects/fuse/sys/netinet/sctp_pcb.c
  projects/fuse/sys/netinet/sctp_structs.h
  projects/fuse/sys/netinet/sctp_timer.c
  projects/fuse/sys/netinet/sctputil.c
  projects/fuse/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h
  projects/fuse/sys/rpc/auth.h
  projects/fuse/sys/rpc/clnt_vc.c
  projects/fuse/sys/rpc/rpc_com.h
  projects/fuse/sys/rpc/rpcb_clnt.c
  projects/fuse/sys/rpc/xdr.h
  projects/fuse/sys/sparc64/include/fsr.h
  projects/fuse/sys/sparc64/include/vmparam.h
  projects/fuse/sys/sparc64/pci/fire.c
  projects/fuse/sys/sparc64/pci/schizo.c
  projects/fuse/sys/sparc64/sparc64/support.S
  projects/fuse/sys/sys/hash.h
  projects/fuse/sys/sys/pmc.h
  projects/fuse/sys/sys/time.h
  projects/fuse/sys/vm/swap_pager.c
  projects/fuse/sys/vm/vm_map.c
  projects/fuse/sys/vm/vm_mmap.c
  projects/fuse/tools/test/hwpmc/pmctest.py
  projects/fuse/tools/tools/ath/athratestats/Makefile
  projects/fuse/tools/tools/ath/athratestats/main.c
  projects/fuse/tools/tools/ath/athrd/athrd.1
  projects/fuse/tools/tools/netmap/pkt-gen.c
  projects/fuse/usr.bin/lock/lock.c
  projects/fuse/usr.bin/mail/util.c
  projects/fuse/usr.bin/procstat/procstat_files.c
  projects/fuse/usr.bin/rctl/rctl.8
  projects/fuse/usr.bin/systat/ifstat.c
  projects/fuse/usr.bin/time/time.c
  projects/fuse/usr.bin/truss/amd64-fbsd.c
  projects/fuse/usr.bin/truss/amd64-fbsd32.c
  projects/fuse/usr.bin/truss/amd64-linux32.c
  projects/fuse/usr.bin/truss/i386-fbsd.c
  projects/fuse/usr.bin/truss/i386-linux.c
  projects/fuse/usr.bin/truss/ia64-fbsd.c
  projects/fuse/usr.bin/truss/main.c
  projects/fuse/usr.bin/truss/mips-fbsd.c
  projects/fuse/usr.bin/truss/powerpc-fbsd.c
  projects/fuse/usr.bin/truss/powerpc64-fbsd.c
  projects/fuse/usr.bin/truss/setup.c
  projects/fuse/usr.bin/truss/sparc64-fbsd.c
  projects/fuse/usr.bin/truss/syscall.h
  projects/fuse/usr.bin/truss/syscalls.c
  projects/fuse/usr.bin/truss/truss.h
  projects/fuse/usr.sbin/ac/ac.8
  projects/fuse/usr.sbin/ac/ac.c
  projects/fuse/usr.sbin/arp/arp.4
  projects/fuse/usr.sbin/cron/crontab/crontab.c
  projects/fuse/usr.sbin/inetd/builtins.c
  projects/fuse/usr.sbin/keyserv/keyserv.c
  projects/fuse/usr.sbin/lmcconfig/lmcconfig.c
  projects/fuse/usr.sbin/makefs/makefs.8
  projects/fuse/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
  projects/fuse/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh
  projects/fuse/usr.sbin/pc-sysinstall/backend/functions-disk.sh
  projects/fuse/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh
  projects/fuse/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
  projects/fuse/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
  projects/fuse/usr.sbin/pciconf/cap.c
  projects/fuse/usr.sbin/timed/timed/master.c
  projects/fuse/usr.sbin/timed/timed/measure.c
  projects/fuse/usr.sbin/timed/timed/readmsg.c
  projects/fuse/usr.sbin/timed/timed/slave.c
  projects/fuse/usr.sbin/timed/timed/timed.c
  projects/fuse/usr.sbin/timed/timedc/cmds.c
Directory Properties:
  projects/fuse/   (props changed)
  projects/fuse/cddl/contrib/opensolaris/   (props changed)
  projects/fuse/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/fuse/contrib/binutils/   (props changed)
  projects/fuse/contrib/dtc/   (props changed)
  projects/fuse/contrib/gdb/   (props changed)
  projects/fuse/crypto/openssh/   (props changed)
  projects/fuse/lib/libc/   (props changed)
  projects/fuse/sbin/   (props changed)
  projects/fuse/share/man/man4/   (props changed)
  projects/fuse/sys/   (props changed)
  projects/fuse/sys/cddl/contrib/opensolaris/   (props changed)
  projects/fuse/sys/conf/   (props changed)
  projects/fuse/usr.bin/procstat/   (props changed)

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

--- projects/fuse/Makefile.inc1	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/Makefile.inc1	Fri Sep  7 23:18:13 2012	(r240222)
@@ -636,7 +636,10 @@ ITOOLS=	[ awk cap_mkdb cat chflags chmod
 #
 
 # Non-base distributions produced by the base system
-EXTRA_DISTRIBUTIONS=	doc games
+EXTRA_DISTRIBUTIONS=	doc
+.if ${MK_GAMES} != "no"
+EXTRA_DISTRIBUTIONS+=	games
+.endif
 .if defined(LIB32TMP) && ${MK_LIB32} != "no"
 EXTRA_DISTRIBUTIONS+=	lib32
 .endif

Modified: projects/fuse/bin/cat/cat.1
==============================================================================
--- projects/fuse/bin/cat/cat.1	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/bin/cat/cat.1	Fri Sep  7 23:18:13 2012	(r240222)
@@ -127,7 +127,7 @@ to the file
 truncating
 .Pa file3
 if it already exists.
-See the manual page for your shell (i.e.,
+See the manual page for your shell (e.g.,
 .Xr sh 1 )
 for more information on redirection.
 .Pp

Modified: projects/fuse/bin/cp/cp.1
==============================================================================
--- projects/fuse/bin/cp/cp.1	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/bin/cp/cp.1	Fri Sep  7 23:18:13 2012	(r240222)
@@ -32,7 +32,7 @@
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd January 17, 2010
+.Dd September 4, 2012
 .Dt CP 1
 .Os
 .Sh NAME
@@ -164,7 +164,7 @@ Cause
 .Nm
 to preserve the following attributes of each source
 file in the copy: modification time, access time,
-file flags, file mode, user ID, and group ID, as allowed by permissions.
+file flags, file mode, ACL, user ID, and group ID, as allowed by permissions.
 .Pp
 If the user ID and group ID cannot be preserved, no error message
 is displayed and the exit value is not altered.

Modified: projects/fuse/bin/date/date.c
==============================================================================
--- projects/fuse/bin/date/date.c	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/bin/date/date.c	Fri Sep  7 23:18:13 2012	(r240222)
@@ -137,7 +137,7 @@ main(int argc, char *argv[])
 	 * If -d or -t, set the timezone or daylight savings time; this
 	 * doesn't belong here; the kernel should not know about either.
 	 */
-	if (set_timezone && settimeofday((struct timeval *)NULL, &tz))
+	if (set_timezone && settimeofday(NULL, &tz) != 0)
 		err(1, "settimeofday (timezone)");
 
 	if (!rflag && time(&tval) == -1)
@@ -273,14 +273,14 @@ setthetime(const char *fmt, const char *
 		/* set the time */
 		if (nflag || netsettime(tval)) {
 			utx.ut_type = OLD_TIME;
-			gettimeofday(&utx.ut_tv, NULL);
+			(void)gettimeofday(&utx.ut_tv, NULL);
 			pututxline(&utx);
 			tv.tv_sec = tval;
 			tv.tv_usec = 0;
-			if (settimeofday(&tv, (struct timezone *)NULL))
+			if (settimeofday(&tv, NULL) != 0)
 				err(1, "settimeofday (timeval)");
 			utx.ut_type = NEW_TIME;
-			gettimeofday(&utx.ut_tv, NULL);
+			(void)gettimeofday(&utx.ut_tv, NULL);
 			pututxline(&utx);
 		}
 

Modified: projects/fuse/bin/dd/dd.c
==============================================================================
--- projects/fuse/bin/dd/dd.c	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/bin/dd/dd.c	Fri Sep  7 23:18:13 2012	(r240222)
@@ -232,8 +232,8 @@ setup(void)
 		ctab = casetab;
 	}
 
-	(void)gettimeofday(&tv, (struct timezone *)NULL);
-	st.start = tv.tv_sec + tv.tv_usec * 1e-6; 
+	(void)gettimeofday(&tv, NULL);
+	st.start = tv.tv_sec + tv.tv_usec * 1e-6;
 }
 
 static void

Modified: projects/fuse/bin/dd/misc.c
==============================================================================
--- projects/fuse/bin/dd/misc.c	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/bin/dd/misc.c	Fri Sep  7 23:18:13 2012	(r240222)
@@ -59,7 +59,7 @@ summary(void)
 	double secs;
 	char buf[100];
 
-	(void)gettimeofday(&tv, (struct timezone *)NULL);
+	(void)gettimeofday(&tv, NULL);
 	secs = tv.tv_sec + tv.tv_usec * 1e-6 - st.start;
 	if (secs < 1e-6)
 		secs = 1e-6;

Modified: projects/fuse/bin/getfacl/getfacl.1
==============================================================================
--- projects/fuse/bin/getfacl/getfacl.1	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/bin/getfacl/getfacl.1	Fri Sep  7 23:18:13 2012	(r240222)
@@ -97,6 +97,10 @@ then
 reads a list of pathnames, each terminated by one newline character,
 from the standard input.
 .El
+.Pp
+For an explanation of the ACL syntax, see the
+.Xr setfacl 1
+manual page.
 .Sh EXIT STATUS
 .Ex -std
 .Sh EXAMPLES

Modified: projects/fuse/bin/mv/mv.1
==============================================================================
--- projects/fuse/bin/mv/mv.1	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/bin/mv/mv.1	Fri Sep  7 23:18:13 2012	(r240222)
@@ -32,7 +32,7 @@
 .\"	@(#)mv.1	8.1 (Berkeley) 5/31/93
 .\" $FreeBSD$
 .\"
-.Dd May 12, 2007
+.Dd August 28, 2012
 .Dt MV 1
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl f | i | n
-.Op Fl v
+.Op Fl hv
 .Ar source target
 .Nm
 .Op Fl f | i | n
@@ -81,6 +81,21 @@ option overrides any previous
 or
 .Fl n
 options.)
+.It Fl h
+If the
+.Ar target
+operand is a symbolic link to a directory,
+do not follow it.
+This causes the
+.Nm
+utility to rename the file
+.Ar source
+to the destination path
+.Ar target
+rather than moving
+.Ar source
+into the directory referenced by
+.Ar target .
 .It Fl i
 Cause
 .Nm
@@ -142,7 +157,8 @@ rm -rf source_file
 .Ex -std
 .Sh COMPATIBILITY
 The
-.Fl n
+.Fl h ,
+.Fl n ,
 and
 .Fl v
 options are non-standard and their use in scripts is not recommended.

Modified: projects/fuse/bin/mv/mv.c
==============================================================================
--- projects/fuse/bin/mv/mv.c	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/bin/mv/mv.c	Fri Sep  7 23:18:13 2012	(r240222)
@@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$");
 /* Exit code for a failed exec. */
 #define EXEC_FAILED 127
 
-static int	fflg, iflg, nflg, vflg;
+static int	fflg, hflg, iflg, nflg, vflg;
 
 static int	copy(const char *, const char *);
 static int	do_move(const char *, const char *);
@@ -87,8 +87,11 @@ main(int argc, char *argv[])
 	int ch;
 	char path[PATH_MAX];
 
-	while ((ch = getopt(argc, argv, "finv")) != -1)
+	while ((ch = getopt(argc, argv, "fhinv")) != -1)
 		switch (ch) {
+		case 'h':
+			hflg = 1;
+			break;
 		case 'i':
 			iflg = 1;
 			fflg = nflg = 0;
@@ -123,6 +126,17 @@ main(int argc, char *argv[])
 		exit(do_move(argv[0], argv[1]));
 	}
 
+	/*
+	 * If -h was specified, treat the target as a symlink instead of
+	 * directory.
+	 */
+	if (hflg) {
+		if (argc > 2)
+			usage();
+		if (lstat(argv[1], &sb) == 0 && S_ISLNK(sb.st_mode))
+			exit(do_move(argv[0], argv[1]));
+	}
+
 	/* It's a directory, move each file into it. */
 	if (strlen(argv[argc - 1]) > sizeof(path) - 1)
 		errx(1, "%s: destination pathname too long", *argv);
@@ -483,7 +497,7 @@ usage(void)
 {
 
 	(void)fprintf(stderr, "%s\n%s\n",
-		      "usage: mv [-f | -i | -n] [-v] source target",
+		      "usage: mv [-f | -i | -n] [-hv] source target",
 		      "       mv [-f | -i | -n] [-v] source ... directory");
 	exit(EX_USAGE);
 }

Modified: projects/fuse/bin/setfacl/merge.c
==============================================================================
--- projects/fuse/bin/setfacl/merge.c	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/bin/setfacl/merge.c	Fri Sep  7 23:18:13 2012	(r240222)
@@ -94,7 +94,7 @@ merge_acl(acl_t acl, acl_t *prev_acl, co
 	acl_tag_t tag, tag_new;
 	acl_entry_type_t entry_type, entry_type_new;
 	acl_flagset_t flagset;
-	int entry_id, entry_id_new, have_entry, entry_number = 0;
+	int entry_id, entry_id_new, have_entry, had_entry, entry_number = 0;
 	int acl_brand, prev_acl_brand;
 
 	acl_get_brand_np(acl, &acl_brand);
@@ -116,6 +116,7 @@ merge_acl(acl_t acl, acl_t *prev_acl, co
 	while (acl_get_entry(acl, entry_id, &entry) == 1) {
 		entry_id = ACL_NEXT_ENTRY;
 		have_entry = 0;
+		had_entry = 0;
 
 		/* keep track of existing ACL_MASK entries */
 		if (acl_get_tag_type(entry, &tag) == -1)
@@ -187,7 +188,7 @@ merge_acl(acl_t acl, acl_t *prev_acl, co
 						err(1, "%s: acl_set_flagset_np() failed",
 						    filename);
 				}
-				have_entry = 1;
+				had_entry = have_entry = 1;
 				break;
 			default:
 				/* should never be here */
@@ -197,7 +198,7 @@ merge_acl(acl_t acl, acl_t *prev_acl, co
 		}
 
 		/* if this entry has not been found, it must be new */
-		if (have_entry == 0) {
+		if (had_entry == 0) {
 
 			/*
 			 * NFSv4 ACL entries must be prepended to the ACL.

Modified: projects/fuse/bin/setfacl/setfacl.1
==============================================================================
--- projects/fuse/bin/setfacl/setfacl.1	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/bin/setfacl/setfacl.1	Fri Sep  7 23:18:13 2012	(r240222)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 9, 2011
+.Dd September 2, 2012
 .Dt SETFACL 1
 .Os
 .Sh NAME
@@ -337,7 +337,7 @@ read_acl
 write_acl
 .It o
 write_owner
-.It S
+.It s
 synchronize
 .El
 .Pp

Modified: projects/fuse/bin/setfacl/setfacl.c
==============================================================================
--- projects/fuse/bin/setfacl/setfacl.c	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/bin/setfacl/setfacl.c	Fri Sep  7 23:18:13 2012	(r240222)
@@ -73,6 +73,7 @@ main(int argc, char *argv[])
 {
 	acl_t acl;
 	acl_type_t acl_type;
+	acl_entry_t unused_entry;
 	char filename[PATH_MAX];
 	int local_error, carried_error, ch, i, entry_number, ret;
 	int h_flag;
@@ -263,6 +264,17 @@ main(int argc, char *argv[])
 				need_mask = 1;
 				break;
 			case OP_REMOVE_EXT:
+				/*
+				 * Don't try to call remove_ext() for empty
+				 * default ACL.
+				 */
+				if (acl_type == ACL_TYPE_DEFAULT &&
+				    acl_get_entry(acl, ACL_FIRST_ENTRY,
+				    &unused_entry) == 0) {
+					local_error += remove_default(&acl,
+					    file->filename);
+					break;
+				}
 				remove_ext(&acl, file->filename);
 				need_mask = 0;
 				break;
@@ -296,6 +308,20 @@ main(int argc, char *argv[])
 			}
 		}
 
+		/*
+		 * Don't try to set an empty default ACL; it will always fail.
+		 * Use acl_delete_def_file(3) instead.
+		 */
+		if (acl_type == ACL_TYPE_DEFAULT &&
+		    acl_get_entry(acl, ACL_FIRST_ENTRY, &unused_entry) == 0) {
+			if (acl_delete_def_file(file->filename) == -1) {
+				warn("%s: acl_delete_def_file() failed",
+				    file->filename);
+				carried_error++;
+			}
+			continue;
+		}
+
 		/* don't bother setting the ACL if something is broken */
 		if (local_error) {
 			carried_error++;

Modified: projects/fuse/cddl/contrib/dtracetoolkit/execsnoop
==============================================================================
--- projects/fuse/cddl/contrib/dtracetoolkit/execsnoop	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/cddl/contrib/dtracetoolkit/execsnoop	Fri Sep  7 23:18:13 2012	(r240222)
@@ -5,21 +5,20 @@
 #
 # $Id: execsnoop 3 2007-08-01 10:50:08Z brendan $
 #
-# USAGE:	execsnoop [-a|-A|-ehjsvZ] [-c command]
+# USAGE:	execsnoop [-a|-A|-ehsvJ] [-c command]
 #
 #		execsnoop	# default output
 #
 #		-a		# print all data
 #		-A		# dump all data, space delimited
 #		-e		# safe output - parseable
-#		-j		# print project ID
 #		-s		# print start time, us
 #		-v		# print start time, string
-#		-Z		# print zonename
+#		-J		# print jail ID
 #		-c command	# command name to snoop
 #	eg,
 #		execsnoop -v		# human readable timestamps
-#		execsnoop -Z		# print zonename
+#		execsnoop -J		# print jail ID
 #		execsnoop -c ls		# snoop ls commands only
 #
 # The parseable output ensures that the ARGS field doesn't contain
@@ -31,8 +30,7 @@
 #		PPID		Parent Process ID
 #		COMM		command name for the process
 #		ARGS		argument listing for the process
-#		ZONE		zonename
-#		PROJ		project ID
+#		JAIL ID		Jail ID	
 #		TIME		timestamp for the command, us
 #		STRTIME		timestamp for the command, string
 #
@@ -72,34 +70,32 @@
 
 ### default variables
 opt_dump=0; opt_cmd=0; opt_time=0; opt_timestr=0; filter=0; command=.
-opt_zone=0; opt_safe=0; opt_proj=0
+opt_jailid=0; opt_safe=0
 
 ### process options
-while getopts aAc:ehjsvZ name
+while getopts aAc:ehsvJ name
 do
 	case $name in
-	a)	opt_time=1; opt_timestr=1; opt_zone=1; opt_proj=1 ;;
+	a)	opt_time=1; opt_timestr=1; opt_jailid=1 ;;
 	A)	opt_dump=1 ;;
 	c)	opt_cmd=1; command=$OPTARG ;;
 	e)	opt_safe=1 ;;
-	j)	opt_proj=1 ;;
 	s)	opt_time=1 ;;
 	v)	opt_timestr=1 ;;
-	Z)	opt_zone=1 ;;
+	J)	opt_jailid=1 ;;
 	h|?)	cat <<-END >&2
-		USAGE: execsnoop [-a|-A|-ehjsvZ] [-c command]
+		USAGE: execsnoop [-a|-A|-ehjsvJ] [-c command]
 		       execsnoop                # default output
 		                -a              # print all data
 		                -A              # dump all data, space delimited
 		                -e              # safe output, parseable
-		                -j              # print project ID
 		                -s              # print start time, us
 		                -v              # print start time, string
-		                -Z              # print zonename
+		                -J              # print jail ID 
 		                -c command      # command name to snoop
 		  eg,
 		        execsnoop -v            # human readable timestamps
-		        execsnoop -Z		# print zonename
+		        execsnoop -J		# print jail ID 
 		        execsnoop -c ls         # snoop ls commands only
 		END
 		exit 1
@@ -108,7 +104,7 @@ done
 
 ### option logic
 if [ $opt_dump -eq 1 ]; then
-	opt_time=0; opt_timestr=0; opt_zone=0; opt_proj=0
+	opt_time=0; opt_timestr=0; opt_jailid=0
 fi
 if [ $opt_cmd -eq 1 ]; then
 	filter=1
@@ -126,9 +122,8 @@ fi
  inline int OPT_cmd 	= '$opt_cmd';
  inline int OPT_time 	= '$opt_time';
  inline int OPT_timestr	= '$opt_timestr';
- inline int OPT_zone 	= '$opt_zone';
+ inline int OPT_jailid  = '$opt_jailid';
  inline int OPT_safe 	= '$opt_safe';
- inline int OPT_proj 	= '$opt_proj';
  inline int FILTER 	= '$filter';
  inline string COMMAND 	= "'$command'";
  
@@ -143,12 +138,11 @@ fi
 	/* print optional headers */
  	OPT_time    ? printf("%-14s ", "TIME") : 1;
  	OPT_timestr ? printf("%-20s ", "STRTIME") : 1;
- 	OPT_zone    ? printf("%-10s ", "ZONE") : 1;
- 	OPT_proj    ? printf("%5s ", "PROJ") : 1;
+ 	OPT_jailid    ? printf("%-10s ", "JAIL ID") : 1;
 
 	/* print main headers */
-	OPT_dump    ? printf("%s %s %s %s %s %s %s %s\n",
-	    "TIME", "ZONE", "PROJ", "UID", "PID", "PPID", "COMM", "ARGS") :
+	OPT_dump    ? printf("%s %s %s %s %s %s %s\n",
+	    "TIME", "JAIL ID", "UID", "PID", "PPID", "COMM", "ARGS") :
 	    printf("%5s %6s %6s %s\n", "UID", "PID", "PPID", "ARGS");
  }
 
@@ -161,12 +155,11 @@ fi
 	/* print optional fields */
  	OPT_time ? printf("%-14d ", timestamp/1000) : 1;
 	OPT_timestr ? printf("%-20Y ", walltimestamp) : 1;
- 	OPT_zone ? printf("%-10s ", zonename) : 1;
- 	OPT_proj ? printf("%5d ", curpsinfo->pr_projid) : 1;
+	OPT_jailid ? printf("%-10d ", curpsinfo->pr_jailid) : 1;
 
 	/* print main data */
-	OPT_dump ? printf("%d %s %d %d %d %d %s ", timestamp/1000,
-	    zonename, curpsinfo->pr_projid, uid, pid, ppid, execname) :
+	OPT_dump ? printf("%d %d %d %d %d %s ", timestamp/1000,
+	    curpsinfo->pr_jailid, uid, pid, ppid, execname) :
 	    printf("%5d %6d %6d ", uid, pid, ppid);
 	OPT_safe ? printf("%S\n", curpsinfo->pr_psargs) :
 	    printf("%s\n", curpsinfo->pr_psargs);

Modified: projects/fuse/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- projects/fuse/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Fri Sep  7 23:18:13 2012	(r240222)
@@ -93,14 +93,14 @@ If specified multiple times, verify the 
 .It Fl C
 Display information about the configuration. If specified with no other
 options, instead display information about the cache file
-.Ns ( Pa /etc/zfs/zpool.cache Ns ).
+.Po Pa /etc/zfs/zpool.cache Pc .
 To specify the cache file to display, see
 .Fl U
 .Pp
 If specified multiple times, and a pool name is also specified display both
 the cached configuration and the on-disk configuration.
 If specified multiple times with
-.FL e
+.Fl e
 also display the configuration that would be used were the pool to be
 imported.
 .It Fl d
@@ -135,7 +135,7 @@ option is also specified, also display t
 .It Fl L
 Disable leak tracing and the loading of space maps.
 By default,
-.Nm 
+.Nm
 verifies that all non-free blocks are referenced, which can be very expensive.
 .It Fl m
 Display the offset, spacemap, and free space of each metaslab.
@@ -253,7 +253,7 @@ MOS Configuration:
 .Li # Ic zdb -d rpool
 Dataset mos [META], ID 0, cr_txg 4, 26.9M, 1051 objects
 Dataset rpool/swap [ZVOL], ID 59, cr_txg 356, 486M, 2 objects
-...
+ ...
 .Ed
 .It Xo Sy Example 3 Display basic information about object 0 in
 .Sy 'rpool/export/home'
@@ -272,7 +272,7 @@ Dataset rpool/export/home [ZPL], ID 137,
 .Li # Ic zdb -S rpool
 Simulated DDT histogram:
 
-bucket             allocated                      referenced          
+bucket             allocated                      referenced
 ______  ______________________________  ______________________________
 refcnt  blocks   LSIZE   PSIZE   DSIZE  blocks   LSIZE   PSIZE   DSIZE
 ------  ------   -----   -----   -----  ------   -----   -----   -----

Modified: projects/fuse/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/fuse/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Fri Sep  7 23:18:13 2012	(r240222)
@@ -22,10 +22,12 @@
 .\" Copyright (c) 2012 Nexenta Systems, Inc. All Rights Reserved.
 .\" Copyright (c) 2012, Joyent, Inc. All rights reserved.
 .\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd at FreeBSD.org>
+.\" Copyright (c) 2012, Glen Barber <gjb at FreeBSD.org>
+.\" Copyright (c) 2012, Bryan Drewery <bdrewery at FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 12, 2012
+.Dd September 5, 2012
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -56,8 +58,8 @@
 .Op Fl dnpRrv
 .Sm off
 .Ar snapshot
-.Ns Op % Ns Ar snapname
-.Ns Op , Ns Ar ...
+.Op % Ns Ar snapname
+.Op , Ns Ar ...
 .Sm on
 .Nm
 .Cm snapshot
@@ -624,7 +626,7 @@ privilege with
 .Qq Nm Cm allow ,
 can access everyone's usage.
 .Pp
-The 
+The
 .Sy userused@ Ns ...
 properties are not displayed by
 .Qq Nm Cm get all .
@@ -1082,7 +1084,7 @@ bit is respected for the file system. Th
 .It Sy sharesmb Ns = Ns Cm on | off | Ar opts
 The
 .Sy sharesmb
-property has currently no effect o
+property currently has no effect on
 .Fx .
 .It Sy sharenfs Ns = Ns Cm on | off | Ar opts
 Controls whether the file system is shared via
@@ -1134,7 +1136,7 @@ will not use configured pool log devices
 will instead optimize synchronous operations for global pool throughput and
 efficient use of resources.
 .It Sy snapdir Ns = Ns Cm hidden | visible
-Controls whether the 
+Controls whether the
 .Pa \&.zfs
 directory is hidden or visible in the root of the file system as discussed in
 the
@@ -1201,7 +1203,7 @@ are not reflected in the reservation.
 The
 .Sy vscan
 property is currently not supported on
-.Fx . 
+.Fx .
 .It Sy xattr Ns = Ns Cm off | on
 The
 .Sy xattr
@@ -1288,7 +1290,7 @@ properties. The correlation between prop
 In addition, these options can be set on a per-mount basis using the
 .Fl o
 option, without affecting the property that is stored on disk. The values
-specified on the command line override the values stored in the dataset. These 
+specified on the command line override the values stored in the dataset. These
 properties are reported as "temporary" by the
 .Qq Nm Cm get
 command. If the properties are changed while the dataset is mounted, the new
@@ -1327,7 +1329,7 @@ domain name for the
 .Ar module
 component of property names to reduce the chance that two
 independently-developed packages use the same property name for different
-purposes. Property names beginning with 
+purposes. Property names beginning with
 .Em com.sun
 are reserved for use by Sun Microsystems.
 .Pp
@@ -1496,8 +1498,8 @@ behavior for mounted file systems in use
 .Op Fl dnpRrv
 .Sm off
 .Ar snapshot
-.Ns Op % Ns Ar snapname
-.Ns Op , Ns Ar ...
+.Op % Ns Ar snapname
+.Op , Ns Ar ...
 .Sm on
 .Xc
 .Pp
@@ -2030,7 +2032,7 @@ The default is
 .Pp
 The default can be changed to include group types.
 .It Fl i
-Translate SID to POSIX ID. This flag has currently no effect on
+Translate SID to POSIX ID. This flag currently has no effect on
 .Fx .
 .El
 .It Xo
@@ -2216,7 +2218,7 @@ and it is assumed to be from the same fi
 .Ar snapshot .
 .Pp
 If the destination is a clone, the source may be the origin snapshot, which
-must be fully specified (for example, 
+must be fully specified (for example,
 .Cm pool/fs at origin ,
 not just
 .Cm @origin ) .
@@ -2472,10 +2474,10 @@ subcommand or change a
 property. The following permissions are available:
 .Bl -column -offset 4n "secondarycache" "subcommand"
 .It NAME Ta TYPE Ta NOTES
-.It Xo allow Ta subcommand Ta Must
+.It allow Ta subcommand Ta Must Xo
 also have the permission that is being allowed
 .Xc
-.It Xo clone Ta subcommand Ta Must
+.It clone Ta subcommand Ta Must Xo
 also have the 'create' ability and 'mount' ability in the origin file system
 .Xc
 .It create Ta subcommand Ta Must also have the 'mount' ability
@@ -2484,14 +2486,14 @@ also have the 'create' ability and 'moun
 object number, and the ability to create snapshots necessary to 'zfs diff'
 .It hold Ta subcommand Ta Allows adding a user hold to a snapshot
 .It mount Ta subcommand Ta Allows mount/umount of Tn ZFS No datasets
-.It Xo promote Ta subcommand Ta Must
+.It promote Ta subcommand Ta Must Xo
 also have the 'mount' and 'promote' ability in the origin file system
 .Xc
 .It receive Ta subcommand Ta Must also have the 'mount' and 'create' ability
-.It Xo release Ta subcommand Ta Allows
+.It release Ta subcommand Ta Allows Xo
 releasing a user hold which might destroy the snapshot
 .Xc
-.It Xo rename Ta subcommand Ta Must
+.It rename Ta subcommand Ta Must Xo
 also have the 'mount' and 'create' ability in the new parent
 .Xc
 .It rollback Ta subcommand Ta Must also have the 'mount' ability
@@ -2507,7 +2509,6 @@ protocol
 .It userprop Ta other Ta Allows changing any user property
 .It userquota Ta other Ta Allows accessing any userquota at ... property
 .It userused Ta other Ta Allows reading any userused at ... property
-.It  Ta 
 .It aclinherit Ta property
 .It aclmode Ta property
 .It atime Ta property
@@ -2705,7 +2706,6 @@ Display an indication of the type of fil
 .Fl F
 option of
 .Xr ls 1 .
-.Pp
 .Bl -column -offset 2n indent
 .It \&B Ta block device
 .It \&C Ta character device
@@ -2757,6 +2757,16 @@ Detaches the specified
 from the jail identified by JID
 .Ar jailid .
 .El
+.Sh EXIT STATUS
+The following exit values are returned:
+.Bl -tag -offset 2n -width 2n
+.It 0
+Successful completion.
+.It 1
+An error occurred.
+.It 2
+Invalid command line options were specified.
+.El
 .Sh EXAMPLES
 .Bl -tag -width 0n
 .It Sy Example 1 No Creating a Tn ZFS No File System Hierarchy
@@ -2822,7 +2832,7 @@ Snapshots are displayed if the
 .Sy listsnaps
 property is
 .Cm on .
-The default is 
+The default is
 .Cm off .
 See
 .Xr zpool 8
@@ -3179,7 +3189,6 @@ The following example shows how to see w
 snapshot of a ZFS Dataset and its current state.  The
 .Fl F
 option is used to indicate type information for the files affected.
-.Pp
 .Bd -literal -offset 2n
 .Li # Ic zfs diff tank/test at before tank/test
 M       /       /tank/test/
@@ -3190,16 +3199,6 @@ R       F       /tank/test/oldname -> /t
 M       F       /tank/test/modified
 .Ed
 .El
-.Sh EXIT STATUS
-The following exit values are returned:
-.Bl -tag -offset 2n -width 2n
-.It 0
-Successful completion.
-.It 1
-An error occurred.
-.It 2
-Invalid command line options were specified.
-.El
 .Sh SEE ALSO
 .Xr chmod 2 ,
 .Xr fsync 2 ,

Modified: projects/fuse/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5
==============================================================================
--- projects/fuse/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5	Fri Sep  7 23:18:13 2012	(r240222)
@@ -67,7 +67,7 @@ however a feature's short name may diffe
 following the convention would result in name conflicts.
 .Ss Feature states
 Features can be in one of three states:
-.Bl -tag
+.Bl -tag -width "XXXXXXXX"
 .It Sy active
 This feature's on\-disk format changes are in effect on the pool.
 Support for this feature is required to import the pool in read\-write mode.
@@ -93,6 +93,7 @@ unless an administrator moves the featur
 state.
 Features cannot be disabled once they have been enabled.
 .El
+.Pp
 The state of supported features is exposed through pool properties of the form
 .Sy feature at short_name .
 .Ss Read\-only compatibility
@@ -111,7 +112,7 @@ named
 .Sy unsupported at feature_guid
 will indicate why the import was allowed despite the unsupported feature.
 Possible values for this property are:
-.Bl -tag
+.Bl -tag -width "XXXXXXXX"
 .It Sy inactive
 The feature is in the
 .Sy enabled
@@ -127,7 +128,7 @@ properly.
 Enabling a feature will automatically enable any features it depends on.
 .Sh FEATURES
 The following features are supported on this system:
-.Bl -tag
+.Bl -tag -width "XXXXXXXX"
 .It Sy async_destroy
 .Bl -column "READ\-ONLY COMPATIBLE" "com.delphix:async_destroy"
 .It GUID Ta com.delphix:async_destroy

Modified: projects/fuse/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- projects/fuse/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Fri Sep  7 23:18:13 2012	(r240222)
@@ -21,6 +21,7 @@
 .\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved.
 .\" Copyright (c) 2011, Justin T. Gibbs <gibbs at FreeBSD.org>
 .\" Copyright (c) 2012 by Delphix. All Rights Reserved.
+.\" Copyright (c) 2012, Glen Barber <gjb at FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\"
@@ -193,7 +194,7 @@ A
 describes a single device or a collection of devices organized according to
 certain performance and fault characteristics. The following virtual devices
 are supported:
-.Bl -tag
+.Bl -tag -width "XXXXXX"
 .It Sy disk
 A block device, typically located under
 .Pa /dev .
@@ -532,7 +533,7 @@ can provide additional information about
 .It Sy dedupratio
 The deduplication ratio specified for a pool, expressed as a multiplier.
 For example, a
-.S dedupratio
+.Sy dedupratio
 value of 1.76 indicates that 1.76 units of data were stored but only 1 unit of disk space was actually consumed. See
 .Xr zfs 8
 for a description of the deduplication feature.
@@ -731,7 +732,7 @@ The current on-disk version of the pool.
 decreased. The preferred method of updating pools is with the
 .Qq Nm Cm upgrade
 command, though this property can be used when a specific version is needed
-for backwards compatibility. 
+for backwards compatibility.
 Once feature flags is enabled on a pool this property will no longer have a
 value.
 .El
@@ -1678,6 +1679,16 @@ This option can only be used to increase
 supported legacy version number.
 .El
 .El
+.Sh EXIT STATUS
+The following exit values are returned:
+.Bl -tag -offset 2n -width 2n
+.It 0
+Successful completion.
+.It 1
+An error occurred.
+.It 2
+Invalid command line options were specified.
+.El
 .Sh EXAMPLES
 .Bl -tag -width 0n
 .It Sy Example 1 No Creating a RAID-Z Storage Pool
@@ -1915,16 +1926,6 @@ Pool data returned to its state as of Tu
 Discarded approximately 29 seconds of transactions.
 .Ed
 .El
-.Sh EXIT STATUS
-The following exit values are returned:
-.Bl -tag -offset 2n -width 2n
-.It 0
-Successful completion.
-.It 1
-An error occurred.
-.It 2
-Invalid command line options were specified.
-.El
 .Sh SEE ALSO
 .Xr zfs 8
 .Xr zpool-features 5

Modified: projects/fuse/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- projects/fuse/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Fri Sep  7 23:18:13 2012	(r240222)
@@ -5862,6 +5862,8 @@ main(int argc, char **argv)
 
 	(void) setvbuf(stdout, NULL, _IOLBF, 0);
 
+	dprintf_setup(&argc, argv);
+
 	if (!ischild) {
 		process_options(argc, argv);
 

Modified: projects/fuse/cddl/lib/libdtrace/psinfo.d
==============================================================================
--- projects/fuse/cddl/lib/libdtrace/psinfo.d	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/cddl/lib/libdtrace/psinfo.d	Fri Sep  7 23:18:13 2012	(r240222)
@@ -42,6 +42,7 @@ typedef struct psinfo {
 		pr_addr;	/* address of process */
 	string	pr_psargs;	/* process arguments */
 	u_int	pr_arglen;	/* process argument length */
+	u_int	pr_jailid;	/* jail id */
 } psinfo_t;
 
 #pragma D binding "1.0" translator
@@ -58,6 +59,7 @@ translator psinfo_t < struct proc *T > {
 	pr_addr = 0;
 	pr_psargs = stringof(T->p_args->ar_args);
 	pr_arglen = T->p_args->ar_length;
+	pr_jailid = T->p_ucred->cr_prison->pr_id;
 };
 
 typedef struct lwpsinfo {

Modified: projects/fuse/cddl/usr.bin/ctfconvert/ctfconvert.1
==============================================================================
--- projects/fuse/cddl/usr.bin/ctfconvert/ctfconvert.1	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/cddl/usr.bin/ctfconvert/ctfconvert.1	Fri Sep  7 23:18:13 2012	(r240222)
@@ -74,7 +74,7 @@ Write the output to file in
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
-.Xr ctfmerge 1 , 
+.Xr ctfmerge 1 ,
 .Xr ctfdump 1
 .Sh HISTORY
 The

Modified: projects/fuse/cddl/usr.bin/ctfmerge/ctfmerge.1
==============================================================================
--- projects/fuse/cddl/usr.bin/ctfmerge/ctfmerge.1	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/cddl/usr.bin/ctfmerge/ctfmerge.1	Fri Sep  7 23:18:13 2012	(r240222)
@@ -32,7 +32,7 @@
 .Dt CTFMERGE 1
 .Os
 .Sh NAME
-.Nm ctfmerge 
+.Nm ctfmerge
 .Nd merge several CTF data sections into one
 .Sh SYNOPSIS
 .Nm
@@ -109,7 +109,7 @@ into
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
-.Xr ctfconvert 1 , 
+.Xr ctfconvert 1 ,
 .Xr ctfdump 1
 .Sh HISTORY
 The

Modified: projects/fuse/cddl/usr.sbin/dtruss/dtruss.1
==============================================================================
--- projects/fuse/cddl/usr.sbin/dtruss/dtruss.1	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/cddl/usr.sbin/dtruss/dtruss.1	Fri Sep  7 23:18:13 2012	(r240222)
@@ -32,7 +32,7 @@
 .Dt DTRUSS 1
 .Os
 .Sh NAME
-.Nm dtruss 
+.Nm dtruss
 .Nd Trace system calls and userland stacks using DTrace
 .Sh SYNOPSIS
 .Nm
@@ -79,7 +79,7 @@ Specify the DTrace buffer size.
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
-.Xr dtrace 1 
+.Xr dtrace 1
 .Sh HISTORY
 The
 .Nm

Modified: projects/fuse/cddl/usr.sbin/plockstat/plockstat.1
==============================================================================
--- projects/fuse/cddl/usr.sbin/plockstat/plockstat.1	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/cddl/usr.sbin/plockstat/plockstat.1	Fri Sep  7 23:18:13 2012	(r240222)
@@ -49,7 +49,7 @@
 .Op Fl s Ar depth
 .Op Fl e Ar secs
 .Op Fl x Ar opt Ns = Ns Ar val
-.Fl p Ar pid 
+.Fl p Ar pid
 .Sh DESCRIPTION
 The
 .Nm

Modified: projects/fuse/contrib/binutils/binutils/readelf.c
==============================================================================
--- projects/fuse/contrib/binutils/binutils/readelf.c	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/contrib/binutils/binutils/readelf.c	Fri Sep  7 23:18:13 2012	(r240222)
@@ -174,7 +174,7 @@ static Elf_Internal_Syminfo *dynamic_sym
 static unsigned long dynamic_syminfo_offset;
 static unsigned int dynamic_syminfo_nent;
 static char program_interpreter[PATH_MAX];
-static bfd_vma dynamic_info[DT_JMPREL + 1];
+static bfd_vma dynamic_info[DT_ENCODING];
 static bfd_vma dynamic_info_DT_GNU_HASH;
 static bfd_vma version_info[16];
 static Elf_Internal_Ehdr elf_header;

Modified: projects/fuse/contrib/bsnmp/snmpd/trap.c
==============================================================================
--- projects/fuse/contrib/bsnmp/snmpd/trap.c	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/contrib/bsnmp/snmpd/trap.c	Fri Sep  7 23:18:13 2012	(r240222)
@@ -117,7 +117,7 @@ trapsink_create(struct trapsink_dep *tde
 		return (SNMP_ERR_RES_UNAVAIL);
 	}
 	(void)shutdown(t->socket, SHUT_RD);
-
+	memset(&sa, 0, sizeof(sa));
 	sa.sin_len = sizeof(sa);
 	sa.sin_family = AF_INET;
 	sa.sin_addr.s_addr = htonl((t->index.subs[0] << 24) |
@@ -725,6 +725,7 @@ target_activate_address(struct target_ad
 	}
 
 	(void)shutdown(addrs->socket, SHUT_RD);
+	memset(&sa, 0, sizeof(sa));
 	sa.sin_len = sizeof(sa);
 	sa.sin_family = AF_INET;
 

Modified: projects/fuse/contrib/dtc/dtc-lexer.l
==============================================================================
--- projects/fuse/contrib/dtc/dtc-lexer.l	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/contrib/dtc/dtc-lexer.l	Fri Sep  7 23:18:13 2012	(r240222)
@@ -198,7 +198,7 @@ static void push_input_file(const char *
 {
 	assert(filename);
 
-	assert(include_stack_pointer >= MAX_INCLUDE_NESTING);
+	assert(include_stack_pointer < MAX_INCLUDE_NESTING);
 
 	srcfile_push(filename);
 

Modified: projects/fuse/contrib/gdb/gdb/dwarf2loc.h
==============================================================================
--- projects/fuse/contrib/gdb/gdb/dwarf2loc.h	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/contrib/gdb/gdb/dwarf2loc.h	Fri Sep  7 23:18:13 2012	(r240222)
@@ -38,7 +38,7 @@ struct dwarf2_locexpr_baton
   unsigned char *data;
 
   /* Length of the location expression.  */
-  unsigned short size;
+  unsigned long size;
 
   /* The objfile containing the symbol whose location we're computing.  */
   struct objfile *objfile;
@@ -54,7 +54,7 @@ struct dwarf2_loclist_baton
   unsigned char *data;
 
   /* Length of the location list.  */
-  unsigned short size;
+  unsigned long size;
 
   /* The objfile containing the symbol whose location we're computing.  */
   /* Used (only???) by thread local variables.  The objfile in which

Modified: projects/fuse/crypto/openssh/ChangeLog
==============================================================================
--- projects/fuse/crypto/openssh/ChangeLog	Fri Sep  7 23:10:10 2012	(r240221)
+++ projects/fuse/crypto/openssh/ChangeLog	Fri Sep  7 23:18:13 2012	(r240222)
@@ -1,3 +1,629 @@
+20120828
+ - (djm) Release openssh-6.1
+
+20120828
+ - (dtucker) [openbsd-compat/bsd-cygwin_util.h] define WIN32_LEAN_AND_MEAN
+   for compatibility with future mingw-w64 headers.  Patch from vinschen at
+   redhat com.
+
+20120822
+ - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+   [contrib/suse/openssh.spec] Update version numbers
+
+20120731
+ - (djm) OpenBSD CVS Sync
+   - jmc at cvs.openbsd.org 2012/07/06 06:38:03
+     [ssh-keygen.c]
+     missing full stop in usage();
+   - djm at cvs.openbsd.org 2012/07/10 02:19:15
+     [servconf.c servconf.h sshd.c sshd_config]
+     Turn on systrace sandboxing of pre-auth sshd by default for new installs
+     by shipping a config that overrides the current UsePrivilegeSeparation=yes
+     default. Make it easier to flip the default in the future by adding too.
+     prodded markus@ feedback dtucker@ "get it in" deraadt@
+   - dtucker at cvs.openbsd.org 2012/07/13 01:35:21
+     [servconf.c]
+     handle long comments in config files better.  bz#2025, ok markus
+   - markus at cvs.openbsd.org 2012/07/22 18:19:21
+     [version.h]
+     openssh 6.1
+
+20120720
+ - (dtucker) Import regened moduli file.

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