Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Sep 2013 21:59:01 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r255803 - in projects/camlock: . cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzpool/com...
Message-ID:  <201309222159.r8MLx1kF002799@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Sun Sep 22 21:58:59 2013
New Revision: 255803
URL: http://svnweb.freebsd.org/changeset/base/255803

Log:
  MFC @ r255802

Added:
  projects/camlock/contrib/ldns/drill/config.h
     - copied unchanged from r255802, head/contrib/ldns/drill/config.h
  projects/camlock/contrib/ldns/drill/drill.1
     - copied unchanged from r255802, head/contrib/ldns/drill/drill.1
  projects/camlock/contrib/llvm/tools/lldb/docs/
     - copied from r255802, head/contrib/llvm/tools/lldb/docs/
  projects/camlock/contrib/unbound/config.h
     - copied unchanged from r255802, head/contrib/unbound/config.h
  projects/camlock/contrib/unbound/doc/libunbound.3
     - copied unchanged from r255802, head/contrib/unbound/doc/libunbound.3
  projects/camlock/contrib/unbound/doc/unbound-anchor.8
     - copied unchanged from r255802, head/contrib/unbound/doc/unbound-anchor.8
  projects/camlock/contrib/unbound/doc/unbound-checkconf.8
     - copied unchanged from r255802, head/contrib/unbound/doc/unbound-checkconf.8
  projects/camlock/contrib/unbound/doc/unbound-control.8
     - copied unchanged from r255802, head/contrib/unbound/doc/unbound-control.8
  projects/camlock/contrib/unbound/doc/unbound.8
     - copied unchanged from r255802, head/contrib/unbound/doc/unbound.8
  projects/camlock/contrib/unbound/doc/unbound.conf.5
     - copied unchanged from r255802, head/contrib/unbound/doc/unbound.conf.5
  projects/camlock/contrib/unbound/freebsd-configure.sh
     - copied unchanged from r255802, head/contrib/unbound/freebsd-configure.sh
  projects/camlock/contrib/unbound/freebsd-sources.pl
     - copied unchanged from r255802, head/contrib/unbound/freebsd-sources.pl
  projects/camlock/contrib/unbound/libunbound/worker.h
     - copied unchanged from r255802, head/contrib/unbound/libunbound/worker.h
  projects/camlock/contrib/unbound/smallapp/unbound-control-setup.sh.in
     - copied unchanged from r255802, head/contrib/unbound/smallapp/unbound-control-setup.sh.in
  projects/camlock/crypto/openssh/Makefile.in
     - copied unchanged from r255802, head/crypto/openssh/Makefile.in
  projects/camlock/crypto/openssh/buildpkg.sh.in
     - copied unchanged from r255802, head/crypto/openssh/buildpkg.sh.in
  projects/camlock/crypto/openssh/config.sub
     - copied unchanged from r255802, head/crypto/openssh/config.sub
  projects/camlock/crypto/openssh/configure
     - copied unchanged from r255802, head/crypto/openssh/configure
  projects/camlock/crypto/openssh/configure.ac
     - copied unchanged from r255802, head/crypto/openssh/configure.ac
  projects/camlock/crypto/openssh/contrib/
     - copied from r255802, head/crypto/openssh/contrib/
  projects/camlock/crypto/openssh/fixalgorithms
     - copied unchanged from r255802, head/crypto/openssh/fixalgorithms
  projects/camlock/crypto/openssh/install-sh
     - copied unchanged from r255802, head/crypto/openssh/install-sh
  projects/camlock/crypto/openssh/mdoc2man.awk
     - copied unchanged from r255802, head/crypto/openssh/mdoc2man.awk
  projects/camlock/crypto/openssh/moduli.0
     - copied unchanged from r255802, head/crypto/openssh/moduli.0
  projects/camlock/crypto/openssh/nchan.ms
     - copied unchanged from r255802, head/crypto/openssh/nchan.ms
  projects/camlock/crypto/openssh/nchan2.ms
     - copied unchanged from r255802, head/crypto/openssh/nchan2.ms
  projects/camlock/crypto/openssh/openbsd-compat/Makefile.in
     - copied unchanged from r255802, head/crypto/openssh/openbsd-compat/Makefile.in
  projects/camlock/crypto/openssh/openbsd-compat/getopt.h
     - copied unchanged from r255802, head/crypto/openssh/openbsd-compat/getopt.h
  projects/camlock/crypto/openssh/openbsd-compat/getopt_long.c
     - copied unchanged from r255802, head/crypto/openssh/openbsd-compat/getopt_long.c
  projects/camlock/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c
     - copied unchanged from r255802, head/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c
  projects/camlock/crypto/openssh/openbsd-compat/regress/
     - copied from r255802, head/crypto/openssh/openbsd-compat/regress/
  projects/camlock/crypto/openssh/openbsd-compat/strnlen.c
     - copied unchanged from r255802, head/crypto/openssh/openbsd-compat/strnlen.c
  projects/camlock/crypto/openssh/openssh.xml.in
     - copied unchanged from r255802, head/crypto/openssh/openssh.xml.in
  projects/camlock/crypto/openssh/opensshd.init.in
     - copied unchanged from r255802, head/crypto/openssh/opensshd.init.in
  projects/camlock/crypto/openssh/regress/
     - copied from r255802, head/crypto/openssh/regress/
  projects/camlock/crypto/openssh/sandbox-seccomp-filter.c
     - copied unchanged from r255802, head/crypto/openssh/sandbox-seccomp-filter.c
  projects/camlock/crypto/openssh/scp.0
     - copied unchanged from r255802, head/crypto/openssh/scp.0
  projects/camlock/crypto/openssh/sftp-server.0
     - copied unchanged from r255802, head/crypto/openssh/sftp-server.0
  projects/camlock/crypto/openssh/sftp.0
     - copied unchanged from r255802, head/crypto/openssh/sftp.0
  projects/camlock/crypto/openssh/ssh-add.0
     - copied unchanged from r255802, head/crypto/openssh/ssh-add.0
  projects/camlock/crypto/openssh/ssh-agent.0
     - copied unchanged from r255802, head/crypto/openssh/ssh-agent.0
  projects/camlock/crypto/openssh/ssh-keygen.0
     - copied unchanged from r255802, head/crypto/openssh/ssh-keygen.0
  projects/camlock/crypto/openssh/ssh-keyscan.0
     - copied unchanged from r255802, head/crypto/openssh/ssh-keyscan.0
  projects/camlock/crypto/openssh/ssh-keysign.0
     - copied unchanged from r255802, head/crypto/openssh/ssh-keysign.0
  projects/camlock/crypto/openssh/ssh-pkcs11-helper.0
     - copied unchanged from r255802, head/crypto/openssh/ssh-pkcs11-helper.0
  projects/camlock/crypto/openssh/ssh.0
     - copied unchanged from r255802, head/crypto/openssh/ssh.0
  projects/camlock/crypto/openssh/ssh_config.0
     - copied unchanged from r255802, head/crypto/openssh/ssh_config.0
  projects/camlock/crypto/openssh/sshd.0
     - copied unchanged from r255802, head/crypto/openssh/sshd.0
  projects/camlock/crypto/openssh/sshd_config.0
     - copied unchanged from r255802, head/crypto/openssh/sshd_config.0
  projects/camlock/crypto/openssh/survey.sh.in
     - copied unchanged from r255802, head/crypto/openssh/survey.sh.in
  projects/camlock/etc/libmap32.conf
     - copied unchanged from r255802, head/etc/libmap32.conf
  projects/camlock/etc/rc.d/ctld
     - copied unchanged from r255802, head/etc/rc.d/ctld
  projects/camlock/etc/rc.d/iscsictl
     - copied unchanged from r255802, head/etc/rc.d/iscsictl
  projects/camlock/etc/rc.d/iscsid
     - copied unchanged from r255802, head/etc/rc.d/iscsid
  projects/camlock/include/mk-osreldate.sh
     - copied unchanged from r255802, head/include/mk-osreldate.sh
  projects/camlock/lib/clang/liblldb/
     - copied from r255802, head/lib/clang/liblldb/
  projects/camlock/lib/clang/liblldbAPI/
     - copied from r255802, head/lib/clang/liblldbAPI/
  projects/camlock/lib/clang/liblldbBreakpoint/
     - copied from r255802, head/lib/clang/liblldbBreakpoint/
  projects/camlock/lib/clang/liblldbCommands/
     - copied from r255802, head/lib/clang/liblldbCommands/
  projects/camlock/lib/clang/liblldbCore/
     - copied from r255802, head/lib/clang/liblldbCore/
  projects/camlock/lib/clang/liblldbDataFormatters/
     - copied from r255802, head/lib/clang/liblldbDataFormatters/
  projects/camlock/lib/clang/liblldbExpression/
     - copied from r255802, head/lib/clang/liblldbExpression/
  projects/camlock/lib/clang/liblldbHostCommon/
     - copied from r255802, head/lib/clang/liblldbHostCommon/
  projects/camlock/lib/clang/liblldbHostFreeBSD/
     - copied from r255802, head/lib/clang/liblldbHostFreeBSD/
  projects/camlock/lib/clang/liblldbInterpreter/
     - copied from r255802, head/lib/clang/liblldbInterpreter/
  projects/camlock/lib/clang/liblldbPluginABISysV_x86_64/
     - copied from r255802, head/lib/clang/liblldbPluginABISysV_x86_64/
  projects/camlock/lib/clang/liblldbPluginCXXItaniumABI/
     - copied from r255802, head/lib/clang/liblldbPluginCXXItaniumABI/
  projects/camlock/lib/clang/liblldbPluginDisassemblerLLVM/
     - copied from r255802, head/lib/clang/liblldbPluginDisassemblerLLVM/
  projects/camlock/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/
     - copied from r255802, head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/
  projects/camlock/lib/clang/liblldbPluginDynamicLoaderStatic/
     - copied from r255802, head/lib/clang/liblldbPluginDynamicLoaderStatic/
  projects/camlock/lib/clang/liblldbPluginInstructionARM/
     - copied from r255802, head/lib/clang/liblldbPluginInstructionARM/
  projects/camlock/lib/clang/liblldbPluginObjectContainerBSDArchive/
     - copied from r255802, head/lib/clang/liblldbPluginObjectContainerBSDArchive/
  projects/camlock/lib/clang/liblldbPluginObjectFileELF/
     - copied from r255802, head/lib/clang/liblldbPluginObjectFileELF/
  projects/camlock/lib/clang/liblldbPluginPlatformFreeBSD/
     - copied from r255802, head/lib/clang/liblldbPluginPlatformFreeBSD/
  projects/camlock/lib/clang/liblldbPluginPlatformGDB/
     - copied from r255802, head/lib/clang/liblldbPluginPlatformGDB/
  projects/camlock/lib/clang/liblldbPluginProcessElfCore/
     - copied from r255802, head/lib/clang/liblldbPluginProcessElfCore/
  projects/camlock/lib/clang/liblldbPluginProcessFreeBSD/
     - copied from r255802, head/lib/clang/liblldbPluginProcessFreeBSD/
  projects/camlock/lib/clang/liblldbPluginProcessGDBRemote/
     - copied from r255802, head/lib/clang/liblldbPluginProcessGDBRemote/
  projects/camlock/lib/clang/liblldbPluginProcessPOSIX/
     - copied from r255802, head/lib/clang/liblldbPluginProcessPOSIX/
  projects/camlock/lib/clang/liblldbPluginProcessUtility/
     - copied from r255802, head/lib/clang/liblldbPluginProcessUtility/
  projects/camlock/lib/clang/liblldbPluginSymbolFileDWARF/
     - copied from r255802, head/lib/clang/liblldbPluginSymbolFileDWARF/
  projects/camlock/lib/clang/liblldbPluginSymbolFileSymtab/
     - copied from r255802, head/lib/clang/liblldbPluginSymbolFileSymtab/
  projects/camlock/lib/clang/liblldbPluginSymbolVendorELF/
     - copied from r255802, head/lib/clang/liblldbPluginSymbolVendorELF/
  projects/camlock/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/
     - copied from r255802, head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/
  projects/camlock/lib/clang/liblldbPluginUnwindAssemblyX86/
     - copied from r255802, head/lib/clang/liblldbPluginUnwindAssemblyX86/
  projects/camlock/lib/clang/liblldbSymbol/
     - copied from r255802, head/lib/clang/liblldbSymbol/
  projects/camlock/lib/clang/liblldbTarget/
     - copied from r255802, head/lib/clang/liblldbTarget/
  projects/camlock/lib/clang/liblldbUtility/
     - copied from r255802, head/lib/clang/liblldbUtility/
  projects/camlock/lib/clang/lldb.lib.mk
     - copied unchanged from r255802, head/lib/clang/lldb.lib.mk
  projects/camlock/lib/libc/sys/procctl.2
     - copied unchanged from r255802, head/lib/libc/sys/procctl.2
  projects/camlock/lib/libunbound/
     - copied from r255802, head/lib/libunbound/
  projects/camlock/share/man/man4/gpio.4
     - copied unchanged from r255802, head/share/man/man4/gpio.4
  projects/camlock/sys/cam/ctl/ctl_frontend_iscsi.c
     - copied unchanged from r255802, head/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/camlock/sys/cam/ctl/ctl_frontend_iscsi.h
     - copied unchanged from r255802, head/sys/cam/ctl/ctl_frontend_iscsi.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_raidz.h
     - copied unchanged from r255802, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_raidz.h
  projects/camlock/sys/dev/bxe/57710_init_values.c
     - copied unchanged from r255802, head/sys/dev/bxe/57710_init_values.c
  projects/camlock/sys/dev/bxe/57710_int_offsets.h
     - copied unchanged from r255802, head/sys/dev/bxe/57710_int_offsets.h
  projects/camlock/sys/dev/bxe/57711_init_values.c
     - copied unchanged from r255802, head/sys/dev/bxe/57711_init_values.c
  projects/camlock/sys/dev/bxe/57711_int_offsets.h
     - copied unchanged from r255802, head/sys/dev/bxe/57711_int_offsets.h
  projects/camlock/sys/dev/bxe/57712_init_values.c
     - copied unchanged from r255802, head/sys/dev/bxe/57712_init_values.c
  projects/camlock/sys/dev/bxe/57712_int_offsets.h
     - copied unchanged from r255802, head/sys/dev/bxe/57712_int_offsets.h
  projects/camlock/sys/dev/bxe/bxe.c
     - copied unchanged from r255802, head/sys/dev/bxe/bxe.c
  projects/camlock/sys/dev/bxe/bxe.h
     - copied unchanged from r255802, head/sys/dev/bxe/bxe.h
  projects/camlock/sys/dev/bxe/bxe_dcb.h
     - copied unchanged from r255802, head/sys/dev/bxe/bxe_dcb.h
  projects/camlock/sys/dev/bxe/bxe_debug.c
     - copied unchanged from r255802, head/sys/dev/bxe/bxe_debug.c
  projects/camlock/sys/dev/bxe/bxe_elink.c
     - copied unchanged from r255802, head/sys/dev/bxe/bxe_elink.c
  projects/camlock/sys/dev/bxe/bxe_elink.h
     - copied unchanged from r255802, head/sys/dev/bxe/bxe_elink.h
  projects/camlock/sys/dev/bxe/bxe_stats.c
     - copied unchanged from r255802, head/sys/dev/bxe/bxe_stats.c
  projects/camlock/sys/dev/bxe/bxe_stats.h
     - copied unchanged from r255802, head/sys/dev/bxe/bxe_stats.h
  projects/camlock/sys/dev/bxe/ecore_fw_defs.h
     - copied unchanged from r255802, head/sys/dev/bxe/ecore_fw_defs.h
  projects/camlock/sys/dev/bxe/ecore_hsi.h
     - copied unchanged from r255802, head/sys/dev/bxe/ecore_hsi.h
  projects/camlock/sys/dev/bxe/ecore_init.h
     - copied unchanged from r255802, head/sys/dev/bxe/ecore_init.h
  projects/camlock/sys/dev/bxe/ecore_init_ops.h
     - copied unchanged from r255802, head/sys/dev/bxe/ecore_init_ops.h
  projects/camlock/sys/dev/bxe/ecore_mfw_req.h
     - copied unchanged from r255802, head/sys/dev/bxe/ecore_mfw_req.h
  projects/camlock/sys/dev/bxe/ecore_reg.h
     - copied unchanged from r255802, head/sys/dev/bxe/ecore_reg.h
  projects/camlock/sys/dev/bxe/ecore_sp.c
     - copied unchanged from r255802, head/sys/dev/bxe/ecore_sp.c
  projects/camlock/sys/dev/bxe/ecore_sp.h
     - copied unchanged from r255802, head/sys/dev/bxe/ecore_sp.h
     - copied from r255802, head/sys/dev/hyperv/
  projects/camlock/sys/dev/iscsi/icl.c
     - copied unchanged from r255802, head/sys/dev/iscsi/icl.c
  projects/camlock/sys/dev/iscsi/icl.h
     - copied unchanged from r255802, head/sys/dev/iscsi/icl.h
  projects/camlock/sys/dev/iscsi/icl_proxy.c
     - copied unchanged from r255802, head/sys/dev/iscsi/icl_proxy.c
  projects/camlock/sys/dev/iscsi/iscsi.c
     - copied unchanged from r255802, head/sys/dev/iscsi/iscsi.c
  projects/camlock/sys/dev/iscsi/iscsi.h
     - copied unchanged from r255802, head/sys/dev/iscsi/iscsi.h
  projects/camlock/sys/dev/iscsi/iscsi_ioctl.h
     - copied unchanged from r255802, head/sys/dev/iscsi/iscsi_ioctl.h
  projects/camlock/sys/dev/iscsi/iscsi_proto.h
     - copied unchanged from r255802, head/sys/dev/iscsi/iscsi_proto.h
  projects/camlock/sys/mips/conf/WZR-300HP
     - copied unchanged from r255802, head/sys/mips/conf/WZR-300HP
  projects/camlock/sys/mips/conf/WZR-300HP.hints
     - copied unchanged from r255802, head/sys/mips/conf/WZR-300HP.hints
     - copied from r255802, head/sys/modules/hyperv/
  projects/camlock/sys/powerpc/pseries/
     - copied from r255802, head/sys/powerpc/pseries/
  projects/camlock/sys/sys/procctl.h
     - copied unchanged from r255802, head/sys/sys/procctl.h
  projects/camlock/tools/build/options/WITHOUT_UNBOUND
     - copied unchanged from r255802, head/tools/build/options/WITHOUT_UNBOUND
  projects/camlock/tools/build/options/WITH_LLDB
     - copied unchanged from r255802, head/tools/build/options/WITH_LLDB
  projects/camlock/tools/regression/iscsi/
     - copied from r255802, head/tools/regression/iscsi/
  projects/camlock/usr.bin/calendar/calcpp.c
     - copied unchanged from r255802, head/usr.bin/calendar/calcpp.c
  projects/camlock/usr.bin/clang/lldb/
     - copied from r255802, head/usr.bin/clang/lldb/
  projects/camlock/usr.bin/drill/
     - copied from r255802, head/usr.bin/drill/
  projects/camlock/usr.bin/iscsictl/
     - copied from r255802, head/usr.bin/iscsictl/
  projects/camlock/usr.bin/protect/
     - copied from r255802, head/usr.bin/protect/
  projects/camlock/usr.sbin/ctld/
     - copied from r255802, head/usr.sbin/ctld/
  projects/camlock/usr.sbin/iscsid/
     - copied from r255802, head/usr.sbin/iscsid/
  projects/camlock/usr.sbin/unbound/
     - copied from r255802, head/usr.sbin/unbound/
