svn commit: r263807 - in projects/sendfile: . bin bin/pkill bin/pkill/tests bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool contrib/binut...

Gleb Smirnoff glebius at FreeBSD.org
Thu Mar 27 08:52:33 UTC 2014 

Author: glebius
Date: Thu Mar 27 08:52:26 2014
New Revision: 263807
URL: http://svnweb.freebsd.org/changeset/base/263807

Log:
  Merge head r258543 through r263801.

Added:
  projects/sendfile/bin/pkill/tests/
     - copied from r263801, head/bin/pkill/tests/
  projects/sendfile/contrib/libucl/Makefile.am
     - copied unchanged from r263801, head/contrib/libucl/Makefile.am
  projects/sendfile/contrib/libucl/autogen.sh
     - copied unchanged from r263801, head/contrib/libucl/autogen.sh
  projects/sendfile/contrib/libucl/cmake/
     - copied from r263801, head/contrib/libucl/cmake/
  projects/sendfile/contrib/libucl/configure.ac
     - copied unchanged from r263801, head/contrib/libucl/configure.ac
  projects/sendfile/contrib/libucl/doc/Makefile.am
     - copied unchanged from r263801, head/contrib/libucl/doc/Makefile.am
  projects/sendfile/contrib/libucl/doc/libucl.3
     - copied unchanged from r263801, head/contrib/libucl/doc/libucl.3
  projects/sendfile/contrib/libucl/doc/pandoc.template
     - copied unchanged from r263801, head/contrib/libucl/doc/pandoc.template
  projects/sendfile/contrib/libucl/libucl.pc.in
     - copied unchanged from r263801, head/contrib/libucl/libucl.pc.in
  projects/sendfile/contrib/libucl/src/Makefile.am
     - copied unchanged from r263801, head/contrib/libucl/src/Makefile.am
  projects/sendfile/contrib/libucl/src/tree.h
     - copied unchanged from r263801, head/contrib/libucl/src/tree.h
  projects/sendfile/contrib/libucl/src/ucl_schema.c
     - copied unchanged from r263801, head/contrib/libucl/src/ucl_schema.c
  projects/sendfile/contrib/libucl/stamp-h.in
     - copied unchanged from r263801, head/contrib/libucl/stamp-h.in
  projects/sendfile/contrib/libucl/tests/.gitignore
     - copied unchanged from r263801, head/contrib/libucl/tests/.gitignore
  projects/sendfile/contrib/libucl/tests/Makefile.am
     - copied unchanged from r263801, head/contrib/libucl/tests/Makefile.am
  projects/sendfile/contrib/libucl/tests/basic/
     - copied from r263801, head/contrib/libucl/tests/basic/
  projects/sendfile/contrib/libucl/tests/basic.test
     - copied unchanged from r263801, head/contrib/libucl/tests/basic.test
  projects/sendfile/contrib/libucl/tests/generate.test
     - copied unchanged from r263801, head/contrib/libucl/tests/generate.test
  projects/sendfile/contrib/libucl/tests/schema/
     - copied from r263801, head/contrib/libucl/tests/schema/
  projects/sendfile/contrib/libucl/tests/schema.test
     - copied unchanged from r263801, head/contrib/libucl/tests/schema.test
  projects/sendfile/contrib/libucl/tests/speed.test
     - copied unchanged from r263801, head/contrib/libucl/tests/speed.test
  projects/sendfile/contrib/libucl/tests/test_schema.c
     - copied unchanged from r263801, head/contrib/libucl/tests/test_schema.c
  projects/sendfile/contrib/libucl/utils/Makefile.am
     - copied unchanged from r263801, head/contrib/libucl/utils/Makefile.am
  projects/sendfile/contrib/llvm/patches/patch-r263619-clang-r201662-arm-gnueabihf.diff
     - copied unchanged from r263801, head/contrib/llvm/patches/patch-r263619-clang-r201662-arm-gnueabihf.diff
  projects/sendfile/crypto/openssh/digest-libc.c
     - copied unchanged from r263801, head/crypto/openssh/digest-libc.c
  projects/sendfile/crypto/openssh/digest-openssl.c
     - copied unchanged from r263801, head/crypto/openssh/digest-openssl.c
  projects/sendfile/crypto/openssh/freebsd-post-merge.sh
     - copied unchanged from r263801, head/crypto/openssh/freebsd-post-merge.sh
  projects/sendfile/crypto/openssh/freebsd-pre-merge.sh
     - copied unchanged from r263801, head/crypto/openssh/freebsd-pre-merge.sh
  projects/sendfile/crypto/openssh/hmac.c
     - copied unchanged from r263801, head/crypto/openssh/hmac.c
  projects/sendfile/crypto/openssh/hmac.h
     - copied unchanged from r263801, head/crypto/openssh/hmac.h
  projects/sendfile/crypto/openssh/openbsd-compat/explicit_bzero.c
     - copied unchanged from r263801, head/crypto/openssh/openbsd-compat/explicit_bzero.c
  projects/sendfile/crypto/openssh/regress/dhgex.sh
     - copied unchanged from r263801, head/crypto/openssh/regress/dhgex.sh
  projects/sendfile/lib/libpmc/pmc.atomsilvermont.3
     - copied unchanged from r263801, head/lib/libpmc/pmc.atomsilvermont.3
  projects/sendfile/sbin/ifconfig/tests/
     - copied from r263801, head/sbin/ifconfig/tests/
  projects/sendfile/share/man/man4/man4.arm/ti_adc.4
     - copied unchanged from r263801, head/share/man/man4/man4.arm/ti_adc.4
  projects/sendfile/sys/amd64/vmm/io/vatpit.c
     - copied unchanged from r263801, head/sys/amd64/vmm/io/vatpit.c
  projects/sendfile/sys/amd64/vmm/io/vatpit.h
     - copied unchanged from r263801, head/sys/amd64/vmm/io/vatpit.h
  projects/sendfile/sys/arm/allwinner/a20/a20_mp.c
     - copied unchanged from r263801, head/sys/arm/allwinner/a20/a20_mp.c
  projects/sendfile/sys/arm/conf/CHROMEBOOK
     - copied unchanged from r263801, head/sys/arm/conf/CHROMEBOOK
  projects/sendfile/sys/arm/samsung/exynos/exynos5_common.h
     - copied unchanged from r263801, head/sys/arm/samsung/exynos/exynos5_common.h
  projects/sendfile/sys/arm/samsung/exynos/exynos5_ehci.c
     - copied unchanged from r263801, head/sys/arm/samsung/exynos/exynos5_ehci.c
  projects/sendfile/sys/arm/samsung/exynos/exynos5_fimd.c
     - copied unchanged from r263801, head/sys/arm/samsung/exynos/exynos5_fimd.c
  projects/sendfile/sys/arm/samsung/exynos/exynos5_mct.c
     - copied unchanged from r263801, head/sys/arm/samsung/exynos/exynos5_mct.c
  projects/sendfile/sys/arm/ti/ti_adc.c
     - copied unchanged from r263801, head/sys/arm/ti/ti_adc.c
  projects/sendfile/sys/arm/ti/ti_adcreg.h
     - copied unchanged from r263801, head/sys/arm/ti/ti_adcreg.h
  projects/sendfile/sys/arm/ti/ti_adcvar.h
     - copied unchanged from r263801, head/sys/arm/ti/ti_adcvar.h
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5250-chromebook.dts
     - copied unchanged from r263801, head/sys/boot/fdt/dts/arm/exynos5250-chromebook.dts
  projects/sendfile/tests/sys/netinet/
     - copied from r263801, head/tests/sys/netinet/
  projects/sendfile/usr.bin/make/tests/
     - copied from r263801, head/usr.bin/make/tests/
Deleted:
  projects/sendfile/contrib/libucl/.gitignore
  projects/sendfile/contrib/libucl/tests/1.in
  projects/sendfile/contrib/libucl/tests/1.res
  projects/sendfile/contrib/libucl/tests/10.in
  projects/sendfile/contrib/libucl/tests/2.in
  projects/sendfile/contrib/libucl/tests/2.res
  projects/sendfile/contrib/libucl/tests/3.in
  projects/sendfile/contrib/libucl/tests/3.res
  projects/sendfile/contrib/libucl/tests/4.in
  projects/sendfile/contrib/libucl/tests/4.res
  projects/sendfile/contrib/libucl/tests/5.in
  projects/sendfile/contrib/libucl/tests/5.res
  projects/sendfile/contrib/libucl/tests/6.in
  projects/sendfile/contrib/libucl/tests/6.res
  projects/sendfile/contrib/libucl/tests/7.in
  projects/sendfile/contrib/libucl/tests/7.res
  projects/sendfile/contrib/libucl/tests/8.in
  projects/sendfile/contrib/libucl/tests/8.res
  projects/sendfile/contrib/libucl/tests/9-comment.inc
  projects/sendfile/contrib/libucl/tests/9-empty.inc
  projects/sendfile/contrib/libucl/tests/9.in
  projects/sendfile/contrib/libucl/tests/9.inc
  projects/sendfile/contrib/libucl/tests/9.res
  projects/sendfile/crypto/openssh/FREEBSD-tricks
  projects/sendfile/crypto/openssh/auth2-jpake.c
  projects/sendfile/crypto/openssh/digest.c
  projects/sendfile/crypto/openssh/jpake.c
  projects/sendfile/crypto/openssh/jpake.h
  projects/sendfile/crypto/openssh/schnorr.h
  projects/sendfile/sys/arm/samsung/exynos/arch_timer.c
  projects/sendfile/sys/arm/samsung/exynos/ehci_exynos5.c
  projects/sendfile/sys/x86/isa/isa.h
  projects/sendfile/tools/regression/usr.bin/make/
  projects/sendfile/tools/regression/usr.bin/pkill/
  projects/sendfile/usr.sbin/bhyve/pit_8254.c
  projects/sendfile/usr.sbin/bhyve/pit_8254.h