Directory Properties:
  projects/camlock/sys/dev/hyperv/   (props changed)
  projects/camlock/sys/modules/hyperv/   (props changed)
Deleted:
  projects/camlock/contrib/ipfilter/BSD/
  projects/camlock/contrib/ipfilter/FAQ.FreeBSD
  projects/camlock/contrib/ipfilter/FWTK/
  projects/camlock/contrib/ipfilter/FreeBSD/
  projects/camlock/contrib/ipfilter/FreeBSD-2.2/
  projects/camlock/contrib/ipfilter/FreeBSD-3/
  projects/camlock/contrib/ipfilter/FreeBSD-4.0/
  projects/camlock/contrib/ipfilter/IMPORTANT
  projects/camlock/contrib/ipfilter/INST.FreeBSD-2.2
  projects/camlock/contrib/ipfilter/INSTALL.FreeBSD
  projects/camlock/contrib/ipfilter/INSTALL.xBSD
  projects/camlock/contrib/ipfilter/IPF.KANJI
  projects/camlock/contrib/ipfilter/WhatsNew40.txt
  projects/camlock/contrib/ipfilter/bsdinstall
  projects/camlock/contrib/ipfilter/etc/
  projects/camlock/contrib/ipfilter/perl/
  projects/camlock/contrib/ipfilter/test/
  projects/camlock/contrib/ipfilter/todo
  projects/camlock/crypto/openssh/openbsd-compat/getopt.c
  projects/camlock/etc/etc.amd64/libmap32.conf
  projects/camlock/sys/amd64/conf/XENHVM
  projects/camlock/sys/dev/bxe/bxe_debug.h
  projects/camlock/sys/dev/bxe/bxe_fw_defs.h
  projects/camlock/sys/dev/bxe/bxe_hsi.h
  projects/camlock/sys/dev/bxe/bxe_include.h
  projects/camlock/sys/dev/bxe/bxe_init.h
  projects/camlock/sys/dev/bxe/bxe_init_values_e1.h
  projects/camlock/sys/dev/bxe/bxe_init_values_e1h.h
  projects/camlock/sys/dev/bxe/bxe_link.c
  projects/camlock/sys/dev/bxe/bxe_link.h
  projects/camlock/sys/dev/bxe/bxe_reg.h
  projects/camlock/sys/dev/bxe/bxe_self_test.h
  projects/camlock/sys/dev/bxe/dump_e1.h
  projects/camlock/sys/dev/bxe/dump_e1h.h
  projects/camlock/sys/dev/bxe/hw_dump_reg_st.h
  projects/camlock/sys/dev/bxe/if_bxe.c
  projects/camlock/sys/dev/bxe/if_bxe.h
  projects/camlock/sys/i386/conf/XENHVM