Modified:
  projects/sendfile/MAINTAINERS   (contents, props changed)
  projects/sendfile/Makefile
  projects/sendfile/Makefile.inc1
  projects/sendfile/UPDATING
  projects/sendfile/bin/Makefile
  projects/sendfile/bin/pkill/Makefile
  projects/sendfile/bin/sh/alias.c
  projects/sendfile/bin/sh/exec.c
  projects/sendfile/bin/sh/expand.c
  projects/sendfile/bin/sh/jobs.c
  projects/sendfile/bin/sh/redir.c
  projects/sendfile/bin/sh/var.c
  projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/sendfile/contrib/binutils/bfd/config.bfd
  projects/sendfile/contrib/gcclibs/libcpp/files.c
  projects/sendfile/contrib/libstdc++/include/bits/cpp_type_traits.h
  projects/sendfile/contrib/libucl/Makefile.unix
  projects/sendfile/contrib/libucl/Makefile.w32
  projects/sendfile/contrib/libucl/README.md
  projects/sendfile/contrib/libucl/doc/api.md
  projects/sendfile/contrib/libucl/include/ucl.h
  projects/sendfile/contrib/libucl/src/ucl_emitter.c
  projects/sendfile/contrib/libucl/src/ucl_hash.c
  projects/sendfile/contrib/libucl/src/ucl_internal.h
  projects/sendfile/contrib/libucl/src/ucl_parser.c
  projects/sendfile/contrib/libucl/src/ucl_util.c
  projects/sendfile/contrib/libucl/tests/run_tests.sh
  projects/sendfile/contrib/libucl/tests/test_basic.c
  projects/sendfile/contrib/libucl/tests/test_speed.c
  projects/sendfile/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
  projects/sendfile/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp
  projects/sendfile/contrib/subversion/subversion/svn/util.c
  projects/sendfile/crypto/openssh/ChangeLog
  projects/sendfile/crypto/openssh/FREEBSD-upgrade
  projects/sendfile/crypto/openssh/Makefile.in
  projects/sendfile/crypto/openssh/README
  projects/sendfile/crypto/openssh/auth-rsa.c
  projects/sendfile/crypto/openssh/auth.c
  projects/sendfile/crypto/openssh/auth.h
  projects/sendfile/crypto/openssh/auth1.c
  projects/sendfile/crypto/openssh/auth2-chall.c
  projects/sendfile/crypto/openssh/auth2-gss.c
  projects/sendfile/crypto/openssh/auth2-passwd.c
  projects/sendfile/crypto/openssh/auth2.c
  projects/sendfile/crypto/openssh/authfd.c
  projects/sendfile/crypto/openssh/authfile.c
  projects/sendfile/crypto/openssh/bufaux.c
  projects/sendfile/crypto/openssh/bufbn.c
  projects/sendfile/crypto/openssh/bufec.c
  projects/sendfile/crypto/openssh/buffer.c
  projects/sendfile/crypto/openssh/canohost.c
  projects/sendfile/crypto/openssh/channels.c
  projects/sendfile/crypto/openssh/cipher-3des1.c
  projects/sendfile/crypto/openssh/cipher-chachapoly.c
  projects/sendfile/crypto/openssh/cipher.c
  projects/sendfile/crypto/openssh/clientloop.c
  projects/sendfile/crypto/openssh/compat.c
  projects/sendfile/crypto/openssh/config.h
  projects/sendfile/crypto/openssh/config.h.in
  projects/sendfile/crypto/openssh/configure
  projects/sendfile/crypto/openssh/configure.ac
  projects/sendfile/crypto/openssh/contrib/caldera/openssh.spec
  projects/sendfile/crypto/openssh/contrib/redhat/openssh.spec
  projects/sendfile/crypto/openssh/contrib/ssh-copy-id.1   (contents, props changed)
  projects/sendfile/crypto/openssh/contrib/suse/openssh.spec
  projects/sendfile/crypto/openssh/digest.h
  projects/sendfile/crypto/openssh/gss-serv.c
  projects/sendfile/crypto/openssh/hostfile.c
  projects/sendfile/crypto/openssh/kex.c
  projects/sendfile/crypto/openssh/kex.h
  projects/sendfile/crypto/openssh/kexc25519.c
  projects/sendfile/crypto/openssh/kexdhc.c
  projects/sendfile/crypto/openssh/kexdhs.c
  projects/sendfile/crypto/openssh/kexecdhc.c
  projects/sendfile/crypto/openssh/kexecdhs.c
  projects/sendfile/crypto/openssh/kexgexc.c
  projects/sendfile/crypto/openssh/kexgexs.c
  projects/sendfile/crypto/openssh/key.c
  projects/sendfile/crypto/openssh/krl.c
  projects/sendfile/crypto/openssh/mac.c
  projects/sendfile/crypto/openssh/misc.c
  projects/sendfile/crypto/openssh/moduli.0
  projects/sendfile/crypto/openssh/moduli.5   (contents, props changed)
  projects/sendfile/crypto/openssh/monitor.c
  projects/sendfile/crypto/openssh/monitor.h
  projects/sendfile/crypto/openssh/monitor_wrap.c
  projects/sendfile/crypto/openssh/monitor_wrap.h
  projects/sendfile/crypto/openssh/mux.c   (contents, props changed)
  projects/sendfile/crypto/openssh/openbsd-compat/Makefile.in
  projects/sendfile/crypto/openssh/openbsd-compat/blowfish.c   (contents, props changed)
  projects/sendfile/crypto/openssh/openbsd-compat/bsd-misc.h   (contents, props changed)
  projects/sendfile/crypto/openssh/openbsd-compat/bsd-poll.c
  projects/sendfile/crypto/openssh/openbsd-compat/openbsd-compat.h
  projects/sendfile/crypto/openssh/openbsd-compat/openssl-compat.c
  projects/sendfile/crypto/openssh/openbsd-compat/openssl-compat.h
  projects/sendfile/crypto/openssh/packet.c
  projects/sendfile/crypto/openssh/pathnames.h   (contents, props changed)
  projects/sendfile/crypto/openssh/readconf.c
  projects/sendfile/crypto/openssh/readconf.h
  projects/sendfile/crypto/openssh/readpass.c
  projects/sendfile/crypto/openssh/regress/Makefile
  projects/sendfile/crypto/openssh/regress/agent-ptrace.sh
  projects/sendfile/crypto/openssh/regress/agent.sh
  projects/sendfile/crypto/openssh/regress/cert-hostkey.sh
  projects/sendfile/crypto/openssh/regress/host-expand.sh
  projects/sendfile/crypto/openssh/regress/login-timeout.sh
  projects/sendfile/crypto/openssh/regress/scp-ssh-wrapper.sh
  projects/sendfile/crypto/openssh/regress/scp.sh
  projects/sendfile/crypto/openssh/regress/setuid-allowed.c
  projects/sendfile/crypto/openssh/regress/sftp-chroot.sh
  projects/sendfile/crypto/openssh/rsa.c
  projects/sendfile/crypto/openssh/sandbox-capsicum.c   (contents, props changed)
  projects/sendfile/crypto/openssh/sandbox-seccomp-filter.c
  projects/sendfile/crypto/openssh/sandbox-systrace.c
  projects/sendfile/crypto/openssh/schnorr.c
  projects/sendfile/crypto/openssh/scp.0
  projects/sendfile/crypto/openssh/scp.1   (contents, props changed)
  projects/sendfile/crypto/openssh/servconf.c
  projects/sendfile/crypto/openssh/servconf.h
  projects/sendfile/crypto/openssh/serverloop.c
  projects/sendfile/crypto/openssh/session.c
  projects/sendfile/crypto/openssh/sftp-client.c
  projects/sendfile/crypto/openssh/sftp-common.c   (contents, props changed)
  projects/sendfile/crypto/openssh/sftp-server.0
  projects/sendfile/crypto/openssh/sftp.0
  projects/sendfile/crypto/openssh/sftp.c
  projects/sendfile/crypto/openssh/ssh-add.0
  projects/sendfile/crypto/openssh/ssh-add.1   (contents, props changed)
  projects/sendfile/crypto/openssh/ssh-add.c
  projects/sendfile/crypto/openssh/ssh-agent.0
  projects/sendfile/crypto/openssh/ssh-agent.c
  projects/sendfile/crypto/openssh/ssh-dss.c
  projects/sendfile/crypto/openssh/ssh-ecdsa.c
  projects/sendfile/crypto/openssh/ssh-ed25519.c
  projects/sendfile/crypto/openssh/ssh-gss.h   (contents, props changed)
  projects/sendfile/crypto/openssh/ssh-keygen.0
  projects/sendfile/crypto/openssh/ssh-keygen.1
  projects/sendfile/crypto/openssh/ssh-keygen.c
  projects/sendfile/crypto/openssh/ssh-keyscan.0
  projects/sendfile/crypto/openssh/ssh-keyscan.1
  projects/sendfile/crypto/openssh/ssh-keysign.0
  projects/sendfile/crypto/openssh/ssh-keysign.8   (contents, props changed)
  projects/sendfile/crypto/openssh/ssh-pkcs11-helper.0
  projects/sendfile/crypto/openssh/ssh-pkcs11-helper.8   (contents, props changed)
  projects/sendfile/crypto/openssh/ssh-rsa.c
  projects/sendfile/crypto/openssh/ssh.0
  projects/sendfile/crypto/openssh/ssh.c
  projects/sendfile/crypto/openssh/ssh2.h
  projects/sendfile/crypto/openssh/ssh_config
  projects/sendfile/crypto/openssh/ssh_config.0
  projects/sendfile/crypto/openssh/ssh_config.5
  projects/sendfile/crypto/openssh/ssh_namespace.h
  projects/sendfile/crypto/openssh/sshconnect.c
  projects/sendfile/crypto/openssh/sshconnect1.c
  projects/sendfile/crypto/openssh/sshconnect2.c
  projects/sendfile/crypto/openssh/sshd.0
  projects/sendfile/crypto/openssh/sshd.c
  projects/sendfile/crypto/openssh/sshd_config
  projects/sendfile/crypto/openssh/sshd_config.0
  projects/sendfile/crypto/openssh/sshd_config.5
  projects/sendfile/crypto/openssh/sshlogin.c
  projects/sendfile/crypto/openssh/version.h
  projects/sendfile/etc/mtree/BSD.tests.dist
  projects/sendfile/etc/rc.d/devd
  projects/sendfile/gnu/usr.bin/binutils/Makefile.inc0
  projects/sendfile/gnu/usr.bin/cc/Makefile.tgt
  projects/sendfile/gnu/usr.bin/gdb/Makefile.inc
  projects/sendfile/gnu/usr.bin/gdb/libgdb/Makefile
  projects/sendfile/lib/Makefile
  projects/sendfile/lib/clang/Makefile
  projects/sendfile/lib/clang/clang.build.mk
  projects/sendfile/lib/libc/Makefile
  projects/sendfile/lib/libc/arm/aeabi/Makefile.inc
  projects/sendfile/lib/libc/arm/gen/flt_rounds.c
  projects/sendfile/lib/libcompiler_rt/Makefile
  projects/sendfile/lib/libkvm/Makefile
  projects/sendfile/lib/libnv/nv.3
  projects/sendfile/lib/libpmc/Makefile
  projects/sendfile/lib/libpmc/libpmc.c
  projects/sendfile/lib/libpmc/pmc.atom.3
  projects/sendfile/lib/libucl/Makefile
  projects/sendfile/lib/libvmmapi/vmmapi.c
  projects/sendfile/lib/libvmmapi/vmmapi.h
  projects/sendfile/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/sendfile/sbin/Makefile
  projects/sendfile/sbin/devd/devd.cc
  projects/sendfile/sbin/ifconfig/Makefile
  projects/sendfile/secure/lib/libssh/Makefile
  projects/sendfile/secure/usr.sbin/sshd/Makefile
  projects/sendfile/share/examples/etc/make.conf
  projects/sendfile/share/man/man4/cxgbe.4
  projects/sendfile/share/man/man4/devctl.4
  projects/sendfile/share/man/man4/man4.arm/Makefile
  projects/sendfile/share/man/man4/sysmouse.4
  projects/sendfile/share/man/man7/tests.7
  projects/sendfile/share/man/man9/cd.9
  projects/sendfile/share/man/man9/memguard.9
  projects/sendfile/share/man/man9/vm_set_page_size.9
  projects/sendfile/share/mk/bsd.cpu.mk
  projects/sendfile/share/mk/bsd.endian.mk
  projects/sendfile/share/mk/bsd.own.mk
  projects/sendfile/share/mk/bsd.subdir.mk
  projects/sendfile/share/mk/sys.mk
  projects/sendfile/sys/amd64/amd64/machdep.c
  projects/sendfile/sys/amd64/amd64/mem.c
  projects/sendfile/sys/amd64/amd64/pmap.c
  projects/sendfile/sys/amd64/amd64/trap.c
  projects/sendfile/sys/amd64/amd64/uma_machdep.c
  projects/sendfile/sys/amd64/amd64/vm_machdep.c
  projects/sendfile/sys/amd64/conf/GENERIC
  projects/sendfile/sys/amd64/include/pmap.h
  projects/sendfile/sys/amd64/include/vmm.h   (contents, props changed)
  projects/sendfile/sys/amd64/include/vmm_dev.h   (contents, props changed)
  projects/sendfile/sys/amd64/vmm/amd/amdv.c
  projects/sendfile/sys/amd64/vmm/intel/vmx.c
  projects/sendfile/sys/amd64/vmm/vmm.c
  projects/sendfile/sys/amd64/vmm/vmm_dev.c
  projects/sendfile/sys/amd64/vmm/vmm_ioport.c
  projects/sendfile/sys/arm/allwinner/a10_clk.c
  projects/sendfile/sys/arm/allwinner/a10_clk.h
  projects/sendfile/sys/arm/allwinner/a10_common.c
  projects/sendfile/sys/arm/allwinner/a10_ehci.c
  projects/sendfile/sys/arm/allwinner/a10_gpio.c
  projects/sendfile/sys/arm/allwinner/a10_gpio.h
  projects/sendfile/sys/arm/allwinner/a10_machdep.c
  projects/sendfile/sys/arm/allwinner/a10_sramc.c
  projects/sendfile/sys/arm/allwinner/a10_sramc.h
  projects/sendfile/sys/arm/allwinner/a20/a20_cpu_cfg.c
  projects/sendfile/sys/arm/allwinner/a20/a20_cpu_cfg.h
  projects/sendfile/sys/arm/allwinner/a20/files.a20
  projects/sendfile/sys/arm/allwinner/aintc.c
  projects/sendfile/sys/arm/allwinner/console.c
  projects/sendfile/sys/arm/allwinner/if_emac.c
  projects/sendfile/sys/arm/allwinner/if_emacreg.h
  projects/sendfile/sys/arm/allwinner/timer.c
  projects/sendfile/sys/arm/arm/machdep.c
  projects/sendfile/sys/arm/arm/pmap-v6.c
  projects/sendfile/sys/arm/arm/pmap.c
  projects/sendfile/sys/arm/conf/ARNDALE
  projects/sendfile/sys/arm/conf/BEAGLEBONE
  projects/sendfile/sys/arm/conf/CUBIEBOARD2
  projects/sendfile/sys/arm/include/param.h
  projects/sendfile/sys/arm/include/pmap.h
  projects/sendfile/sys/arm/rockchip/rk30xx_common.c
  projects/sendfile/sys/arm/rockchip/rk30xx_gpio.c
  projects/sendfile/sys/arm/rockchip/rk30xx_grf.c
  projects/sendfile/sys/arm/rockchip/rk30xx_grf.h
  projects/sendfile/sys/arm/rockchip/rk30xx_machdep.c
  projects/sendfile/sys/arm/rockchip/rk30xx_pmu.c
  projects/sendfile/sys/arm/rockchip/rk30xx_pmu.h
  projects/sendfile/sys/arm/rockchip/rk30xx_wdog.c
  projects/sendfile/sys/arm/rockchip/rk30xx_wdog.h
  projects/sendfile/sys/arm/samsung/exynos/files.exynos5
  projects/sendfile/sys/arm/ti/am335x/am335x_prcm.c
  projects/sendfile/sys/arm/ti/files.ti
  projects/sendfile/sys/arm/ti/ti_prcm.h
  projects/sendfile/sys/boot/common/part.c
  projects/sendfile/sys/boot/fdt/dts/arm/am335x.dtsi
  projects/sendfile/sys/boot/fdt/dts/arm/cubieboard.dts
  projects/sendfile/sys/boot/fdt/dts/arm/cubieboard2.dts
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5250.dtsi
  projects/sendfile/sys/boot/fdt/dts/arm/rk3188-radxa.dts
  projects/sendfile/sys/boot/fdt/dts/arm/rk3188.dtsi
  projects/sendfile/sys/boot/fdt/dts/mips/beri-netfpga.dts
  projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/sendfile/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/sendfile/sys/compat/freebsd32/freebsd32_misc.c
  projects/sendfile/sys/compat/linprocfs/linprocfs.c
  projects/sendfile/sys/compat/linux/linux_misc.c
  projects/sendfile/sys/compat/svr4/svr4_misc.c
  projects/sendfile/sys/conf/kern.mk
  projects/sendfile/sys/dev/ath/ah_osdep.c
  projects/sendfile/sys/dev/ath/ath_hal/ar5212/ar5212_power.c
  projects/sendfile/sys/dev/ath/ath_hal/ar5416/ar5416_power.c
  projects/sendfile/sys/dev/ath/if_ath.c
  projects/sendfile/sys/dev/ath/if_ath_tx.c
  projects/sendfile/sys/dev/cxgbe/t4_main.c
  projects/sendfile/sys/dev/hwpmc/hwpmc_core.c
  projects/sendfile/sys/dev/hwpmc/hwpmc_intel.c
  projects/sendfile/sys/dev/hwpmc/pmc_events.h
  projects/sendfile/sys/dev/iscsi/icl.c
  projects/sendfile/sys/dev/iscsi/icl.h
  projects/sendfile/sys/dev/iscsi/iscsi.c
  projects/sendfile/sys/dev/sfxge/sfxge_tx.c
  projects/sendfile/sys/dev/sfxge/sfxge_tx.h
  projects/sendfile/sys/dev/usb/usb_dev.c
  projects/sendfile/sys/dev/usb/usb_device.c
  projects/sendfile/sys/dev/usb/usb_process.c
  projects/sendfile/sys/dev/usb/usb_process.h
  projects/sendfile/sys/fs/msdosfs/msdosfs_fileno.c
  projects/sendfile/sys/fs/tmpfs/tmpfs_subr.c
  projects/sendfile/sys/i386/conf/GENERIC
  projects/sendfile/sys/i386/conf/XEN
  projects/sendfile/sys/i386/i386/machdep.c
  projects/sendfile/sys/i386/i386/pmap.c
  projects/sendfile/sys/i386/i386/vm_machdep.c
  projects/sendfile/sys/i386/xen/clock.c
  projects/sendfile/sys/i386/xen/pmap.c
  projects/sendfile/sys/ia64/ia64/machdep.c
  projects/sendfile/sys/ia64/ia64/pmap.c
  projects/sendfile/sys/ia64/ia64/uma_machdep.c
  projects/sendfile/sys/ia64/include/pmap.h
  projects/sendfile/sys/isa/isareg.h
  projects/sendfile/sys/kern/init_main.c
  projects/sendfile/sys/kern/kern_descrip.c
  projects/sendfile/sys/kern/kern_exec.c
  projects/sendfile/sys/kern/kern_ktr.c
  projects/sendfile/sys/kern/kern_malloc.c
  projects/sendfile/sys/kern/kern_mib.c
  projects/sendfile/sys/kern/kern_umtx.c
  projects/sendfile/sys/kern/subr_bus.c
  projects/sendfile/sys/kern/subr_devstat.c
  projects/sendfile/sys/kern/subr_trap.c
  projects/sendfile/sys/kern/vfs_bio.c
  projects/sendfile/sys/kern/vfs_subr.c
  projects/sendfile/sys/mips/conf/BERI_NETFPGA_MDROOT
  projects/sendfile/sys/mips/mips/machdep.c
  projects/sendfile/sys/mips/mips/pmap.c
  projects/sendfile/sys/mips/mips/uma_machdep.c
  projects/sendfile/sys/modules/vmm/Makefile
  projects/sendfile/sys/net/bpf_filter.c
  projects/sendfile/sys/net/if_var.h
  projects/sendfile/sys/net/pfvar.h
  projects/sendfile/sys/netinet/if_ether.c
  projects/sendfile/sys/netinet/in.c
  projects/sendfile/sys/netinet/tcp_input.c
  projects/sendfile/sys/netpfil/ipfw/ip_fw_pfil.c
  projects/sendfile/sys/netpfil/pf/if_pfsync.c
  projects/sendfile/sys/netpfil/pf/pf.c
  projects/sendfile/sys/netpfil/pf/pf_ioctl.c
  projects/sendfile/sys/ofed/drivers/infiniband/core/umem.c
  projects/sendfile/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c
  projects/sendfile/sys/pc98/cbus/cbus.h
  projects/sendfile/sys/pc98/cbus/cbus_dma.c
  projects/sendfile/sys/pc98/pc98/machdep.c
  projects/sendfile/sys/powerpc/aim/machdep.c
  projects/sendfile/sys/powerpc/aim/uma_machdep.c
  projects/sendfile/sys/powerpc/booke/machdep.c
  projects/sendfile/sys/powerpc/booke/pmap.c
  projects/sendfile/sys/powerpc/include/psl.h
  projects/sendfile/sys/security/audit/audit_bsm_klib.c
  projects/sendfile/sys/sparc64/conf/GENERIC
  projects/sendfile/sys/sparc64/sparc64/machdep.c
  projects/sendfile/sys/sparc64/sparc64/pmap.c
  projects/sendfile/sys/sparc64/sparc64/vm_machdep.c
  projects/sendfile/sys/sys/param.h
  projects/sendfile/sys/sys/pmc.h
  projects/sendfile/sys/sys/proc.h
  projects/sendfile/sys/sys/vmmeter.h
  projects/sendfile/sys/ufs/ffs/ffs_alloc.c
  projects/sendfile/sys/vm/memguard.c
  projects/sendfile/sys/vm/swap_pager.c
  projects/sendfile/sys/vm/vm_fault.c
  projects/sendfile/sys/vm/vm_glue.c
  projects/sendfile/sys/vm/vm_map.c
  projects/sendfile/sys/vm/vm_meter.c
  projects/sendfile/sys/vm/vm_mmap.c
  projects/sendfile/sys/vm/vm_object.c
  projects/sendfile/sys/vm/vm_page.c
  projects/sendfile/sys/vm/vm_pageout.c
  projects/sendfile/sys/vm/vm_param.h
  projects/sendfile/sys/vm/vm_phys.c
  projects/sendfile/sys/vm/vm_phys.h
  projects/sendfile/sys/vm/vm_radix.c
  projects/sendfile/sys/vm/vm_zeroidle.c
  projects/sendfile/sys/vm/vnode_pager.c
  projects/sendfile/sys/x86/acpica/madt.c
  projects/sendfile/sys/x86/isa/atpic.c
  projects/sendfile/sys/x86/isa/isa_dma.c
  projects/sendfile/sys/x86/x86/intr_machdep.c
  projects/sendfile/sys/x86/x86/nexus.c
  projects/sendfile/sys/x86/xen/hvm.c
  projects/sendfile/tests/sys/Makefile
  projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc
  projects/sendfile/tools/regression/priv/main.c
  projects/sendfile/tools/tools/sysdoc/tunables.mdoc
  projects/sendfile/usr.bin/Makefile
  projects/sendfile/usr.bin/brandelf/brandelf.1
  projects/sendfile/usr.bin/kdump/kdump.c
  projects/sendfile/usr.bin/make/Makefile
  projects/sendfile/usr.bin/sed/tests/Makefile
  projects/sendfile/usr.bin/xlint/Makefile.inc
  projects/sendfile/usr.sbin/Makefile
  projects/sendfile/usr.sbin/bhyve/Makefile
  projects/sendfile/usr.sbin/bhyve/bhyverun.c
  projects/sendfile/usr.sbin/bhyve/bhyverun.h
  projects/sendfile/usr.sbin/bhyve/spinup_ap.c
  projects/sendfile/usr.sbin/config/config.8
  projects/sendfile/usr.sbin/config/config.h
  projects/sendfile/usr.sbin/config/lang.l
  projects/sendfile/usr.sbin/config/main.c
  projects/sendfile/usr.sbin/ctld/login.c
  projects/sendfile/usr.sbin/pkg/Makefile
  projects/sendfile/usr.sbin/route6d/route6d.c