Modified:
  projects/camlock/LOCKS
  projects/camlock/Makefile
  projects/camlock/Makefile.inc1
  projects/camlock/ObsoleteFiles.inc
  projects/camlock/UPDATING
  projects/camlock/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/camlock/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  projects/camlock/cddl/lib/libdtrace/tcp.d
  projects/camlock/contrib/binutils/binutils/readelf.c
  projects/camlock/contrib/binutils/include/elf/common.h
  projects/camlock/contrib/ipfilter/ip_fil.c
  projects/camlock/contrib/ldns/ldns/dnssec_verify.h
  projects/camlock/contrib/ldns/ldns/util.h
  projects/camlock/contrib/llvm/tools/lldb/source/lldb.cpp
  projects/camlock/contrib/unbound/configure
  projects/camlock/contrib/unbound/configure.ac
  projects/camlock/contrib/unbound/daemon/cachedump.c
  projects/camlock/contrib/unbound/daemon/remote.c
  projects/camlock/contrib/unbound/daemon/remote.h
  projects/camlock/contrib/unbound/daemon/unbound.c
  projects/camlock/contrib/unbound/daemon/worker.c
  projects/camlock/contrib/unbound/daemon/worker.h
  projects/camlock/contrib/unbound/libunbound/context.c
  projects/camlock/contrib/unbound/libunbound/context.h
  projects/camlock/contrib/unbound/libunbound/libunbound.c
  projects/camlock/contrib/unbound/libunbound/libworker.c
  projects/camlock/contrib/unbound/libunbound/libworker.h
  projects/camlock/contrib/unbound/libunbound/unbound.h
  projects/camlock/contrib/unbound/smallapp/unbound-anchor.c
  projects/camlock/contrib/unbound/smallapp/unbound-control-setup.sh
  projects/camlock/contrib/unbound/smallapp/worker_cb.c
  projects/camlock/contrib/unbound/util/config_file.c
  projects/camlock/contrib/unbound/util/config_file.h
  projects/camlock/contrib/unbound/util/configlexer.c
  projects/camlock/contrib/unbound/util/configparser.c
  projects/camlock/contrib/unbound/util/configparser.h
  projects/camlock/contrib/unbound/util/fptr_wlist.c
  projects/camlock/crypto/openssh/ChangeLog
  projects/camlock/crypto/openssh/README
  projects/camlock/crypto/openssh/aclocal.m4
  projects/camlock/crypto/openssh/addrmatch.c
  projects/camlock/crypto/openssh/auth-chall.c
  projects/camlock/crypto/openssh/auth-krb5.c
  projects/camlock/crypto/openssh/auth-options.c
  projects/camlock/crypto/openssh/auth-pam.c
  projects/camlock/crypto/openssh/auth-rsa.c
  projects/camlock/crypto/openssh/auth.c
  projects/camlock/crypto/openssh/auth.h
  projects/camlock/crypto/openssh/auth1.c
  projects/camlock/crypto/openssh/auth2-chall.c
  projects/camlock/crypto/openssh/auth2-gss.c
  projects/camlock/crypto/openssh/auth2-hostbased.c
  projects/camlock/crypto/openssh/auth2-jpake.c
  projects/camlock/crypto/openssh/auth2-kbdint.c
  projects/camlock/crypto/openssh/auth2-passwd.c
  projects/camlock/crypto/openssh/auth2-pubkey.c
  projects/camlock/crypto/openssh/auth2.c
  projects/camlock/crypto/openssh/authfd.c
  projects/camlock/crypto/openssh/authfile.c
  projects/camlock/crypto/openssh/bufaux.c
  projects/camlock/crypto/openssh/bufbn.c
  projects/camlock/crypto/openssh/bufec.c
  projects/camlock/crypto/openssh/buffer.c
  projects/camlock/crypto/openssh/buffer.h
  projects/camlock/crypto/openssh/canohost.c
  projects/camlock/crypto/openssh/channels.c
  projects/camlock/crypto/openssh/channels.h
  projects/camlock/crypto/openssh/cipher-3des1.c
  projects/camlock/crypto/openssh/cipher-aes.c
  projects/camlock/crypto/openssh/cipher-ctr.c
  projects/camlock/crypto/openssh/cipher.c
  projects/camlock/crypto/openssh/cipher.h
  projects/camlock/crypto/openssh/clientloop.c
  projects/camlock/crypto/openssh/clientloop.h
  projects/camlock/crypto/openssh/compat.c
  projects/camlock/crypto/openssh/config.guess
  projects/camlock/crypto/openssh/config.h
  projects/camlock/crypto/openssh/config.h.in
  projects/camlock/crypto/openssh/defines.h
  projects/camlock/crypto/openssh/dh.c
  projects/camlock/crypto/openssh/dns.c
  projects/camlock/crypto/openssh/groupaccess.c
  projects/camlock/crypto/openssh/gss-genr.c
  projects/camlock/crypto/openssh/gss-serv-krb5.c
  projects/camlock/crypto/openssh/gss-serv.c
  projects/camlock/crypto/openssh/hostfile.c
  projects/camlock/crypto/openssh/hostfile.h
  projects/camlock/crypto/openssh/includes.h
  projects/camlock/crypto/openssh/jpake.c
  projects/camlock/crypto/openssh/kex.c
  projects/camlock/crypto/openssh/kex.h
  projects/camlock/crypto/openssh/kexdhc.c
  projects/camlock/crypto/openssh/kexdhs.c
  projects/camlock/crypto/openssh/kexecdh.c
  projects/camlock/crypto/openssh/kexecdhc.c
  projects/camlock/crypto/openssh/kexecdhs.c
  projects/camlock/crypto/openssh/kexgexc.c
  projects/camlock/crypto/openssh/kexgexs.c
  projects/camlock/crypto/openssh/key.c
  projects/camlock/crypto/openssh/key.h
  projects/camlock/crypto/openssh/krl.c
  projects/camlock/crypto/openssh/log.c
  projects/camlock/crypto/openssh/log.h
  projects/camlock/crypto/openssh/loginrec.c
  projects/camlock/crypto/openssh/mac.c
  projects/camlock/crypto/openssh/mac.h
  projects/camlock/crypto/openssh/match.c
  projects/camlock/crypto/openssh/misc.c
  projects/camlock/crypto/openssh/misc.h
  projects/camlock/crypto/openssh/moduli.c
  projects/camlock/crypto/openssh/monitor.c
  projects/camlock/crypto/openssh/monitor_mm.c
  projects/camlock/crypto/openssh/monitor_wrap.c
  projects/camlock/crypto/openssh/mux.c
  projects/camlock/crypto/openssh/myproposal.h
  projects/camlock/crypto/openssh/openbsd-compat/bsd-cygwin_util.c
  projects/camlock/crypto/openssh/openbsd-compat/bsd-cygwin_util.h
  projects/camlock/crypto/openssh/openbsd-compat/bsd-misc.h
  projects/camlock/crypto/openssh/openbsd-compat/openbsd-compat.h
  projects/camlock/crypto/openssh/openbsd-compat/port-aix.c
  projects/camlock/crypto/openssh/openbsd-compat/port-linux.c
  projects/camlock/crypto/openssh/openbsd-compat/xcrypt.c
  projects/camlock/crypto/openssh/packet.c
  projects/camlock/crypto/openssh/packet.h
  projects/camlock/crypto/openssh/pathnames.h
  projects/camlock/crypto/openssh/progressmeter.c
  projects/camlock/crypto/openssh/readconf.c
  projects/camlock/crypto/openssh/readconf.h
  projects/camlock/crypto/openssh/readpass.c
  projects/camlock/crypto/openssh/roaming_client.c
  projects/camlock/crypto/openssh/roaming_common.c
  projects/camlock/crypto/openssh/rsa.c
  projects/camlock/crypto/openssh/sandbox-systrace.c
  projects/camlock/crypto/openssh/schnorr.c
  projects/camlock/crypto/openssh/scp.1
  projects/camlock/crypto/openssh/scp.c
  projects/camlock/crypto/openssh/servconf.c
  projects/camlock/crypto/openssh/servconf.h
  projects/camlock/crypto/openssh/serverloop.c
  projects/camlock/crypto/openssh/session.c
  projects/camlock/crypto/openssh/sftp-client.c
  projects/camlock/crypto/openssh/sftp-client.h
  projects/camlock/crypto/openssh/sftp-common.c
  projects/camlock/crypto/openssh/sftp-glob.c
  projects/camlock/crypto/openssh/sftp-server.8
  projects/camlock/crypto/openssh/sftp-server.c
  projects/camlock/crypto/openssh/sftp.1
  projects/camlock/crypto/openssh/sftp.c
  projects/camlock/crypto/openssh/ssh-add.c
  projects/camlock/crypto/openssh/ssh-agent.c
  projects/camlock/crypto/openssh/ssh-dss.c
  projects/camlock/crypto/openssh/ssh-ecdsa.c
  projects/camlock/crypto/openssh/ssh-keygen.1
  projects/camlock/crypto/openssh/ssh-keygen.c
  projects/camlock/crypto/openssh/ssh-keyscan.1
  projects/camlock/crypto/openssh/ssh-keyscan.c
  projects/camlock/crypto/openssh/ssh-keysign.8
  projects/camlock/crypto/openssh/ssh-keysign.c
  projects/camlock/crypto/openssh/ssh-pkcs11-client.c
  projects/camlock/crypto/openssh/ssh-pkcs11-helper.8
  projects/camlock/crypto/openssh/ssh-pkcs11-helper.c
  projects/camlock/crypto/openssh/ssh-pkcs11.c
  projects/camlock/crypto/openssh/ssh-rsa.c
  projects/camlock/crypto/openssh/ssh.1
  projects/camlock/crypto/openssh/ssh.c
  projects/camlock/crypto/openssh/ssh_config
  projects/camlock/crypto/openssh/ssh_config.5
  projects/camlock/crypto/openssh/ssh_namespace.h
  projects/camlock/crypto/openssh/sshconnect.c
  projects/camlock/crypto/openssh/sshconnect1.c
  projects/camlock/crypto/openssh/sshconnect2.c
  projects/camlock/crypto/openssh/sshd.8
  projects/camlock/crypto/openssh/sshd.c
  projects/camlock/crypto/openssh/sshd_config
  projects/camlock/crypto/openssh/sshd_config.5
  projects/camlock/crypto/openssh/sshlogin.c
  projects/camlock/crypto/openssh/sshlogin.h
  projects/camlock/crypto/openssh/uidswap.c
  projects/camlock/crypto/openssh/umac.c
  projects/camlock/crypto/openssh/umac.h
  projects/camlock/crypto/openssh/umac128.c
  projects/camlock/crypto/openssh/uuencode.c
  projects/camlock/crypto/openssh/version.h
  projects/camlock/crypto/openssh/xmalloc.c
  projects/camlock/crypto/openssh/xmalloc.h
  projects/camlock/etc/Makefile
  projects/camlock/etc/defaults/rc.conf
  projects/camlock/etc/group
  projects/camlock/etc/master.passwd
  projects/camlock/etc/mtree/BSD.root.dist
  projects/camlock/etc/mtree/BSD.var.dist
  projects/camlock/etc/network.subr
  projects/camlock/etc/rc.d/Makefile
  projects/camlock/etc/rc.d/ipfilter
  projects/camlock/etc/rc.d/ipfs
  projects/camlock/etc/rc.d/ipmon
  projects/camlock/etc/rc.d/sendmail
  projects/camlock/etc/rc.d/sshd
  projects/camlock/gnu/lib/libstdc++/Makefile
  projects/camlock/gnu/lib/libsupc++/Makefile
  projects/camlock/include/Makefile
  projects/camlock/include/paths.h
  projects/camlock/kerberos5/Makefile.inc
  projects/camlock/kerberos5/lib/libheimipcc/Makefile
  projects/camlock/kerberos5/lib/libheimipcs/Makefile
  projects/camlock/kerberos5/lib/libkrb5/Makefile
  projects/camlock/kerberos5/libexec/digest-service/Makefile
  projects/camlock/kerberos5/libexec/kcm/Makefile
  projects/camlock/lib/Makefile
  projects/camlock/lib/clang/Makefile
  projects/camlock/lib/clang/libllvmmc/Makefile
  projects/camlock/lib/clang/libllvmsupport/Makefile
  projects/camlock/lib/clang/libllvmx86disassembler/Makefile
  projects/camlock/lib/libc/gen/lockf.3
  projects/camlock/lib/libc/net/sctp_sys_calls.c
  projects/camlock/lib/libc/sys/Makefile.inc
  projects/camlock/lib/libc/sys/Symbol.map
  projects/camlock/lib/libc/sys/close.2
  projects/camlock/lib/libc/sys/ioctl.2
  projects/camlock/lib/libc/sys/mmap.2
  projects/camlock/lib/libc/sys/read.2
  projects/camlock/lib/libc/sys/socketpair.2
  projects/camlock/lib/libc/sys/write.2
  projects/camlock/lib/msun/Symbol.map
  projects/camlock/libexec/rtld-elf/libmap.c
  projects/camlock/libexec/rtld-elf/libmap.h
  projects/camlock/libexec/rtld-elf/rtld.c
  projects/camlock/release/powerpc/mkisoimages.sh
  projects/camlock/release/release.sh
  projects/camlock/sbin/etherswitchcfg/etherswitchcfg.8
  projects/camlock/sbin/etherswitchcfg/etherswitchcfg.c
  projects/camlock/sbin/hastd/hast.h
  projects/camlock/sbin/hastd/primary.c
  projects/camlock/sbin/hastd/secondary.c
  projects/camlock/sbin/iscontrol/iscontrol.8
  projects/camlock/sbin/iscontrol/iscsi.conf.5
  projects/camlock/secure/lib/libssh/Makefile
  projects/camlock/secure/libexec/sftp-server/Makefile
  projects/camlock/secure/libexec/ssh-keysign/Makefile
  projects/camlock/secure/libexec/ssh-pkcs11-helper/Makefile
  projects/camlock/secure/usr.bin/bdes/bdes.1
  projects/camlock/secure/usr.bin/scp/Makefile
  projects/camlock/secure/usr.bin/sftp/Makefile
  projects/camlock/secure/usr.bin/ssh-add/Makefile
  projects/camlock/secure/usr.bin/ssh-agent/Makefile
  projects/camlock/secure/usr.bin/ssh-keygen/Makefile
  projects/camlock/secure/usr.bin/ssh-keyscan/Makefile
  projects/camlock/secure/usr.bin/ssh/Makefile
  projects/camlock/secure/usr.sbin/sshd/Makefile
  projects/camlock/share/i18n/csmapper/Makefile
  projects/camlock/share/i18n/esdb/Makefile
  projects/camlock/share/man/man4/Makefile
  projects/camlock/share/man/man4/altq.4
  projects/camlock/share/man/man4/bxe.4
  projects/camlock/share/man/man4/capsicum.4
  projects/camlock/share/man/man4/ctl.4
  projects/camlock/share/man/man4/geom.4
  projects/camlock/share/man/man4/psm.4
  projects/camlock/share/man/man4/vlan.4
  projects/camlock/share/man/man5/Makefile
  projects/camlock/share/man/man5/fstab.5
  projects/camlock/share/man/man5/libmap.conf.5
  projects/camlock/share/man/man5/rc.conf.5
  projects/camlock/share/man/man5/src.conf.5
  projects/camlock/share/man/man9/Makefile
  projects/camlock/share/man/man9/sysctl.9
  projects/camlock/share/man/man9/sysctl_add_oid.9
  projects/camlock/share/man/man9/vm_map_find.9
  projects/camlock/share/mk/bsd.libnames.mk
  projects/camlock/share/mk/bsd.own.mk
  projects/camlock/share/mk/bsd.prog.mk
  projects/camlock/sys/amd64/amd64/mp_machdep.c
  projects/camlock/sys/amd64/amd64/pmap.c
  projects/camlock/sys/amd64/amd64/sys_machdep.c
  projects/camlock/sys/amd64/conf/GENERIC
  projects/camlock/sys/amd64/conf/NOTES
  projects/camlock/sys/amd64/include/cpu.h
  projects/camlock/sys/amd64/include/intr_machdep.h
  projects/camlock/sys/amd64/include/pmap.h
  projects/camlock/sys/amd64/include/vmm.h   (contents, props changed)
  projects/camlock/sys/amd64/include/vmm_dev.h   (contents, props changed)
  projects/camlock/sys/amd64/linux32/linux32_proto.h
  projects/camlock/sys/amd64/linux32/linux32_syscall.h
  projects/camlock/sys/amd64/linux32/linux32_syscalls.c
  projects/camlock/sys/amd64/linux32/linux32_sysent.c
  projects/camlock/sys/amd64/vmm/io/ppt.c
  projects/camlock/sys/amd64/vmm/io/ppt.h
  projects/camlock/sys/amd64/vmm/vmm.c
  projects/camlock/sys/amd64/vmm/vmm_instruction_emul.c
  projects/camlock/sys/amd64/vmm/x86.c
  projects/camlock/sys/arm/arm/pmap-v6.c
  projects/camlock/sys/arm/arm/pmap.c
  projects/camlock/sys/arm/arm/stdatomic.c
  projects/camlock/sys/arm/arm/sys_machdep.c
  projects/camlock/sys/arm/arm/vm_machdep.c
  projects/camlock/sys/cam/ctl/ctl.c
  projects/camlock/sys/cam/ctl/ctl_ioctl.h
  projects/camlock/sys/cddl/compat/opensolaris/sys/kcondvar.h
  projects/camlock/sys/cddl/compat/opensolaris/sys/time.h
  projects/camlock/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
  projects/camlock/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
  projects/camlock/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/camlock/sys/compat/freebsd32/freebsd32.h
  projects/camlock/sys/compat/freebsd32/freebsd32_capability.c
  projects/camlock/sys/compat/freebsd32/freebsd32_misc.c
  projects/camlock/sys/compat/freebsd32/freebsd32_proto.h
  projects/camlock/sys/compat/freebsd32/freebsd32_syscall.h
  projects/camlock/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/camlock/sys/compat/freebsd32/freebsd32_sysent.c
  projects/camlock/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/camlock/sys/compat/freebsd32/syscalls.master
  projects/camlock/sys/compat/linux/linux_misc.c
  projects/camlock/sys/compat/svr4/imgact_svr4.c
  projects/camlock/sys/conf/NOTES
  projects/camlock/sys/conf/files
  projects/camlock/sys/conf/files.amd64
  projects/camlock/sys/conf/files.i386
  projects/camlock/sys/conf/files.powerpc
  projects/camlock/sys/conf/newvers.sh
  projects/camlock/sys/conf/options
  projects/camlock/sys/conf/options.powerpc
  projects/camlock/sys/contrib/ipfilter/netinet/ip_compat.h
  projects/camlock/sys/contrib/ipfilter/netinet/ip_fil.h
  projects/camlock/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c   (contents, props changed)
  projects/camlock/sys/contrib/ipfilter/netinet/ip_log.c
  projects/camlock/sys/contrib/ipfilter/netinet/mlfk_ipl.c
  projects/camlock/sys/dev/acpica/acpi_timer.c
  projects/camlock/sys/dev/arcmsr/arcmsr.c
  projects/camlock/sys/dev/cpuctl/cpuctl.c
  projects/camlock/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/camlock/sys/dev/cxgbe/tom/t4_tom.c
  projects/camlock/sys/dev/cxgbe/tom/t4_tom.h
  projects/camlock/sys/dev/drm2/i915/i915_gem.c
  projects/camlock/sys/dev/drm2/radeon/r100.c
  projects/camlock/sys/dev/drm2/radeon/r300.c
  projects/camlock/sys/dev/drm2/radeon/radeon_bios.c
  projects/camlock/sys/dev/drm2/radeon/radeon_device.c
  projects/camlock/sys/dev/drm2/radeon/rs600.c
  projects/camlock/sys/dev/iicbus/if_ic.c
  projects/camlock/sys/dev/iscsi_initiator/iscsi.c
  projects/camlock/sys/dev/lmc/if_lmc.c
  projects/camlock/sys/dev/mps/mps_sas_lsi.c
  projects/camlock/sys/dev/nfe/if_nfe.c
  projects/camlock/sys/dev/ofw/ofw_bus_subr.c
  projects/camlock/sys/dev/ofw/ofw_console.c
  projects/camlock/sys/dev/ofw/openfirm.c
  projects/camlock/sys/dev/ofw/openfirm.h
  projects/camlock/sys/dev/pci/vga_pci.c
  projects/camlock/sys/dev/ppbus/if_plip.c
  projects/camlock/sys/dev/usb/controller/xhci.c
  projects/camlock/sys/dev/usb/controller/xhci.h
  projects/camlock/sys/dev/usb/controller/xhci_pci.c
  projects/camlock/sys/dev/usb/net/if_usie.c
  projects/camlock/sys/dev/usb/net/uhso.c
  projects/camlock/sys/dev/usb/storage/umass.c
  projects/camlock/sys/dev/usb/usb_hub.c
  projects/camlock/sys/dev/xen/control/control.c
  projects/camlock/sys/dev/xen/timer/timer.c
  projects/camlock/sys/dev/xen/xenpci/xenpci.c
  projects/camlock/sys/fs/nullfs/null_vnops.c
  projects/camlock/sys/i386/conf/GENERIC
  projects/camlock/sys/i386/conf/NOTES
  projects/camlock/sys/i386/i386/mp_machdep.c
  projects/camlock/sys/i386/i386/pmap.c
  projects/camlock/sys/i386/i386/sys_machdep.c
  projects/camlock/sys/i386/i386/vm_machdep.c
  projects/camlock/sys/i386/ibcs2/imgact_coff.c
  projects/camlock/sys/i386/include/cpu.h
  projects/camlock/sys/i386/include/intr_machdep.h
  projects/camlock/sys/i386/include/xen/xenvar.h
  projects/camlock/sys/i386/linux/imgact_linux.c
  projects/camlock/sys/i386/linux/linux_proto.h
  projects/camlock/sys/i386/linux/linux_syscall.h
  projects/camlock/sys/i386/linux/linux_syscalls.c
  projects/camlock/sys/i386/linux/linux_sysent.c
  projects/camlock/sys/i386/xen/mp_machdep.c
  projects/camlock/sys/i386/xen/mptable.c
  projects/camlock/sys/i386/xen/pmap.c
  projects/camlock/sys/ia64/ia32/ia32_signal.c
  projects/camlock/sys/ia64/ia64/pmap.c
  projects/camlock/sys/kern/imgact_elf.c
  projects/camlock/sys/kern/imgact_gzip.c
  projects/camlock/sys/kern/init_main.c
  projects/camlock/sys/kern/init_sysent.c
  projects/camlock/sys/kern/kern_condvar.c
  projects/camlock/sys/kern/kern_event.c
  projects/camlock/sys/kern/kern_fork.c
  projects/camlock/sys/kern/kern_ktrace.c
  projects/camlock/sys/kern/kern_lock.c
  projects/camlock/sys/kern/kern_mutex.c
  projects/camlock/sys/kern/kern_proc.c
  projects/camlock/sys/kern/kern_rmlock.c
  projects/camlock/sys/kern/kern_rwlock.c
  projects/camlock/sys/kern/kern_sx.c
  projects/camlock/sys/kern/kern_synch.c
  projects/camlock/sys/kern/kern_timeout.c
  projects/camlock/sys/kern/link_elf.c
  projects/camlock/sys/kern/link_elf_obj.c
  projects/camlock/sys/kern/makesyscalls.sh
  projects/camlock/sys/kern/subr_prf.c
  projects/camlock/sys/kern/subr_smp.c
  projects/camlock/sys/kern/subr_uio.c
  projects/camlock/sys/kern/sys_pipe.c
  projects/camlock/sys/kern/sys_process.c
  projects/camlock/sys/kern/syscalls.c
  projects/camlock/sys/kern/syscalls.master
  projects/camlock/sys/kern/systrace_args.c
  projects/camlock/sys/kern/sysv_shm.c
  projects/camlock/sys/kern/uipc_shm.c
  projects/camlock/sys/kern/uipc_socket.c
  projects/camlock/sys/kern/uipc_syscalls.c
  projects/camlock/sys/kern/uipc_usrreq.c
  projects/camlock/sys/kern/vfs_lookup.c
  projects/camlock/sys/kern/vfs_mountroot.c
  projects/camlock/sys/kern/vfs_vnops.c
  projects/camlock/sys/mips/atheros/ar933x_chip.c
  projects/camlock/sys/mips/conf/TP-WN1043ND
  projects/camlock/sys/mips/mips/pmap.c
  projects/camlock/sys/mips/mips/vm_machdep.c
  projects/camlock/sys/modules/Makefile
  projects/camlock/sys/modules/bxe/Makefile
  projects/camlock/sys/modules/ctl/Makefile
  projects/camlock/sys/modules/cxgb/cxgb/Makefile
  projects/camlock/sys/modules/iscsi/Makefile
  projects/camlock/sys/modules/sfxge/Makefile
  projects/camlock/sys/modules/ti/Makefile
  projects/camlock/sys/net/if.c
  projects/camlock/sys/net/if_gif.c
  projects/camlock/sys/net/if_gre.c
  projects/camlock/sys/net/if_spppsubr.c
  projects/camlock/sys/net/if_tun.c
  projects/camlock/sys/netinet/ip_input.c
  projects/camlock/sys/netinet/sctp_output.c
  projects/camlock/sys/netinet/tcp_syncache.h
  projects/camlock/sys/netinet/tcp_var.h
  projects/camlock/sys/netinet6/frag6.c
  projects/camlock/sys/netinet6/in6.c
  projects/camlock/sys/netinet6/ip6_input.c
  projects/camlock/sys/netnatm/natm.c
  projects/camlock/sys/powerpc/aim/mmu_oea.c
  projects/camlock/sys/powerpc/aim/mmu_oea64.c
  projects/camlock/sys/powerpc/aim/mmu_oea64.h
  projects/camlock/sys/powerpc/aim/nexus.c
  projects/camlock/sys/powerpc/aim/vm_machdep.c
  projects/camlock/sys/powerpc/booke/pmap.c
  projects/camlock/sys/powerpc/booke/vm_machdep.c
  projects/camlock/sys/powerpc/conf/DEFAULTS
  projects/camlock/sys/powerpc/conf/GENERIC
  projects/camlock/sys/powerpc/conf/GENERIC64
  projects/camlock/sys/powerpc/include/param.h
  projects/camlock/sys/powerpc/include/platform.h
  projects/camlock/sys/powerpc/include/pte.h
  projects/camlock/sys/powerpc/include/spr.h
  projects/camlock/sys/powerpc/ofw/ofw_pcibus.c
  projects/camlock/sys/powerpc/ofw/ofw_syscons.c
  projects/camlock/sys/powerpc/ofw/rtas.c
  projects/camlock/sys/powerpc/powermac/platform_powermac.c
  projects/camlock/sys/powerpc/powerpc/busdma_machdep.c
  projects/camlock/sys/powerpc/powerpc/cpu.c
  projects/camlock/sys/powerpc/powerpc/intr_machdep.c
  projects/camlock/sys/powerpc/powerpc/mp_machdep.c
  projects/camlock/sys/powerpc/powerpc/platform.c
  projects/camlock/sys/powerpc/powerpc/platform_if.m
  projects/camlock/sys/powerpc/powerpc/pmap_dispatch.c
  projects/camlock/sys/sparc64/sparc64/pmap.c
  projects/camlock/sys/sparc64/sparc64/sys_machdep.c
  projects/camlock/sys/sparc64/sparc64/vm_machdep.c
  projects/camlock/sys/sys/event.h
  projects/camlock/sys/sys/eventvar.h
  projects/camlock/sys/sys/lock.h
  projects/camlock/sys/sys/mman.h
  projects/camlock/sys/sys/param.h
  projects/camlock/sys/sys/proc.h
  projects/camlock/sys/sys/sdt.h
  projects/camlock/sys/sys/sf_buf.h
  projects/camlock/sys/sys/smp.h
  projects/camlock/sys/sys/socketvar.h
  projects/camlock/sys/sys/syscall.h
  projects/camlock/sys/sys/syscall.mk
  projects/camlock/sys/sys/syscallsubr.h
  projects/camlock/sys/sys/sysctl.h
  projects/camlock/sys/sys/sysproto.h
  projects/camlock/sys/sys/timetc.h
  projects/camlock/sys/sys/uio.h
  projects/camlock/sys/sys/user.h
  projects/camlock/sys/vm/pmap.h
  projects/camlock/sys/vm/uma_int.h
  projects/camlock/sys/vm/vm_extern.h
  projects/camlock/sys/vm/vm_fault.c
  projects/camlock/sys/vm/vm_init.c
  projects/camlock/sys/vm/vm_kern.c
  projects/camlock/sys/vm/vm_map.c
  projects/camlock/sys/vm/vm_map.h
  projects/camlock/sys/vm/vm_mmap.c
  projects/camlock/sys/vm/vm_page.c
  projects/camlock/sys/vm/vm_page.h
  projects/camlock/sys/vm/vm_reserv.c
  projects/camlock/sys/x86/acpica/acpi_wakeup.c
  projects/camlock/sys/x86/isa/atpic.c
  projects/camlock/sys/x86/x86/intr_machdep.c
  projects/camlock/sys/x86/x86/io_apic.c
  projects/camlock/sys/x86/x86/local_apic.c
  projects/camlock/sys/x86/xen/hvm.c
  projects/camlock/sys/x86/xen/xen_intr.c
  projects/camlock/sys/xen/hvm.h
  projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc
  projects/camlock/tools/build/options/WITHOUT_LDNS
  projects/camlock/tools/make_libdeps.sh
  projects/camlock/tools/regression/sockets/sendfile/sendfile.c
  projects/camlock/tools/tools/net80211/wlanstats/Makefile
  projects/camlock/tools/tools/sysbuild/sysbuild.sh
  projects/camlock/usr.bin/Makefile
  projects/camlock/usr.bin/bmake/Makefile
  projects/camlock/usr.bin/calendar/Makefile   (contents, props changed)
  projects/camlock/usr.bin/calendar/calendar.1   (contents, props changed)
  projects/camlock/usr.bin/calendar/calendar.h   (contents, props changed)
  projects/camlock/usr.bin/calendar/io.c   (contents, props changed)
  projects/camlock/usr.bin/calendar/pathnames.h   (contents, props changed)
  projects/camlock/usr.bin/clang/Makefile
  projects/camlock/usr.bin/kdump/kdump.c
  projects/camlock/usr.bin/kdump/mksubr
  projects/camlock/usr.bin/procstat/procstat.1
  projects/camlock/usr.bin/svn/lib/libapr/apr.h
  projects/camlock/usr.bin/truss/syscall.h
  projects/camlock/usr.bin/truss/syscalls.c
  projects/camlock/usr.sbin/Makefile
  projects/camlock/usr.sbin/bhyve/acpi.c
  projects/camlock/usr.sbin/bhyve/mevent.c
  projects/camlock/usr.sbin/bhyve/mevent.h
  projects/camlock/usr.sbin/bhyve/mevent_test.c
  projects/camlock/usr.sbin/bhyve/pit_8254.c
  projects/camlock/usr.sbin/bhyve/rtc.c
  projects/camlock/usr.sbin/bhyve/virtio.c
  projects/camlock/usr.sbin/ctladm/ctladm.8
  projects/camlock/usr.sbin/ctladm/ctladm.c
  projects/camlock/usr.sbin/daemon/daemon.8
  projects/camlock/usr.sbin/daemon/daemon.c
  projects/camlock/usr.sbin/gpioctl/gpioctl.8
  projects/camlock/usr.sbin/gpioctl/gpioctl.c
  projects/camlock/usr.sbin/mergemaster/mergemaster.sh
  projects/camlock/usr.sbin/mtree/create.c
  projects/camlock/usr.sbin/pkg/config.c
  projects/camlock/usr.sbin/pkg/elf_tables.h