Directory Properties:
  projects/sendfile/   (props changed)
  projects/sendfile/cddl/   (props changed)
  projects/sendfile/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/   (props changed)
  projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/sendfile/contrib/binutils/   (props changed)
  projects/sendfile/contrib/libstdc++/   (props changed)
  projects/sendfile/contrib/libucl/   (props changed)
  projects/sendfile/contrib/llvm/   (props changed)
  projects/sendfile/contrib/llvm/tools/clang/   (props changed)
  projects/sendfile/contrib/llvm/tools/lldb/   (props changed)
  projects/sendfile/contrib/subversion/   (props changed)
  projects/sendfile/crypto/openssh/   (props changed)
  projects/sendfile/etc/   (props changed)
  projects/sendfile/gnu/usr.bin/binutils/   (props changed)
  projects/sendfile/gnu/usr.bin/gdb/   (props changed)
  projects/sendfile/lib/libc/   (props changed)
  projects/sendfile/lib/libvmmapi/   (props changed)
  projects/sendfile/sbin/   (props changed)
  projects/sendfile/share/man/man4/   (props changed)
  projects/sendfile/sys/   (props changed)
  projects/sendfile/sys/amd64/vmm/   (props changed)
  projects/sendfile/sys/boot/   (props changed)
  projects/sendfile/sys/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/sys/conf/   (props changed)
  projects/sendfile/sys/modules/vmm/   (props changed)
  projects/sendfile/usr.sbin/bhyve/   (props changed)

Modified: projects/sendfile/MAINTAINERS
==============================================================================
--- projects/sendfile/MAINTAINERS	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/MAINTAINERS	Thu Mar 27 08:52:26 2014	(r263807)
@@ -77,7 +77,7 @@ ntp         	roberto	Pre-commit review r
 inetd		dwmalone	Recommends pre-commit review.
 contrib/smbfs	bp	Open for in-tree committs. In case of functional
 			changes pre-commit review requested.
-contrib/pf	mlaier	Pre-commit review requested.
+contrib/pf	glebius	Pre-commit review recommended.
 binutils	obrien	Insists on BU blocked from unapproved commits
 file		obrien	Insists to keep file blocked from other's unapproved
 			commits
@@ -131,3 +131,4 @@ nvd(4)		jimharris	Pre-commit review requ
 nvmecontrol(8)	jimharris	Pre-commit review requested.
 release/release.sh	gjb	Pre-commit review and regression tests
 				requested.
+nanobsd		imp	Pre-commit review requested for coordination.

Modified: projects/sendfile/Makefile
==============================================================================
--- projects/sendfile/Makefile	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/Makefile	Thu Mar 27 08:52:26 2014	(r263807)
@@ -164,7 +164,7 @@ _MAKE=	PATH=${PATH} ${SUB_MAKE} -f Makef
 _TARGET_ARCH=	${TARGET:S/pc98/i386/}
 .elif !defined(TARGET) && defined(TARGET_ARCH) && \
     ${TARGET_ARCH} != ${MACHINE_ARCH}
-_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/}
+_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/}
 .endif
 # Legacy names, for another transition period mips:mips(n32|64)?eb -> mips:mips\1
 .if defined(TARGET) && defined(TARGET_ARCH) && \
@@ -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
+TARGET_ARCHES_arm?=	arm armeb armv6 armv6hf
 TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32
 TARGET_ARCHES_powerpc?=	powerpc powerpc64
 TARGET_ARCHES_pc98?=	i386

Modified: projects/sendfile/Makefile.inc1
==============================================================================
--- projects/sendfile/Makefile.inc1	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/Makefile.inc1	Thu Mar 27 08:52:26 2014	(r263807)
@@ -139,7 +139,7 @@ SRCRELDATE!=	awk '/^\#define[[:space:]]*
 VERSION=	FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE}
 .endif
 
-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
+KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm armv6hf/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
@@ -351,6 +351,8 @@ XFLAGS+=	-B${WORLDTMP}/usr/bin
 .if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \
 ${MK_ARM_EABI} != "no"
 TARGET_ABI=	gnueabi
+.elif ${TARGET_ARCH} == "armv6hf"
+TARGET_ABI=	gnueabihf
 .else
 TARGET_ABI=	unknown
 .endif
@@ -1015,7 +1017,7 @@ buildkernel:
 	cd ${KRNLCONFDIR}; \
 		PATH=${TMPPATH} \
 		    config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
-			${KERNCONFDIR}/${_kernel}
+			-I ${KERNCONFDIR} ${KERNCONFDIR}/${_kernel}
 .endif
 .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
 	@echo

Modified: projects/sendfile/UPDATING
==============================================================================
--- projects/sendfile/UPDATING	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/UPDATING	Thu Mar 27 08:52:26 2014	(r263807)
@@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20140325:
+	It is no longer necessary to include the dwarf version in your DEBUG
+	options in your kernel config file. The bug that required it to be
+	placed in the config file has bene fixed. DEBUG should now just
+	contain -g. The build system will automatically update things
+	to do the right thing. Ignore the entry from 20140216.
+
 20140306:
 	Support for libwrap (TCP wrappers) in rpcbind was disabled by default
 	to improve performance.  To re-enable it, if needed, run rpcbind
@@ -46,6 +53,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 20140216:
 	Clang and llvm have been upgraded to 3.4 release.
 
+	Please note that clang 3.4 now defaults to DWARF4 debug information
+	format when you specify -g.  Since kgdb(1) only supports DWARF2, you
+	should update any customized kernel configurations which include debug
+	information to explicitly use -gdwarf-2, e.g:
+
+	  makeoptions	DEBUG=-gdwarf-2
+
+	This has already been applied to the appropriate GENERIC configuration
+	files, so if you inherit from those, no changes are required.
+	Please note: this bug has been fixed, please see 20140325.
+
 20140216:
 	The nve(4) driver has been removed.  Please use the nfe(4) driver
 	for NVIDIA nForce MCP Ethernet adapters instead.