Directory Properties:
  projects/camlock/   (props changed)
  projects/camlock/cddl/   (props changed)
  projects/camlock/cddl/contrib/opensolaris/   (props changed)
  projects/camlock/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/camlock/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/camlock/contrib/binutils/   (props changed)
  projects/camlock/contrib/ipfilter/   (props changed)
  projects/camlock/contrib/ldns/   (props changed)
  projects/camlock/contrib/llvm/   (props changed)
  projects/camlock/contrib/unbound/   (props changed)
  projects/camlock/contrib/unbound/validator/val_secalgo.c   (props changed)
  projects/camlock/contrib/unbound/validator/val_secalgo.h   (props changed)
  projects/camlock/crypto/openssh/   (props changed)
  projects/camlock/gnu/lib/   (props changed)
  projects/camlock/lib/libc/   (props changed)
  projects/camlock/sbin/   (props changed)
  projects/camlock/share/man/man4/   (props changed)
  projects/camlock/sys/   (props changed)
  projects/camlock/sys/amd64/vmm/   (props changed)
  projects/camlock/sys/cddl/contrib/opensolaris/   (props changed)
  projects/camlock/sys/conf/   (props changed)
  projects/camlock/sys/contrib/ipfilter/   (props changed)
  projects/camlock/usr.bin/calendar/   (props changed)
  projects/camlock/usr.bin/procstat/   (props changed)
  projects/camlock/usr.sbin/bhyve/   (props changed)