Modified: projects/sendfile/bin/Makefile
==============================================================================
--- projects/sendfile/bin/Makefile	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/bin/Makefile	Thu Mar 27 08:52:26 2014	(r263807)
@@ -60,4 +60,6 @@ SUBDIR+=	tests
 
 SUBDIR:=	${SUBDIR:O}
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>

Modified: projects/sendfile/bin/pkill/Makefile
==============================================================================
--- projects/sendfile/bin/pkill/Makefile	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/bin/pkill/Makefile	Thu Mar 27 08:52:26 2014	(r263807)
@@ -1,6 +1,8 @@
 #	$NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	pkill
 
 DPADD=	${LIBKVM}
@@ -17,4 +19,8 @@ MLINKS=	pkill.1 pgrep.1
 SYMLINKS=	${BINDIR}/pkill /usr/bin/pkill
 SYMLINKS+=	${BINDIR}/pgrep /usr/bin/pgrep
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Modified: projects/sendfile/bin/sh/alias.c
==============================================================================
--- projects/sendfile/bin/sh/alias.c	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/bin/sh/alias.c	Thu Mar 27 08:52:26 2014	(r263807)
@@ -180,6 +180,7 @@ printaliases(void)
 	int i, j;
 	struct alias **sorted, *ap;
 
+	INTOFF;
 	sorted = ckmalloc(aliases * sizeof(*sorted));
 	j = 0;
 	for (i = 0; i < ATABSIZE; i++)
@@ -187,9 +188,13 @@ printaliases(void)
 			if (*ap->name != '\0')
 				sorted[j++] = ap;
 	qsort(sorted, aliases, sizeof(*sorted), comparealiases);
-	for (i = 0; i < aliases; i++)
+	for (i = 0; i < aliases; i++) {
 		printalias(sorted[i]);
+		if (int_pending())
+			break;
+	}
 	ckfree(sorted);
+	INTON;
 }
 
 int