Modified: projects/camlock/LOCKS
==============================================================================
--- projects/camlock/LOCKS	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/LOCKS	Sun Sep 22 21:58:59 2013	(r255803)
@@ -12,3 +12,7 @@ releng/5.*	Requires Security Officer app
 releng/6.*	Requires Security Officer approval.
 releng/7.*	Requires Security Officer approval.
 releng/8.*	Requires Security Officer approval.
+head/sys/dev/random			Requires Security Officer approval.
+head/sys/libkern/arc4random.c		Requires Security Officer approval.
+stable/*/sys/dev/random			Requires Security Officer approval.
+stable/*/sys/libkern/arc4random.c	Requires Security Officer approval.

Modified: projects/camlock/Makefile
==============================================================================
--- projects/camlock/Makefile	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/Makefile	Sun Sep 22 21:58:59 2013	(r255803)
@@ -341,7 +341,7 @@ MMAKEENV=	MAKEOBJDIRPREFIX=${MYMAKE:H} \
 MMAKE=		${MMAKEENV} ${MAKE} \
 		-D_UPGRADING \
 		-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-		-DNO_CPU_CFLAGS -DNO_WERROR
+		-DNO_CPU_CFLAGS -DNO_WERROR DESTDIR= PROGNAME=${MYMAKE:T}
 
 make bmake: .PHONY
 	@echo