Modified: projects/sendfile/bin/sh/exec.c
==============================================================================
--- projects/sendfile/bin/sh/exec.c	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/bin/sh/exec.c	Thu Mar 27 08:52:26 2014	(r263807)
@@ -612,6 +612,7 @@ defun(const char *name, union node *func
 
 /*
  * Delete a function if it exists.
+ * Called with interrupts off.
  */
 
 int

Modified: projects/sendfile/bin/sh/expand.c
==============================================================================
--- projects/sendfile/bin/sh/expand.c	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/bin/sh/expand.c	Thu Mar 27 08:52:26 2014	(r263807)
@@ -956,6 +956,7 @@ recordregion(int start, int end, int inq
 {
 	struct ifsregion *ifsp;
 
+	INTOFF;
 	if (ifslastp == NULL) {
 		ifsp = &ifsfirst;
 	} else {
@@ -963,6 +964,7 @@ recordregion(int start, int end, int inq
 		    && ifslastp->inquotes == inquotes) {
 			/* extend previous area */
 			ifslastp->endoff = end;
+			INTON;
 			return;
 		}
 		ifsp = (struct ifsregion *)ckmalloc(sizeof (struct ifsregion));
@@ -973,6 +975,7 @@ recordregion(int start, int end, int inq
 	ifslastp->begoff = start;
 	ifslastp->endoff = end;
 	ifslastp->inquotes = inquotes;
+	INTON;
 }
 
 

Modified: projects/sendfile/bin/sh/jobs.c
==============================================================================
--- projects/sendfile/bin/sh/jobs.c	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/bin/sh/jobs.c	Thu Mar 27 08:52:26 2014	(r263807)
@@ -1121,7 +1121,8 @@ dowait(int mode, struct job *job)
 			for (sp = jp->ps ; sp < jp->ps + jp->nprocs ; sp++) {
 				if (sp->pid == -1)
 					continue;
-				if (sp->pid == pid) {
+				if (sp->pid == pid && (sp->status == -1 ||
+				    WIFSTOPPED(sp->status))) {
 					TRACE(("Changing status of proc %d from 0x%x to 0x%x\n",
 						   (int)pid, sp->status,
 						   status));

Modified: projects/sendfile/bin/sh/redir.c
==============================================================================
--- projects/sendfile/bin/sh/redir.c	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/bin/sh/redir.c	Thu Mar 27 08:52:26 2014	(r263807)
@@ -92,6 +92,13 @@ static int openhere(union node *);
  * undone by calling popredir.  If the REDIR_BACKQ flag is set, then the
  * standard output, and the standard error if it becomes a duplicate of
  * stdout, is saved in memory.
+*
+ * We suppress interrupts so that we won't leave open file
+ * descriptors around.  Because the signal handler remains
+ * installed and we do not use system call restart, interrupts
+ * will still abort blocking opens such as fifos (they will fail
+ * with EINTR). There is, however, a race condition if an interrupt
+ * arrives after INTOFF and before open blocks.
  */
 
 void
@@ -103,6 +110,7 @@ redirect(union node *redir, int flags)
 	int fd;
 	char memory[10];	/* file descriptors to write to memory */
 
+	INTOFF;
 	for (i = 10 ; --i >= 0 ; )
 		memory[i] = 0;
 	memory[1] = flags & REDIR_BACKQ;
@@ -139,11 +147,14 @@ redirect(union node *redir, int flags)
 			INTON;
 		}
 		openredirect(n, memory);
+		INTON;
+		INTOFF;
 	}
 	if (memory[1])
 		out1 = &memout;
 	if (memory[2])
 		out2 = &memout;
+	INTON;
 }
 
 
@@ -156,15 +167,6 @@ openredirect(union node *redir, char mem
 	int f;
 	int e;
 
-	/*
-	 * We suppress interrupts so that we won't leave open file
-	 * descriptors around.  Because the signal handler remains
-	 * installed and we do not use system call restart, interrupts
-	 * will still abort blocking opens such as fifos (they will fail
-	 * with EINTR). There is, however, a race condition if an interrupt
-	 * arrives after INTOFF and before open blocks.
-	 */
-	INTOFF;
 	memory[fd] = 0;
 	switch (redir->nfile.type) {
 	case NFROM:
@@ -237,7 +239,6 @@ movefd:
 	default:
 		abort();
 	}
-	INTON;
 }
 
 

Modified: projects/sendfile/bin/sh/var.c
==============================================================================
--- projects/sendfile/bin/sh/var.c	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/bin/sh/var.c	Thu Mar 27 08:52:26 2014	(r263807)
@@ -249,6 +249,7 @@ setvar(const char *name, const char *val
 		vallen = strlen(val);
 		len += vallen;
 	}
+	INTOFF;
 	nameeq = ckmalloc(len);
 	memcpy(nameeq, name, namelen);
 	nameeq[namelen] = '=';
@@ -257,6 +258,7 @@ setvar(const char *name, const char *val
 	else
 		nameeq[namelen + 1] = '\0';
 	setvareq(nameeq, flags);
+	INTON;
 }
 
 static int
@@ -289,6 +291,7 @@ change_env(const char *s, int set)
 	char *eqp;
 	char *ss;
 
+	INTOFF;
 	ss = savestr(s);
 	if ((eqp = strchr(ss, '=')) != NULL)
 		*eqp = '\0';
@@ -297,6 +300,7 @@ change_env(const char *s, int set)
 	else
 		(void) unsetenv(ss);
 	ckfree(ss);
+	INTON;
 
 	return;
 }
@@ -359,13 +363,13 @@ setvareq(char *s, int flags)
 	/* not found */
 	if (flags & VNOSET)
 		return;
+	INTOFF;
 	vp = ckmalloc(sizeof (*vp));
 	vp->flags = flags;
 	vp->text = s;
 	vp->name_len = nlen;
 	vp->next = *vpp;
 	vp->func = NULL;
-	INTOFF;
 	*vpp = vp;
 	if ((vp->flags & VEXPORT) && localevar(s)) {
 		change_env(s, 1);
@@ -773,6 +777,7 @@ poplocalvars(void)
 	struct localvar *lvp;
 	struct var *vp;
 
+	INTOFF;
 	while ((lvp = localvars) != NULL) {
 		localvars = lvp->next;
 		vp = lvp->vp;
@@ -790,6 +795,7 @@ poplocalvars(void)
 		}
 		ckfree(lvp);
 	}
+	INTON;
 }
 
 
@@ -828,18 +834,21 @@ unsetcmd(int argc __unused, char **argv 
 	if (flg_func == 0 && flg_var == 0)
 		flg_var = 1;
 
+	INTOFF;
 	for (ap = argptr; *ap ; ap++) {
 		if (flg_func)
 			ret |= unsetfunc(*ap);
 		if (flg_var)
 			ret |= unsetvar(*ap);
 	}
+	INTON;
 	return ret;
 }
 
 
 /*
  * Unset the specified variable.
+ * Called with interrupts off.
  */
 
 int
@@ -853,7 +862,6 @@ unsetvar(const char *s)
 		return (0);
 	if (vp->flags & VREADONLY)
 		return (1);
-	INTOFF;
 	if (vp->text[vp->name_len + 1] != '\0')
 		setvar(s, nullstr, 0);
 	if ((vp->flags & VEXPORT) && localevar(vp->text)) {
@@ -869,7 +877,6 @@ unsetvar(const char *s)
 		*vpp = vp->next;
 		ckfree(vp);
 	}
-	INTON;
 	return (0);
 }
 

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Thu Mar 27 08:52:26 2014	(r263807)
@@ -19,7 +19,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 31, 2013
+.Dd March 20, 2014
 .Dt ZDB 8
 .Os
 .Sh NAME
@@ -127,6 +127,12 @@ compression ratio (compress), inflation 
 If specified twice, display a histogram of deduplication statistics, showing
 the allocated (physically present on disk) and referenced (logically
 referenced in the pool) block counts and sizes by reference count.
+.Pp
+If specified a third time, display the statistics independently for each deduplication table.
+.Pp
+If specified a fourth time, dump the contents of the deduplication tables describing duplicate blocks.
+.Pp
+If specified a fifth time, also dump the contents of the deduplication tables describing unique blocks.
 .It Fl h
 Display pool history similar to
 .Cm zpool history ,

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Thu Mar 27 08:52:26 2014	(r263807)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 2, 2014
+.Dd March 20, 2014
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -1335,10 +1335,21 @@ features being supported, the new file s
 these properties.
 .Bl -tag -width 4n
 .It Sy casesensitivity Ns = Ns Cm sensitive | insensitive | mixed
+Indicates whether the file name matching algorithm used by the file system
+should be case-sensitive, case-insensitive, or allow a combination of both
+styles of matching. The default value for the
+.Sy casesensitivity
+property is
+.Cm sensitive .
+Traditionally, UNIX and POSIX file systems have case-sensitive file names.
+.Pp
 The
+.Cm mixed
+value for the
 .Sy casesensitivity
-property is currently not supported on
-.Fx .
+property indicates that the
+file system can support requests for both case-sensitive and case-insensitive
+matching behavior.
 .It Sy normalization Ns = Ns Cm none | formC | formD | formKC | formKD
 Indicates whether the file system should perform a
 .Sy unicode

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Thu Mar 27 08:52:26 2014	(r263807)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 31, 2013
+.Dd March 20, 2014
 .Dt ZPOOL 8
 .Os
 .Sh NAME
@@ -624,6 +624,9 @@ Datasets of this pool can only be mounte
 .It
 To write to a read-only pool, a export and import of the pool is required.
 .El
+.Pp
+This property can also be referred to by its shortened column name,
+.Sy rdonly .
 .El
 .Pp
 The following properties can be set at creation time and import time, and later
@@ -682,7 +685,9 @@ property.
 Threshold for the number of block ditto copies. If the reference count for a
 deduplicated block increases above this number, a new ditto copy of this block
 is automatically stored. Default setting is
-.Cm 0 .
+.Cm 0
+which causes no ditto copies to be created for deduplicated blocks.
+The miniumum legal nonzero setting is 100.
 .It Sy delegation Ns = Ns Cm on No | Cm off
 Controls whether a non-privileged user is granted access based on the dataset
 permissions defined on the dataset. See
@@ -1152,9 +1157,10 @@ option is also required.
 .It Fl f
 Forces import, even if the pool appears to be potentially active.
 .It Fl m
-Enables import with missing log devices.
+Allows a pool to import when there is a missing log device. Recent transactions
+can be lost because the log device will be discarded.
 .It Fl N
-Do not mount any filesystems from the imported pool.
+Import the pool without mounting any file systems.
 .It Fl R Ar root
 Sets the
 .Qq Sy cachefile
@@ -1245,9 +1251,10 @@ option is also required.
 .It Fl f
 Forces import, even if the pool appears to be potentially active.
 .It Fl m
-Enables import with missing log devices.
+Allows a pool to import when there is a missing log device. Recent transactions
+can be lost because the log device will be discarded.
 .It Fl N
-Do not mount any filesystems from the imported pool.
+Import the pool without mounting any file systems.
 .It Fl R Ar root
 Equivalent to
 .Qq Fl o Cm cachefile=none,altroot= Ns Pa root
@@ -1336,8 +1343,9 @@ Treat exported or foreign devices as ina
 .Op Ar inverval Op Ar count
 .Xc
 .Pp
-Lists the given pools along with a health status and space usage. When given no
-arguments, all pools in the system are listed.
+Lists the given pools along with a health status and space usage. If no
+.Ar pools
+are specified, all pools in the system are listed.
 .Pp
 When given an interval, the output is printed every
 .Ar interval
@@ -1349,6 +1357,17 @@ is specified, the command exits after
 .Ar count
 reports are printed.
 .Bl -tag -width indent
+.It Fl T Cm d Ns | Ns Cm u
+Print a timestamp.
+.Pp
+Use modifier
+.Cm d
+for standard date format. See
+.Xr date 1 .
+Use modifier
+.Cm u
+for unixtime
+.Pq equals Qq Ic date +%s .
 .It Fl H
 Scripted mode. Do not display headers, and separate fields by a single tab
 instead of arbitrary space.
@@ -1677,7 +1696,7 @@ Once this is done, the pool will no long
 not support feature flags.
 See
 .Xr zpool-features 7
-for details on compatability with system sthat support feature flags, but do
+for details on compatibility with systems that support feature flags, but do
 not support all features enabled on the pool.
 .Bl -tag -width indent
 .It Fl a

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Thu Mar 27 08:52:26 2014	(r263807)
@@ -1969,7 +1969,7 @@ zpool_do_import(int argc, char **argv)
 	char *endptr;
 
 	/* check options */
-	while ((c = getopt(argc, argv, ":aCc:d:DEfFmnNo:rR:T:VX")) != -1) {
+	while ((c = getopt(argc, argv, ":aCc:d:DEfFmnNo:R:T:VX")) != -1) {
 		switch (c) {
 		case 'a':
 			do_all = B_TRUE;

Modified: projects/sendfile/contrib/binutils/bfd/config.bfd
==============================================================================
--- projects/sendfile/contrib/binutils/bfd/config.bfd	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/contrib/binutils/bfd/config.bfd	Thu Mar 27 08:52:26 2014	(r263807)
@@ -281,7 +281,7 @@ case "${targ}" in
     targ_defvec=bfd_elf32_bigarm_vec
     targ_selvecs=bfd_elf32_littlearm_vec
     ;;
-  armv6-*-freebsd*)
+  armv6-*-freebsd* | armv6hf-*-freebsd*)
     targ_defvec=bfd_elf32_littlearm_vec
     targ_selvecs=bfd_elf32_bigarm_vec
     ;;

Modified: projects/sendfile/contrib/gcclibs/libcpp/files.c
==============================================================================
--- projects/sendfile/contrib/gcclibs/libcpp/files.c	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/contrib/gcclibs/libcpp/files.c	Thu Mar 27 08:52:26 2014	(r263807)
@@ -546,6 +546,7 @@ static bool
 read_file_guts (cpp_reader *pfile, _cpp_file *file)
 {
   ssize_t size, total, count;
+  off_t offset;
   uchar *buf;
   bool regular;
 
@@ -573,6 +574,21 @@ read_file_guts (cpp_reader *pfile, _cpp_
 	}
 
       size = file->st.st_size;
+
+      if ((offset = lseek(file->fd, 0, SEEK_CUR)) < 0)
+	{
+	  cpp_error (pfile, CPP_DL_ERROR, "%s has no current position",
+	    file->path);
+	  return false;
+	}
+      else if (offset > INTTYPE_MAXIMUM (ssize_t) || (ssize_t)offset > size)
+	{
+	  cpp_error (pfile, CPP_DL_ERROR, "current position of %s is too large",
+	    file->path);
+	  return false;
+	}
+
+      size -= (ssize_t)offset;
     }
   else
     /* 8 kilobytes is a sensible starting size.  It ought to be bigger

Modified: projects/sendfile/contrib/libstdc++/include/bits/cpp_type_traits.h
==============================================================================
--- projects/sendfile/contrib/libstdc++/include/bits/cpp_type_traits.h	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/contrib/libstdc++/include/bits/cpp_type_traits.h	Thu Mar 27 08:52:26 2014	(r263807)
@@ -80,6 +80,13 @@ _GLIBCXX_END_NAMESPACE
 
 _GLIBCXX_BEGIN_NAMESPACE(std)
 
+#ifdef __clang__
+// When using clang, suppress warnings about possible keywords (such as
+// __is_void, __is_pod, etc) being used as identifiers.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-compat"
+#endif
+
 namespace __detail
 {
   // NB: g++ can not compile these if declared within the class
@@ -398,6 +405,10 @@ namespace __detail
     };
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 _GLIBCXX_END_NAMESPACE
 
 #endif //_CPP_TYPE_TRAITS_H

Copied: projects/sendfile/contrib/libucl/Makefile.am (from r263801, head/contrib/libucl/Makefile.am)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/contrib/libucl/Makefile.am	Thu Mar 27 08:52:26 2014	(r263807, copy of r263801, head/contrib/libucl/Makefile.am)
@@ -0,0 +1,7 @@
+ACLOCAL_AMFLAGS = -I m4
+EXTRA_DIST = uthash README.md
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libucl.pc
+
+SUBDIRS = src tests utils doc
\ No newline at end of file

Modified: projects/sendfile/contrib/libucl/Makefile.unix
==============================================================================
--- projects/sendfile/contrib/libucl/Makefile.unix	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/contrib/libucl/Makefile.unix	Thu Mar 27 08:52:26 2014	(r263807)
@@ -4,7 +4,7 @@ LD ?= gcc
 C_COMMON_FLAGS ?= -fPIC -Wall -W -Wno-unused-parameter -Wno-pointer-sign -I./include -I./uthash -I./src
 MAJOR_VERSION = 0
 MINOR_VERSION = 2
-PATCH_VERSION = 8
+PATCH_VERSION = 9
 VERSION = "$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_VERSION)"
 SONAME = libucl.so
 SONAME_FULL = $(SONAME).$(MAJOR_VERSION)
@@ -21,8 +21,17 @@ LD_SHARED_FLAGS ?= -Wl,-soname,$(SONAME)
 LD_UCL_FLAGS ?= -L$(OBJDIR) -Wl,-rpath,$(OBJDIR) -lucl
 LD_ADD ?= -lrt
 COPT_FLAGS ?= -O2
-HDEPS = $(SRCDIR)/ucl_hash.h $(SRCDIR)/ucl_chartable.h $(SRCDIR)/ucl_internal.h $(INCLUDEDIR)/ucl.h $(SRCDIR)/xxhash.h
-OBJECTS = $(OBJDIR)/ucl_hash.o $(OBJDIR)/ucl_util.o $(OBJDIR)/ucl_parser.o $(OBJDIR)/ucl_emitter.o $(OBJDIR)/xxhash.o
+HDEPS = $(SRCDIR)/ucl_hash.h \
+		$(SRCDIR)/ucl_chartable.h \
+		$(SRCDIR)/ucl_internal.h \
+		$(INCLUDEDIR)/ucl.h \
+		$(SRCDIR)/xxhash.h
+OBJECTS = $(OBJDIR)/ucl_hash.o \
+		$(OBJDIR)/ucl_util.o \
+		$(OBJDIR)/ucl_parser.o \
+		$(OBJDIR)/ucl_emitter.o \
+		$(OBJDIR)/ucl_schema.o \
+		$(OBJDIR)/xxhash.o
 
 all: $(OBJDIR) $(OBJDIR)/$(SONAME)
 
@@ -44,11 +53,13 @@ $(OBJDIR)/ucl_emitter.o: $(SRCDIR)/ucl_e
 	$(CC) -o $(OBJDIR)/ucl_emitter.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_emitter.c
 $(OBJDIR)/ucl_hash.o: $(SRCDIR)/ucl_hash.c $(HDEPS)
 	$(CC) -o $(OBJDIR)/ucl_hash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_hash.c
+$(OBJDIR)/ucl_schema.o: $(SRCDIR)/ucl_schema.c $(HDEPS)
+	$(CC) -o $(OBJDIR)/ucl_schema.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_schema.c
 $(OBJDIR)/xxhash.o: $(SRCDIR)/xxhash.c $(HDEPS)
 	$(CC) -o $(OBJDIR)/xxhash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/xxhash.c
 
 clean:
-	$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(SONAME_FULL) $(OBJDIR)/$(SONAME) $(OBJDIR)/chargen $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/objdump $(OBJDIR)/test_generate
+	$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(SONAME_FULL) $(OBJDIR)/$(SONAME) $(OBJDIR)/chargen $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/objdump $(OBJDIR)/test_generate $(OBJDIR)/test_schema || true
 	$(RMDIR) $(OBJDIR)
 	
 # Utils
@@ -60,13 +71,15 @@ objdump: utils/objdump.c $(OBJDIR)/$(SON
 
 # Tests
 
-test: $(OBJDIR) $(OBJDIR)/$(SONAME) $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/test_generate
+test: $(OBJDIR) $(OBJDIR)/$(SONAME) $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/test_generate $(OBJDIR)/test_schema
 
 run-test: test
-	TEST_DIR=$(TESTDIR) $(TESTDIR)/run_tests.sh $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/test_generate
+	TEST_DIR=$(TESTDIR) $(TESTDIR)/run_tests.sh $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/test_generate $(OBJDIR)/test_schema
 	
 $(OBJDIR)/test_basic: $(TESTDIR)/test_basic.c $(OBJDIR)/$(SONAME)
 	$(CC) -o $(OBJDIR)/test_basic $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) $(LDFLAGS) $(TESTDIR)/test_basic.c $(LD_UCL_FLAGS)
+$(OBJDIR)/test_schema: $(TESTDIR)/test_schema.c $(OBJDIR)/$(SONAME)
+	$(CC) -o $(OBJDIR)/test_schema $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) $(LDFLAGS) $(TESTDIR)/test_schema.c $(LD_UCL_FLAGS)
 $(OBJDIR)/test_speed: $(TESTDIR)/test_speed.c $(OBJDIR)/$(SONAME)
 	$(CC) -o $(OBJDIR)/test_speed $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) $(LDFLAGS) $(TESTDIR)/test_speed.c $(LD_UCL_FLAGS) $(LD_ADD)
 $(OBJDIR)/test_generate: $(TESTDIR)/test_generate.c $(OBJDIR)/$(SONAME)

Modified: projects/sendfile/contrib/libucl/Makefile.w32
==============================================================================
--- projects/sendfile/contrib/libucl/Makefile.w32	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/contrib/libucl/Makefile.w32	Thu Mar 27 08:52:26 2014	(r263807)
@@ -4,7 +4,7 @@ LD ?= gcc
 C_COMMON_FLAGS ?= -fPIC -Wall -W -Wno-unused-parameter -Wno-pointer-sign -I./include -I./uthash -I./src
 MAJOR_VERSION = 0
 MINOR_VERSION = 2
-PATCH_VERSION = 8
+PATCH_VERSION = 9
 VERSION = "$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_VERSION)"
 SONAME = libucl.dll
 OBJDIR ?= .obj
@@ -24,8 +24,17 @@ LD_SHARED_FLAGS ?= -Wl,-soname,$(SONAME)
 LD_UCL_FLAGS ?= -L$(OBJDIR) -Wl,-rpath,$(OBJDIR) -lucl
 LD_ADD ?= -lrt
 COPT_FLAGS ?= -O2
-HDEPS = $(SRCDIR)/ucl_hash.h $(SRCDIR)/ucl_chartable.h $(SRCDIR)/ucl_internal.h $(INCLUDEDIR)/ucl.h $(SRCDIR)/xxhash.h
-OBJECTS = $(OBJDIR)/ucl_hash.o $(OBJDIR)/ucl_util.o $(OBJDIR)/ucl_parser.o $(OBJDIR)/ucl_emitter.o $(OBJDIR)/xxhash.o
+HDEPS = $(SRCDIR)/ucl_hash.h \
+		$(SRCDIR)/ucl_chartable.h \
+		$(SRCDIR)/ucl_internal.h \
+		$(INCLUDEDIR)/ucl.h \
+		$(SRCDIR)/xxhash.h
+OBJECTS = $(OBJDIR)/ucl_hash.o \
+		$(OBJDIR)/ucl_util.o \
+		$(OBJDIR)/ucl_parser.o \
+		$(OBJDIR)/ucl_emitter.o \
+		$(OBJDIR)/ucl_schema.o \
+		$(OBJDIR)/xxhash.o
 
 all: $(OBJDIR) $(OBJDIR)/$(SONAME)
 
@@ -44,6 +53,8 @@ $(OBJDIR)/ucl_emitter.o: $(SRCDIR)/ucl_e
 	$(CC) -o $(OBJDIR)/ucl_emitter.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_emitter.c
 $(OBJDIR)/ucl_hash.o: $(SRCDIR)/ucl_hash.c $(HDEPS)
 	$(CC) -o $(OBJDIR)/ucl_hash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_hash.c
+$(OBJDIR)/ucl_schema.o: $(SRCDIR)/ucl_schema.c $(HDEPS)
+	$(CC) -o $(OBJDIR)/ucl_schema.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_schema.c
 $(OBJDIR)/xxhash.o: $(SRCDIR)/xxhash.c $(HDEPS)
 	$(CC) -o $(OBJDIR)/xxhash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/xxhash.c
 

Modified: projects/sendfile/contrib/libucl/README.md
==============================================================================
--- projects/sendfile/contrib/libucl/README.md	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/contrib/libucl/README.md	Thu Mar 27 08:52:26 2014	(r263807)
@@ -1,3 +1,26 @@
+# LIBUCL
+
+[![Build Status](https://travis-ci.org/vstakhov/libucl.svg?branch=master)](https://travis-ci.org/vstakhov/libucl)
+
+**Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
+
+- [Introduction](#introduction)
+- [Basic structure](#basic-structure)
+- [Improvements to the json notation](#improvements-to-the-json-notation)
+	- [General syntax sugar](#general-syntax-sugar)
+	- [Automatic arrays creation](#automatic-arrays-creation)
+	- [Named keys hierarchy](#named-keys-hierarchy)
+	- [Convenient numbers and booleans](#convenient-numbers-and-booleans)
+- [General improvements](#general-improvements)
+	- [Commments](#commments)
+	- [Macros support](#macros-support)
+	- [Variables support](#variables-support)
+	- [Multiline strings](#multiline-strings)
+- [Emitter](#emitter)
+- [Validation](#validation)
+- [Performance](#performance)
+- [Conclusion](#conclusion)
+
 ## Introduction
 
 This document describes the main features and principles of the configuration
@@ -262,6 +285,10 @@ Each UCL object can be serialized to one
 * `Configuration` - nginx like notation;
 * `YAML` - yaml inlined notation.
 
+## Validation
+
+UCL allows validation of objects. It uses the same schema that is used for json: [json schema v4](http://json-schema.org). UCL supports the full set of json schema with the exception of remote references. This feature is unlikely useful for configuration objects. Of course, schema definition can be in UCL format instead of JSON that sinplifies schemas writing. Moreover, since UCL supports multiple values for keys in an object it is possible to specify generic integer constraints `maxValues` and `minValues` to define the limits of values in a single key. UCL currently is not absolutely strict about validation schemas themselves, therefore UCL users should supply valid schemas (as it is defined in json-schema draft v4) to ensure that input is validated properly.
+
 ## Performance
 
 Are UCL parser and emitter fast enough? Well, there are some numbers.

Copied: projects/sendfile/contrib/libucl/autogen.sh (from r263801, head/contrib/libucl/autogen.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/contrib/libucl/autogen.sh	Thu Mar 27 08:52:26 2014	(r263807, copy of r263801, head/contrib/libucl/autogen.sh)
@@ -0,0 +1,2 @@
+#!/bin/sh
+autoreconf -i

Copied: projects/sendfile/contrib/libucl/configure.ac (from r263801, head/contrib/libucl/configure.ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/contrib/libucl/configure.ac	Thu Mar 27 08:52:26 2014	(r263807, copy of r263801, head/contrib/libucl/configure.ac)
@@ -0,0 +1,124 @@
+m4_define([maj_ver], [0])
+m4_define([med_ver], [3])
+m4_define([min_ver], [0])
+m4_define([so_version], [maj_ver:med_ver])
+m4_define([ucl_version], [maj_ver.med_ver.min_ver])
+
+AC_INIT([libucl],[ucl_version],[https://github.com/vstakhov/libucl],[libucl])
+AC_CONFIG_SRCDIR([configure.ac])
+AM_INIT_AUTOMAKE([1.11 foreign silent-rules -Wall -Wportability no-dist-gzip dist-xz])
+
+UCL_VERSION=ucl_version
+SO_VERSION=so_version
+
+AC_SUBST(UCL_VERSION)
+AC_SUBST(SO_VERSION)
+
+AC_PROG_CC_C99
+AM_PROG_CC_C_O
+AM_PROG_AR
+LT_INIT
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
+
+AC_C_CONST
+AC_TYPE_SIZE_T
+
+AC_CHECK_HEADERS_ONCE([fcntl.h unistd.h])
+AC_TYPE_OFF_T
+AC_FUNC_MMAP
+AC_CHECK_HEADERS_ONCE([fcntl.h])
+AC_CHECK_HEADERS_ONCE([sys/types.h])
+AC_CHECK_HEADERS_ONCE([sys/stat.h])
+AC_CHECK_HEADERS_ONCE([sys/param.h])
+AC_CHECK_HEADERS_ONCE([sys/mman.h])
+AC_CHECK_HEADERS_ONCE([stdlib.h])
+AC_CHECK_HEADERS_ONCE([stddef.h])
+AC_CHECK_HEADERS_ONCE([stdarg.h])
+AC_CHECK_HEADERS_ONCE([stdbool.h])
+AC_CHECK_HEADERS_ONCE([stdint.h])
+AC_CHECK_HEADERS_ONCE([string.h])
+AC_CHECK_HEADERS_ONCE([unistd.h])
+AC_CHECK_HEADERS_ONCE([ctype.h])
+AC_CHECK_HEADERS_ONCE([errno.h])
+AC_CHECK_HEADERS_ONCE([limits.h])
+AC_CHECK_HEADERS_ONCE([libgen.h])
+AC_CHECK_HEADERS_ONCE([stdio.h])
+AC_CHECK_HEADERS_ONCE([float.h])
+AC_CHECK_HEADERS_ONCE([math.h])
+
+dnl Example of default-disabled feature
+AC_ARG_ENABLE([urls], AS_HELP_STRING([--enable-urls], [Enable URLs fetch (requires libfetch or libcurl)]))
+AC_ARG_ENABLE([signatures], AS_HELP_STRING([--enable-signatures],
+	[Enable signatures check (requires openssl)]))
+AC_ARG_ENABLE([utils],
+	[--enable-utils Build and install utils],
+	[case "${enableval}" in
+  		yes) utils=true ;;
+  		no)  utils=false ;;
+  		*) AC_MSG_ERROR([bad value ${enableval} for --enable-utils]) ;;
+	esac],[utils=false])
+AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+
+AS_IF([test "x$enable_signatures" = "xyes"], [
+	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
+		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+		LIBSSL_LIB="-lcrypto"
+		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
+])
+
+AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
+
+AC_SEARCH_LIBS([clock_gettime], [rt], [], [
+	AC_CHECK_HEADER([mach/mach_time.h], [
+		AC_DEFINE(HAVE_MACH_MACH_TIME_H, 1, [Define to 1 on Darwin])
+	], [AC_MSG_ERROR([unable to find clock_gettime or mach_absolute_time])])
+])
+AC_SEARCH_LIBS([remainder], [m], [], [AC_MSG_ERROR([unable to find remainder() function])])
+
+AC_CHECK_HEADER([regex.h], [
+	AC_DEFINE(HAVE_REGEX_H, 1, [Define to 1 if you have the <regex.h> header file.])
+	],
+	[AC_MSG_ERROR([unable to find the regex.h header])],
+	[#include <sys/types.h>])
+
+AS_IF([test "x$enable_urls" = "xyes"], [
+	AC_CHECK_HEADER([fetch.h], [
+		AC_DEFINE(HAVE_FETCH_H, 1, [Define to 1 if you have the <fetch.h> header file.])
+		AC_CHECK_LIB(fetch, fetchXGet, [
+			AC_DEFINE(HAVE_LIBFETCH, 1, [Define to 1 if you have the 'fetch' library (-lfetch).])
+			LIBFETCH_LIBS="-lfetch"
+			have_libfetch="yes"
+			LIBS_EXTRA="${LIBS_EXTRA} -lfetch"
+		])
+	], [],[
+	#include <stdio.h>
+	#ifdef HAVE_SYS_PARAM_H
+	#include <sys/param.h>
+	#endif
+	])
+	AC_SUBST(LIBFETCH_LIBS)
+
+	AS_IF([ test "x$have_libfetch" != "xyes"], [
+		dnl Fallback to libcurl
+		PKG_CHECK_MODULES([CURL], [libcurl], [
+			AC_DEFINE(CURL_FOUND, 1, [Use libcurl])
+			LIBS_EXTRA="${LIBS_EXTRA} -lcurl"],
+		[AC_MSG_ERROR([unable to find neither libfetch nor libcurl])])
+	])
+	AC_SUBST(CURL_FOUND)
+	AC_SUBST(CURL_LIBS)
+	AC_SUBST(CURL_CFLAGS)
+])
+
+AC_SUBST(LIBS_EXTRA)
+
+AC_CONFIG_FILES(Makefile \
+	src/Makefile \
+	tests/Makefile \
+	utils/Makefile \
+	doc/Makefile \
+	libucl.pc)
+AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
+AC_OUTPUT

Copied: projects/sendfile/contrib/libucl/doc/Makefile.am (from r263801, head/contrib/libucl/doc/Makefile.am)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/contrib/libucl/doc/Makefile.am	Thu Mar 27 08:52:26 2014	(r263807, copy of r263801, head/contrib/libucl/doc/Makefile.am)
@@ -0,0 +1,8 @@
+EXTRA_DIST = api.md
+
+dist_man_MANS = libucl.3
+
+gen-man: @PANDOC@
+	tail -n +$$(grep -n '# Synopsis' api.md | cut -d':' -f1) api.md | \
+	cat pandoc.template - | sed -e 's/^# \(.*\)/# \U\1/' | \
+	@PANDOC@ -s -f markdown -t man -o libucl.3 
\ No newline at end of file

Modified: projects/sendfile/contrib/libucl/doc/api.md
==============================================================================
--- projects/sendfile/contrib/libucl/doc/api.md	Thu Mar 27 08:48:19 2014	(r263806)
+++ projects/sendfile/contrib/libucl/doc/api.md	Thu Mar 27 08:52:26 2014	(r263807)
@@ -1,30 +1,75 @@
-Synopsis
-========
+# API documentation
+
+**Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
+
+- [Synopsis](#synopsis)
+- [Description](#description)
+	- [Parser functions](#parser-functions)
+	- [Emitting functions](#emitting-functions)
+	- [Conversion functions](#conversion-functions)
+	- [Generation functions](#generation-functions)
+	- [Iteration functions](#iteration-functions)
+	- [Validation functions](#validation-functions)
+	- [Utility functions](#utility-functions)
+- [Parser functions](#parser-functions-1)
+	- [ucl_parser_new](#ucl_parser_new)
+	- [ucl_parser_register_macro](#ucl_parser_register_macro)
+	- [ucl_parser_register_variable](#ucl_parser_register_variable)
+	- [ucl_parser_add_chunk](#ucl_parser_add_chunk)
+	- [ucl_parser_add_string](#ucl_parser_add_string)
+	- [ucl_parser_add_file](#ucl_parser_add_file)
+	- [ucl_parser_get_object](#ucl_parser_get_object)
+	- [ucl_parser_get_error](#ucl_parser_get_error)
+	- [ucl_parser_free](#ucl_parser_free)
+	- [ucl_pubkey_add](#ucl_pubkey_add)
+	- [ucl_parser_set_filevars](#ucl_parser_set_filevars)
+	- [Parser usage example](#parser-usage-example)
+- [Emitting functions](#emitting-functions-1)
+	- [ucl_object_emit](#ucl_object_emit)
+	- [ucl_object_emit_full](#ucl_object_emit_full)
+- [Conversion functions](#conversion-functions-1)
+- [Generation functions](#generation-functions-1)
+	- [ucl_object_new](#ucl_object_new)
+	- [ucl_object_typed_new](#ucl_object_typed_new)
+	- [Primitive objects generation](#primitive-objects-generation)
+	- [ucl_object_fromstring_common](#ucl_object_fromstring_common)
+- [Iteration functions](#iteration-functions-1)
+	- [ucl_iterate_object](#ucl_iterate_object)
+- [Validation functions](#validation-functions-1)
+	- [ucl_object_validate](#ucl_object_validate)
+
+# Synopsis
 
 `#include <ucl.h>`
 
-Description
-===========
+# Description
 
 Libucl is a parser and `C` API to parse and generate `ucl` objects. Libucl consist of several groups of functions:
 
 ### Parser functions
-Used to parse `ucl` files and provide interface to extract `ucl` object
+Used to parse `ucl` files and provide interface to extract `ucl` object. Currently, `libucl` can parse only full `ucl` documents, for instance, it is impossible to parse a part of document and therefore it is impossible to use `libucl` as a streaming parser. In future, this limitation can be removed.
 
 ### Emitting functions
-Convert `ucl` objects to some textual or binary representation.
+Convert `ucl` objects to some textual or binary representation. Currently, libucl supports the following exports:
+
+- `JSON` - valid json format (can possibly loose some original data, such as implicit arrays)
+- `Config` - human-readable configuration format (losseless)
+- `YAML` - embedded yaml format (has the same limitations as `json` output)
 
 ### Conversion functions
-Help to convert `ucl` objects to C types
+Help to convert `ucl` objects to C types. These functions are used to convert `ucl_object_t` to C primitive types, such as numbers, strings or boolean values.
 
 ### Generation functions
-Allow creating of `ucl` objects from C types
+Allow creating of `ucl` objects from C types and creating of complex `ucl` objects, such as hashes or arrays from primitive `ucl` objects, such as numbers or strings.
 
 ### Iteration functions
-Iterate over `ucl` objects
+Iterate over `ucl` complex objects or over a chain of values, for example when a key in an object has multiple values (that can be treated as implicit array or implicit consolidation).
+
+### Validation functions
+Validation functions are used to validate some object `obj` using json-schema compatible object `schema`. Both input and schema must be UCL objects to perform validation.
 
 ### Utility functions
-Provide basic utilities to manage `ucl` objects
+Provide basic utilities to manage `ucl` objects: creating, removing, retaining and releasing reference count and so on.
 
 # Parser functions
 
@@ -40,6 +85,7 @@ Creates new parser with the specified fl
 
 - `UCL_PARSER_KEY_LOWERCASE` - lowercase keys parsed
 - `UCL_PARSER_ZEROCOPY` - try to use zero-copy mode when reading files (in zero-copy mode text chunk being parsed without copying strings so it should exist till any object parsed is used)
+- `UCL_PARSER_NO_TIME` - treat time values as strings without parsing them as floats
 
 ### ucl_parser_register_macro
 
@@ -87,6 +133,14 @@ while this one won't be parsed correctly

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

More information about the svn-src-projects mailing list