@@ -349,10 +349,10 @@ make bmake: .PHONY
 	@echo ">>> Building an up-to-date make(1)"
 	@echo "--------------------------------------------------------------"
 	${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \
-		${MMAKE} obj DESTDIR= && \
-		${MMAKE} depend DESTDIR= && \
-		${MMAKE} all DESTDIR= && \
-		${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= PROGNAME=${MYMAKE:T}
+		${MMAKE} obj && \
+		${MMAKE} depend && \
+		${MMAKE} all && \
+		${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR=
 
 tinderbox toolchains kernel-toolchains: upgrade_checks
 
@@ -374,7 +374,7 @@ kernel-toolchains:
 #
 .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
 TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64
-TARGET_ARCHES_arm?=	arm armeb armv6 armv6eb
+TARGET_ARCHES_arm?=	arm armeb armv6
 TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32
 TARGET_ARCHES_powerpc?=	powerpc powerpc64
 TARGET_ARCHES_pc98?=	i386

Modified: projects/camlock/Makefile.inc1
==============================================================================
--- projects/camlock/Makefile.inc1	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/Makefile.inc1	Sun Sep 22 21:58:59 2013	(r255803)
@@ -132,7 +132,7 @@ VERSION!=	uname -srp
 VERSION+=	${OSRELDATE}
 .endif
 
-KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm armv6eb/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
+KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}
 .else
@@ -676,8 +676,9 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_inc
 #
 # Checks to be sure system is ready for installworld/installkernel.
 #
-installcheck:
-installcheck_UGID:
+installcheck: _installcheck_world _installcheck_kernel
+_installcheck_world:
+_installcheck_kernel:
 
 #
 # Require DESTDIR to be set if installing for a different architecture or
@@ -686,8 +687,9 @@ installcheck_UGID:
 .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \
     defined(DB_FROM_SRC)
 .if !make(distributeworld)
-installcheck: installcheck_DESTDIR
-installcheck_DESTDIR:
+_installcheck_world: __installcheck_DESTDIR
+_installcheck_kernel: __installcheck_DESTDIR
+__installcheck_DESTDIR:
 .if !defined(DESTDIR) || empty(DESTDIR)
 	@echo "ERROR: Please set DESTDIR!"; \
 	false
@@ -709,7 +711,12 @@ CHECK_GIDS+=	smmsp
 CHECK_UIDS+=	proxy
 CHECK_GIDS+=	proxy authpf
 .endif
-installcheck_UGID:
+.if ${MK_UNBOUND} != "no"
+CHECK_UIDS+=	unbound
+CHECK_GIDS+=	unbound
+.endif
+_installcheck_world: __installcheck_UGID
+__installcheck_UGID:
 .for uid in ${CHECK_UIDS}
 	@if ! `id -u ${uid} >/dev/null 2>&1`; then \
 		echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
@@ -764,7 +771,7 @@ EXTRA_DISTRIBUTIONS+=	lib32
 
 MTREE_MAGIC?=	mtree 2.0
 
-distributeworld installworld: installcheck installcheck_UGID
+distributeworld installworld: _installcheck_world
 	mkdir -p ${INSTALLTMP}
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
@@ -1042,7 +1049,7 @@ buildkernel:
 # Install the kernel defined by INSTALLKERNEL
 #
 installkernel installkernel.debug \
-reinstallkernel reinstallkernel.debug: installcheck
+reinstallkernel reinstallkernel.debug: _installcheck_kernel
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false
@@ -1470,8 +1477,8 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
 		${_cddl_lib_libzfs_core} \
 		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
-		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
-		${_secure_lib_libssl}
+		${_secure_lib_libcrypto} ${_lib_libldns} \
+		${_secure_lib_libssh} ${_secure_lib_libssl}
 
 .if ${MK_ATF} != "no"
 _lib_atf_libatf_c=	lib/atf/libatf-c
@@ -1507,9 +1514,16 @@ cddl/lib/libzfs_core__L: cddl/lib/libnvp
 _secure_lib_libcrypto= secure/lib/libcrypto
 _secure_lib_libssl= secure/lib/libssl
 lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
+.if ${MK_LDNS} != "no"
+_lib_libldns= lib/libldns
+lib/libldns__L: secure/lib/libcrypto__L
+.endif
 .if ${MK_OPENSSH} != "no"
 _secure_lib_libssh= secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
+.if ${MK_LDNS} != "no"
+secure/lib/libssh__L: lib/libldns__L
+.endif
 .if ${MK_KERBEROS_SUPPORT} != "no"
 secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \

Modified: projects/camlock/ObsoleteFiles.inc
==============================================================================
--- projects/camlock/ObsoleteFiles.inc	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/ObsoleteFiles.inc	Sun Sep 22 21:58:59 2013	(r255803)
@@ -39,8 +39,14 @@
 # done
 
 # 20130908: libssh becomes private
+OLD_FILES+=usr/lib/libssh.a
+OLD_FILES+=usr/lib/libssh.so
 OLD_LIBS+=usr/lib/libssh.so.5
+OLD_FILES+=usr/lib/libssh_p.a
+OLD_FILES+=usr/lib32/libssh.a
+OLD_FILES+=usr/lib32/libssh.so
 OLD_LIBS+=usr/lib32/libssh.so.5
+OLD_FILES+=usr/lib32/libssh_p.a
 # 20130903: gnupatch is no more
 OLD_FILES+=usr/bin/gnupatch
 OLD_FILES+=usr/share/man/man1/gnupatch.1.gz

Modified: projects/camlock/UPDATING
==============================================================================
--- projects/camlock/UPDATING	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/UPDATING	Sun Sep 22 21:58:59 2013	(r255803)
@@ -31,6 +31,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130916:
+	With the addition of unbound(8), a new unbound user is now
+	required during installworld.  "mergemaster -p" can be used to
+	add the user prior to installworld, as documented in the handbook.
+
+20130911:
+	OpenSSH is now built with DNSSEC support, and will by default
+	silently trust signed SSHFP records.  This can be controlled with
+	the VerifyHostKeyDNS client configuration setting.  DNSSEC support
+	can be disabled entirely with the WITHOUT_LDNS option in src.conf.
+
 20130906:
 	The GNU Compiler Collection and C++ standard library (libstdc++)
 	are no longer built by default on platforms where clang is the system
@@ -51,6 +62,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	advised: libc, libprocstat, dhclient, tcpdump, hastd, hastctl,
 	kdump, procstat, rwho, rwhod, uniq.
 
+20130903:
+	AES-NI intrinsic support has been added to gcc.  The AES-NI module
+	has been updated to use this support.  A new gcc is required to build
+	the aesni module on both i386 and amd64.
+
 20130827:
         Thomas Dickey (vendor author thereof) reports that dialog(1) since
         2011/10/18 has a bug in handling --hline. Testers and I noticed the
@@ -291,8 +307,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 
 20121201:
 	With the addition of auditdistd(8), a new auditdistd user is now
-	depended on during installworld.  "mergemaster -p" can be used to add
-	the user prior to installworld, as documented in the handbook.
+	required during installworld.  "mergemaster -p" can be used to
+	add the user prior to installworld, as documented in the handbook.
 
 20121117:
 	The sin6_scope_id member variable in struct sockaddr_in6 is now

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Sun Sep 22 21:58:59 2013	(r255803)
@@ -19,16 +19,16 @@
 .\"
 .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright (c) 2012 by Delphix. All rights reserved.
-.\" Copyright (c) 2012, Joyent, Inc. All rights reserved.
 .\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd@FreeBSD.org>
 .\" Copyright (c) 2012, Glen Barber <gjb@FreeBSD.org>
 .\" Copyright (c) 2012, Bryan Drewery <bdrewery@FreeBSD.org>
 .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
 .\" Copyright (c) 2013 Nexenta Systems, Inc. All Rights Reserved.
+.\" Copyright (c) 2013, Joyent, Inc. All rights reserved.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 21, 2013
+.Dd September 20, 2013
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -891,14 +891,21 @@ command or unmounted by the
 command.
 .Pp
 This property is not inherited.
-.It Sy checksum Ns = Ns Cm on | off | fletcher2 | fletcher4 | sha256
+.It Sy checksum Ns = Ns Cm on | off | fletcher2 | fletcher4 | sha256 | noparity
 Controls the checksum used to verify data integrity. The default value is
 .Cm on ,
 which automatically selects an appropriate algorithm (currently,
 .Cm fletcher4 ,
 but this may change in future releases). The value
 .Cm off
-disables integrity checking on user data. Disabling checksums is
+disables integrity checking on user data.
+The value
+.Cm noparity
+not only
+disables integrity but also disables maintaining parity for user data.  This
+setting is used internally by a dump device residing on a RAID-Z pool and should
+not be used by any other dataset.
+Disabling checksums is
 .Em NOT
 a recommended practice.
 .It Sy compression Ns = Ns Cm on | off | lzjb | gzip | gzip- Ns Ar N | zle | Cm lz4

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Sun Sep 22 21:58:59 2013	(r255803)
@@ -19,10 +19,11 @@
 .\"
 .\" Copyright (c) 2012 by Delphix. All rights reserved.
 .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
+.\" Copyright (c) 2013, Joyent, Inc. All rights reserved.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 8, 2013
+.Dd September 20, 2013
 .Dt ZPOOL-FEATURES 7
 .Os
 .Sh NAME
@@ -229,6 +230,27 @@ feature. At the
 moment, this operation cannot be reversed. Booting off of
 .Sy lz4
 -compressed root pools is supported.
+.It Sy multi_vdev_crash_dump
+.Bl -column "READ\-ONLY COMPATIBLE" "com.joyent:multi_vdev_crash_dump"
+.It GUID Ta com.joyent:multi_vdev_crash_dump
+.It READ\-ONLY COMPATIBLE Ta no
+.It DEPENDENCIES Ta none
+.El
+.Pp
+This feature allows a dump device to be configured with a pool comprised
+of multiple vdevs.
+Those vdevs may be arranged in any mirrored or raidz
+configuration.
+.\" TODO: this is not yet supported on FreeBSD.
+.\" .Pp
+.\" When the
+.\" .Sy multi_vdev_crash_dump
+.\" feature is set to
+.\" .Sy enabled ,
+.\" the administrator can use the
+.\" .Xr dumpon 8
+.\" command to configure a
+.\" dump device on a pool comprised of multiple vdevs.
 .El
 .Sh SEE ALSO
 .Xr zpool 8

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Sun Sep 22 21:58:59 2013	(r255803)
@@ -23,6 +23,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
 
 #include <sys/types.h>
@@ -4020,9 +4021,7 @@ supported_dump_vdev_type(libzfs_handle_t
 	uint_t children, c;
 
 	verify(nvlist_lookup_string(config, ZPOOL_CONFIG_TYPE, &type) == 0);
-	if (strcmp(type, VDEV_TYPE_RAIDZ) == 0 ||
-	    strcmp(type, VDEV_TYPE_FILE) == 0 ||
-	    strcmp(type, VDEV_TYPE_LOG) == 0 ||
+	if (strcmp(type, VDEV_TYPE_FILE) == 0 ||
 	    strcmp(type, VDEV_TYPE_HOLE) == 0 ||
 	    strcmp(type, VDEV_TYPE_MISSING) == 0) {
 		zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
@@ -4041,8 +4040,12 @@ supported_dump_vdev_type(libzfs_handle_t
 }
 
 /*
- * check if this zvol is allowable for use as a dump device; zero if
- * it is, > 0 if it isn't, < 0 if it isn't a zvol
+ * Check if this zvol is allowable for use as a dump device; zero if
+ * it is, > 0 if it isn't, < 0 if it isn't a zvol.
+ *
+ * Allowable storage configurations include mirrors, all raidz variants, and
+ * pools with log, cache, and spare devices.  Pools which are backed by files or
+ * have missing/hole vdevs are not suitable.
  */
 int
 zvol_check_dump_config(char *arg)
@@ -4104,12 +4107,6 @@ zvol_check_dump_config(char *arg)
 
 	verify(nvlist_lookup_nvlist_array(nvroot, ZPOOL_CONFIG_CHILDREN,
 	    &top, &toplevels) == 0);
-	if (toplevels != 1) {
-		zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-		    "'%s' has multiple top level vdevs"), poolname);
-		(void) zfs_error(hdl, EZFS_DEVOVERFLOW, errbuf);
-		goto out;
-	}
 
 	if (!supported_dump_vdev_type(hdl, top[0], errbuf)) {
 		goto out;

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Sun Sep 22 21:58:59 2013	(r255803)
@@ -349,6 +349,41 @@ top:
 	return (1);
 }
 
+/*ARGSUSED*/
+clock_t
+cv_timedwait_hires(kcondvar_t *cv, kmutex_t *mp, hrtime_t tim, hrtime_t res,
+    int flag)
+{
+	int error;
+	timestruc_t ts;
+	hrtime_t delta;
+
+	ASSERT(flag == 0);
+
+top:
+	delta = tim - gethrtime();
+	if (delta <= 0)
+		return (-1);
+
+	ts.tv_sec = delta / NANOSEC;
+	ts.tv_nsec = delta % NANOSEC;
+
+	ASSERT(mutex_owner(mp) == curthread);
+	mp->m_owner = NULL;
+	error = pthread_cond_timedwait(cv, &mp->m_lock, &ts);
+	mp->m_owner = curthread;
+
+	if (error == ETIMEDOUT)
+		return (-1);
+
+	if (error == EINTR)
+		goto top;
+
+	ASSERT(error == 0);
+
+	return (1);
+}
+
 void
 cv_signal(kcondvar_t *cv)
 {

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Sun Sep 22 21:58:59 2013	(r255803)
@@ -313,6 +313,8 @@ extern void cv_init(kcondvar_t *cv, char
 extern void cv_destroy(kcondvar_t *cv);
 extern void cv_wait(kcondvar_t *cv, kmutex_t *mp);
 extern clock_t cv_timedwait(kcondvar_t *cv, kmutex_t *mp, clock_t abstime);
+extern clock_t cv_timedwait_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t tim,
+    hrtime_t res, int flag);
 extern void cv_signal(kcondvar_t *cv);
 extern void cv_broadcast(kcondvar_t *cv);
 

Modified: projects/camlock/cddl/lib/libdtrace/tcp.d
==============================================================================
--- projects/camlock/cddl/lib/libdtrace/tcp.d	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/cddl/lib/libdtrace/tcp.d	Sun Sep 22 21:58:59 2013	(r255803)
@@ -144,7 +144,7 @@ typedef struct tcpinfo {
 #pragma D binding "1.0" translator
 translator csinfo_t < struct tcpcb *p > {
 	cs_addr =	NULL;
-	cs_cid =	(uint64_t)p;
+	cs_cid =	(uint64_t)(p == NULL ? 0 : p->t_inpcb);
 	cs_pid =	0;
 	cs_zoneid =	0;
 };

Modified: projects/camlock/contrib/binutils/binutils/readelf.c
==============================================================================
--- projects/camlock/contrib/binutils/binutils/readelf.c	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/contrib/binutils/binutils/readelf.c	Sun Sep 22 21:58:59 2013	(r255803)
@@ -9109,6 +9109,10 @@ get_note_type (unsigned e_type)
 	return _("NT_LWPSINFO (lwpsinfo_t structure)");
       case NT_WIN32PSTATUS:
 	return _("NT_WIN32PSTATUS (win32_pstatus structure)");
+      case NT_FILE:
+        return _("NT_FILE");
+      case NT_SIGINFO:
+        return _("NT_SIGINFO");
       default:
 	break;
       }
@@ -9174,6 +9178,23 @@ get_freebsd_note_type (unsigned e_type)
 }
 
 static const char *
+get_gnu_note_type (unsigned e_type)
+{
+  static char buff[64];
+
+  switch (e_type)
+    {
+    case NT_GNU_ABI_TAG:
+      return _("NT_GNU_ABI_TAG");
+    case NT_GNU_BUILD_ID:
+      return _("NT_GNU_BUILD_ID");
+    }
+
+  snprintf (buff, sizeof(buff), _("Unknown GNU note type: (0x%08x)"), e_type);
+  return buff;
+}
+
+static const char *
 get_netbsd_elfcore_note_type (unsigned e_type)
 {
   static char buff[64];
@@ -9254,6 +9275,10 @@ process_note (Elf_Internal_Note *pnote)
     /* FreeBSD-specific core file notes.  */
     nt = get_freebsd_note_type (pnote->type);
 
+  else if (const_strneq (pnote->namedata, "GNU"))
+    /* GNU-specific notes */
+    nt = get_gnu_note_type (pnote->type);
+
   else if (const_strneq (pnote->namedata, "NetBSD-CORE"))
     /* NetBSD-specific core file notes.  */
     nt = get_netbsd_elfcore_note_type (pnote->type);

Modified: projects/camlock/contrib/binutils/include/elf/common.h
==============================================================================
--- projects/camlock/contrib/binutils/include/elf/common.h	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/contrib/binutils/include/elf/common.h	Sun Sep 22 21:58:59 2013	(r255803)
@@ -388,8 +388,10 @@
 #define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
 #define NT_TASKSTRUCT	4		/* Contains copy of task struct */
 #define NT_AUXV		6		/* Contains copy of Elfxx_auxv_t */
+#define NT_FILE		0x46494c45
 #define NT_PRXFPREG	0x46e62b7f	/* Contains a user_xfpregs_struct; */
 					/*   note name must be "LINUX".  */
+#define NT_SIGINFO	0x53494749
 
 /* Note segments for core files on dir-style procfs systems.  */
 
@@ -435,6 +437,9 @@
 #define GNU_ABI_TAG_FREEBSD	3
 #define GNU_ABI_TAG_NETBSD	4
 
+/* Values for GNU .note.gnu.build-id notes.  Note name is "GNU"." */
+#define NT_GNU_BUILD_ID		3
+
 /* Values for NetBSD .note.netbsd.ident notes.  Note name is "NetBSD".  */
 
 #define NT_NETBSD_IDENT		1

Modified: projects/camlock/contrib/ipfilter/ip_fil.c
==============================================================================
--- projects/camlock/contrib/ipfilter/ip_fil.c	Sun Sep 22 20:32:28 2013	(r255802)
+++ projects/camlock/contrib/ipfilter/ip_fil.c	Sun Sep 22 21:58:59 2013	(r255803)
@@ -228,7 +228,19 @@ ipf_setifpaddr(ifp, addr)
 
 			sin6 = (struct sockaddr_in6 *)&ifa->ifa_addr;
 			sin6->sin6_family = AF_INET6;
-			inet_pton(AF_INET6, addr, &sin6->sin6_addr);
+			/* Abort if bad address. */
+			switch (inet_pton(AF_INET6, addr, &sin6->sin6_addr))
+			{
+			case 1:
+				break;
+			case -1:
+				perror("inet_pton");
+				abort();
+				break;
+			default:
+				abort();
+				break;
+			}
 		} else
 #endif
 		{

Copied: projects/camlock/contrib/ldns/drill/config.h (from r255802, head/contrib/ldns/drill/config.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/camlock/contrib/ldns/drill/config.h	Sun Sep 22 21:58:59 2013	(r255803, copy of r255802, head/contrib/ldns/drill/config.h)
@@ -0,0 +1,297 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the <ctype.h> header file. */
+#define HAVE_CTYPE_H 1
+
+/* Whether getaddrinfo is available */
+#define HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#define HAVE_GETOPT_H 1
+
+/* If you have HMAC_CTX_init */
+#define HAVE_HMAC_CTX_INIT 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `isblank' function. */
+#define HAVE_ISBLANK 1
+
+/* Define to 1 if you have the `ldns' library (-lldns). */
+#define HAVE_LIBLDNS 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <netinet/if_ether.h> header file. */
+#define HAVE_NETINET_IF_ETHER_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the <netinet/in_systm.h> header file. */
+#define HAVE_NETINET_IN_SYSTM_H 1
+
+/* Define to 1 if you have the <netinet/ip6.h> header file. */
+#define HAVE_NETINET_IP6_H 1
+
+/* Define to 1 if you have the <netinet/ip.h> header file. */
+#define HAVE_NETINET_IP_H 1
+
+/* Define to 1 if you have the <netinet/udp.h> header file. */
+#define HAVE_NETINET_UDP_H 1
+
+/* Define to 1 if you have the <net/if.h> header file. */
+#define HAVE_NET_IF_H 1
+
+/* Define to 1 if you have the <openssl/err.h> header file. */
+#define HAVE_OPENSSL_ERR_H 1
+
+/* Define to 1 if you have the <openssl/rand.h> header file. */
+#define HAVE_OPENSSL_RAND_H 1
+
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
+#define HAVE_OPENSSL_SSL_H 1
+
+/* Define if you have the SSL libraries installed. */
+#define HAVE_SSL /**/
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/mount.h> header file. */
+#define HAVE_SYS_MOUNT_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+/* #undef HAVE_WS2TCPIP_H */
+
+/* Default trust anchor file */
+#define LDNS_TRUST_ANCHOR_FILE "/etc/unbound/root.key"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "libdns@nlnetlabs.nl"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "ldns"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "ldns 1.6.16"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libdns"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.6.16"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Whether the windows socket API is used */
+/* #undef USE_WINSOCK */
+
+/* the version of the windows API enabled */
+#define WINVER 0x0502
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
+
+/* in_addr_t */
+/* #undef in_addr_t */
+
+/* in_port_t */
+/* #undef in_port_t */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to `short' if <sys/types.h> does not define. */
+/* #undef int16_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef int32_t */
+
+/* Define to `long long' if <sys/types.h> does not define. */
+/* #undef int64_t */
+
+/* Define to `char' if <sys/types.h> does not define. */
+/* #undef int8_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to 'int' if not defined */
+/* #undef socklen_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef ssize_t */
+
+/* Define to `unsigned short' if <sys/types.h> does not define. */
+/* #undef uint16_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef uint32_t */
+
+/* Define to `unsigned long long' if <sys/types.h> does not define. */
+/* #undef uint64_t */
+
+/* Define to `unsigned char' if <sys/types.h> does not define. */
+/* #undef uint8_t */
+
+
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <assert.h>
+
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#ifdef HAVE_NETINET_UDP_H
+#include <netinet/udp.h>
+#endif
+
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+
+#ifdef HAVE_NETINET_IP_H
+#include <netinet/ip.h>
+#endif
+
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+
+#ifdef HAVE_NETINET_IF_ETHER_H
+#include <netinet/if_ether.h>
+#endif
+
+#ifdef HAVE_WINSOCK2_H
+#define USE_WINSOCK 1
+#include <winsock2.h>
+#endif
+
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+
+extern char *optarg;
+extern int optind, opterr;
+
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE  1
+#endif
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS  0
+#endif
+
+#ifdef S_SPLINT_S
+#define FD_ZERO(a) /* a */
+#define FD_SET(a,b) /* a, b */
+#endif
+

Copied: projects/camlock/contrib/ldns/drill/drill.1 (from r255802, head/contrib/ldns/drill/drill.1)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/camlock/contrib/ldns/drill/drill.1	Sun Sep 22 21:58:59 2013	(r255803, copy of r255802, head/contrib/ldns/drill/drill.1)
@@ -0,0 +1,242 @@
+.\" @(#)drill.1 1.7.0 14-Jul-2004 OF; 
+.TH drill 1 "28 May 2006"
+.SH NAME
+drill \- get (debug) information out of DNS(SEC)
+.SH SYNOPSIS
+.B drill
+[
+.IR OPTIONS
+]
+.IR name
+[
+.IR @server
+]
+[
+.IR type
+]
+[
+.IR class
+]
+
+.SH DESCRIPTION
+\fBdrill\fR is a tool to designed to get all sorts of information out of the
+DNS. It is specificly designed to be used with DNSSEC. 
+.PP
+The name \fBdrill\fR is a pun on \fBdig\fR. With \fBdrill\fR you should be able
+get even more information than with \fBdig\fR.
+.PP
+If no arguments are given class defaults to 'IN' and type to 'A'. The
+server(s) specified in /etc/resolv.conf are used to query against.
+
+.PP
+\fIname\fR
+Ask for this name.
+
+.PP
+\fI@server\fR
+Send to query to this server. If not specified use the nameservers from
+\fI/etc/resolv.conf\fR.
+
+.PP
+\fItype\fR
+Ask for this RR type. If type is not given on the command line it defaults
+to 'A'. Except when doing to reverse lookup when it defaults to 'PTR'.
+
+.PP
+\fIclass\fR
+Use this class when querying.
+
+.SH SAMPLE USAGE
+\fBdrill mx miek.nl\fR
+Show the MX records of the domain miek.nl
+
+.TP
+\fBdrill -S jelte.nlnetlabs.nl\fR
+Chase any signatures in the jelte.nlnetlab.nl domain. This option is
+only available when ldns has been compiled with openssl-support.
+
+.TP
+\fBdrill -TD www.example.com\fR
+Do a DNSSEC (-D) trace (-T) from the rootservers down to www.example.com.
+This option only works when ldns has been compiled with openssl support.
+
+.TP
+\fBdrill -s dnskey jelte.nlnetlabs.nl\fR
+Show the DNSKEY record(s) for jelte.nlnetlabs.nl. For each found DNSKEY
+record also print the DS record.
+
+.SH OPTIONS
+
+.TP
+\fB\-D
+Enable DNSSEC in the query. When querying for DNSSEC types (DNSKEY, RRSIG,
+DS and NSEC) this is \fInot\fR automaticly enabled.
+
+.TP
+\fB\-T
+Trace \fIname\fR from the root down. When using this option the @server and
+the type arguments are not used.
+
+.TP
+\fB\-S
+Chase the signature(s) of 'name' to a known key or as high up in
+the tree as possible.
+
+.TP
+\fB\-V \fIlevel\fR
+Be more verbose. Set level to 5 to see the actual query that is sent.
+
+.TP
+\fB\-Q
+Quiet mode, this overrules -V. 
+
+.TP
+\fB\-f \fIfile\fR
+Read the query from a file. The query must be dumped with -w. 
+
+.TP
+\fB\-i \fIfile\fR
+read the answer from the file instead from the network. This aids
+in debugging and can be used to check if a query on disk is valid.
+If the file contains binary data it is assumed to be a query in
+network order.
+
+.TP
+\fB\-w \fIfile\fR
+Write an answer packet to file.
+
+.TP
+\fB\-q \fIfile\fR
+Write the query packet to file.
+
+.TP
+\fB\-v
+Show drill's version.
+
+.TP
+\fB\-h
+Show a short help message.
+
+.SS QUERY OPTIONS
+
+.TP
+\fB\-4
+Stay on ip4. Only send queries to ip4 enabled nameservers.
+
+.TP
+\fB\-6
+Stay on ip6. Only send queries to ip6 enabled nameservers.
+
+.TP
+\fB\-a
+Use the resolver structure's fallback mechanism if the answer
+is truncated (TC=1). If a truncated packet is received and this
+option is set, drill will first send a new query with EDNS0 
+buffer size 4096.
+
+If the EDNS0 buffer size was already set to 512+ bytes, or the
+above retry also results in a truncated answer, the resolver
+structure will fall back to TCP.
+
+.TP
+\fB\-b \fIsize\fR
+Use size as the buffer size in the EDNS0 pseudo RR.
+
+.TP
+\fB\-c \fIfile\fR
+Use file instead of /etc/resolv.conf for nameserver configuration.
+
+.TP
+\fB\-d \fIdomain\fR
+When tracing (-T), start from this domain instead of the root.
+
+.TP
+\fB\-t
+Use TCP/IP when querying a server
+
+.TP
+\fB\-k \fIkeyfile\fR
+Use this file to read a (trusted) key from. When this options is
+given \fBdrill\fR tries to validate the current answer with this
+key. No chasing is done. When \fBdrill\fR is doing a secure trace, this
+key will be used as trust anchor. Can contain a DNSKEY or a DS record.
+
+Alternatively, when DNSSEC enabled tracing (\fB-TD\fR) or signature
+chasing (\fB-S\fR), if \fB-k\fR is not specified, and a default trust anchor
+(/etc/unbound/root.key) exists and contains a valid DNSKEY or DS record,
+it will be used as the trust anchor.
+
+.TP
+\fB\-o \fImnemonic\fR
+Use this option to set or unset specific header bits. A bit is
+set by using the bit mnemonic in CAPITAL letters. A bit is unset when
+the mnemonic is given in lowercase. The following mnemonics are
+understood by \fBdrill\fR:
+
+        QR, qr: set, unset QueRy (default: on)
+        AA, aa: set, unset Authoritative Answer (default: off)
+        TC, tc: set, unset TrunCated (default: off)
+        RD, rd: set, unset Recursion Desired (default: on)
+        CD, cd: set, unset Checking Disabled  (default: off)
+        RA, ra: set, unset Recursion Available  (default: off)
+        AD, ad: set, unset Authenticated Data (default: off)
+
+Thus: \fB-o CD\fR, will enable Checking Disabled, which instructs the 
+cache to not validate the answers it gives out.
+
+.TP
+\fB\-p \fIport\fR
+Use this port instead of the default of 53.
+
+.TP
+\fB\-r \fIfile\fR
+When tracing (-T), use file as a root servers hint file.
+
+.TP
+\fB\-s
+When encountering a DNSKEY print the equivalent DS also.
+
+.TP
+\fB\-u

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309222159.r8MLx1kF002799>