svn commit: r246685 - in projects/calloutng: . bin/cat bin/ps bin/setfacl bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/op...

Davide Italiano davide at FreeBSD.org
Mon Feb 11 19:23:28 UTC 2013 

Author: davide
Date: Mon Feb 11 19:23:23 2013
New Revision: 246685
URL: http://svnweb.freebsd.org/changeset/base/246685

Log:
  Merge head r236314 through r246684.

Added:
  projects/calloutng/contrib/bmake/Makefile
     - copied unchanged from r246684, head/contrib/bmake/Makefile
  projects/calloutng/contrib/bmake/Makefile.config.in
     - copied unchanged from r246684, head/contrib/bmake/Makefile.config.in
  projects/calloutng/contrib/bmake/makefile.in
     - copied unchanged from r246684, head/contrib/bmake/makefile.in
  projects/calloutng/contrib/bmake/mk/
     - copied from r246684, head/contrib/bmake/mk/
  projects/calloutng/lib/libc/arm/sys/__vdso_gettc.c
     - copied unchanged from r246684, head/lib/libc/arm/sys/__vdso_gettc.c
  projects/calloutng/lib/libc/ia64/sys/__vdso_gettc.c
     - copied unchanged from r246684, head/lib/libc/ia64/sys/__vdso_gettc.c
  projects/calloutng/lib/libc/mips/sys/__vdso_gettc.c
     - copied unchanged from r246684, head/lib/libc/mips/sys/__vdso_gettc.c
  projects/calloutng/lib/libc/powerpc/sys/__vdso_gettc.c
     - copied unchanged from r246684, head/lib/libc/powerpc/sys/__vdso_gettc.c
  projects/calloutng/lib/libc/powerpc64/sys/__vdso_gettc.c
     - copied unchanged from r246684, head/lib/libc/powerpc64/sys/__vdso_gettc.c
  projects/calloutng/lib/libc/sparc64/sys/__vdso_gettc.c
     - copied unchanged from r246684, head/lib/libc/sparc64/sys/__vdso_gettc.c
  projects/calloutng/lib/libc/stdio/fmemopen.c
     - copied unchanged from r246684, head/lib/libc/stdio/fmemopen.c
  projects/calloutng/lib/libpmc/pmc.ivybridgexeon.3
     - copied unchanged from r246684, head/lib/libpmc/pmc.ivybridgexeon.3
  projects/calloutng/sys/arm/allwinner/a10_gpio.c
     - copied unchanged from r246684, head/sys/arm/allwinner/a10_gpio.c
  projects/calloutng/sys/arm/allwinner/a10_wdog.c
     - copied unchanged from r246684, head/sys/arm/allwinner/a10_wdog.c
  projects/calloutng/sys/arm/allwinner/a10_wdog.h
     - copied unchanged from r246684, head/sys/arm/allwinner/a10_wdog.h
  projects/calloutng/sys/boot/fdt/help.fdt
     - copied unchanged from r246684, head/sys/boot/fdt/help.fdt
  projects/calloutng/sys/boot/usb/
     - copied from r246684, head/sys/boot/usb/
  projects/calloutng/sys/cddl/boot/zfs/lz4.c
     - copied unchanged from r246684, head/sys/cddl/boot/zfs/lz4.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4
     - copied unchanged from r246684, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4.descrip
     - copied unchanged from r246684, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4.descrip
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c
     - copied unchanged from r246684, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c
  projects/calloutng/sys/dev/usb/usb_freebsd_loader.h
     - copied unchanged from r246684, head/sys/dev/usb/usb_freebsd_loader.h
  projects/calloutng/tools/build/options/WITHOUT_CLANG_FULL
     - copied unchanged from r246684, head/tools/build/options/WITHOUT_CLANG_FULL
  projects/calloutng/tools/build/options/WITHOUT_LIBCPLUSPLUS
     - copied unchanged from r246684, head/tools/build/options/WITHOUT_LIBCPLUSPLUS
  projects/calloutng/tools/build/options/WITH_BSD_PATCH
     - copied unchanged from r246684, head/tools/build/options/WITH_BSD_PATCH
  projects/calloutng/tools/build/options/WITH_CLANG_FULL
     - copied unchanged from r246684, head/tools/build/options/WITH_CLANG_FULL
  projects/calloutng/tools/build/options/WITH_GPL_DTC
     - copied unchanged from r246684, head/tools/build/options/WITH_GPL_DTC
  projects/calloutng/tools/regression/lib/libc/stdio/test-fmemopen.c
     - copied unchanged from r246684, head/tools/regression/lib/libc/stdio/test-fmemopen.c
  projects/calloutng/tools/regression/lib/libc/stdio/test-fmemopen.t
     - copied unchanged from r246684, head/tools/regression/lib/libc/stdio/test-fmemopen.t
  projects/calloutng/usr.bin/bmake/Makefile.config
     - copied unchanged from r246684, head/usr.bin/bmake/Makefile.config
  projects/calloutng/usr.bin/patch/
     - copied from r246684, head/usr.bin/patch/
Deleted:
  projects/calloutng/contrib/bmake/Makefile.in
  projects/calloutng/lib/libstand/if_ether.h
  projects/calloutng/sys/dev/blackhole/
  projects/calloutng/sys/modules/blackhole/
Modified:
  projects/calloutng/Makefile.inc1
  projects/calloutng/ObsoleteFiles.inc
  projects/calloutng/UPDATING
  projects/calloutng/bin/cat/cat.1
  projects/calloutng/bin/cat/cat.c
  projects/calloutng/bin/ps/ps.1
  projects/calloutng/bin/setfacl/setfacl.1
  projects/calloutng/bin/sh/eval.c
  projects/calloutng/bin/sh/expand.c
  projects/calloutng/bin/sh/expand.h
  projects/calloutng/bin/sh/jobs.c
  projects/calloutng/bin/sh/miscbltin.c
  projects/calloutng/bin/sh/mksyntax.c
  projects/calloutng/bin/sh/nodetypes
  projects/calloutng/bin/sh/parser.h
  projects/calloutng/bin/sh/redir.c
  projects/calloutng/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/calloutng/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  projects/calloutng/contrib/binutils/include/elf/common.h
  projects/calloutng/contrib/bmake/ChangeLog
  projects/calloutng/contrib/bmake/FILES
  projects/calloutng/contrib/bmake/bmake.1
  projects/calloutng/contrib/bmake/bmake.cat1
  projects/calloutng/contrib/bmake/boot-strap
  projects/calloutng/contrib/bmake/bsd.after-import.mk
  projects/calloutng/contrib/bmake/compat.c
  projects/calloutng/contrib/bmake/configure
  projects/calloutng/contrib/bmake/configure.in
  projects/calloutng/contrib/bmake/job.c
  projects/calloutng/contrib/bmake/main.c
  projects/calloutng/contrib/bmake/make-bootstrap.sh.in
  projects/calloutng/contrib/bmake/make.1
  projects/calloutng/contrib/bmake/meta.c
  projects/calloutng/contrib/bmake/realpath.c
  projects/calloutng/contrib/bmake/unit-tests/Makefile.in
  projects/calloutng/contrib/bmake/var.c
  projects/calloutng/contrib/gcc/config/arm/freebsd.h
  projects/calloutng/contrib/gcc/config/arm/unwind-arm.h
  projects/calloutng/contrib/gdb/gdb/osabi.c
  projects/calloutng/contrib/ipfilter/ipsend/44arp.c
  projects/calloutng/contrib/libarchive/libarchive/archive_getdate.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_archive_getdate.c
  projects/calloutng/contrib/libc++/include/__config
  projects/calloutng/contrib/libc++/include/algorithm
  projects/calloutng/contrib/libc++/include/array
  projects/calloutng/contrib/libc++/include/atomic
  projects/calloutng/contrib/libc++/include/cmath
  projects/calloutng/contrib/libc++/include/functional
  projects/calloutng/contrib/libc++/include/future
  projects/calloutng/contrib/libc++/include/istream
  projects/calloutng/contrib/libc++/include/iterator
  projects/calloutng/contrib/libc++/include/limits
  projects/calloutng/contrib/libc++/include/locale
  projects/calloutng/contrib/libc++/include/memory
  projects/calloutng/contrib/libc++/include/ostream
  projects/calloutng/contrib/libc++/include/random
  projects/calloutng/contrib/libc++/include/regex
  projects/calloutng/contrib/libc++/include/string
  projects/calloutng/contrib/libc++/include/type_traits
  projects/calloutng/contrib/libc++/include/vector
  projects/calloutng/contrib/libc++/src/chrono.cpp
  projects/calloutng/contrib/libc++/src/debug.cpp
  projects/calloutng/contrib/libc++/src/exception.cpp
  projects/calloutng/contrib/libc++/src/future.cpp
  projects/calloutng/contrib/libc++/src/hash.cpp
  projects/calloutng/contrib/libc++/src/locale.cpp
  projects/calloutng/contrib/libc++/src/string.cpp
  projects/calloutng/contrib/libc++/src/thread.cpp
  projects/calloutng/contrib/libcxxrt/exception.cc
  projects/calloutng/contrib/libstdc++/libsupc++/unwind-cxx.h
  projects/calloutng/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td
  projects/calloutng/contrib/llvm/tools/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
  projects/calloutng/etc/Makefile
  projects/calloutng/etc/mtree/BSD.include.dist
  projects/calloutng/etc/rc.d/ip6addrctl
  projects/calloutng/etc/rc.d/pfsync
  projects/calloutng/games/fortune/datfiles/fortunes-o.real
  projects/calloutng/gnu/usr.bin/patch/Makefile
  projects/calloutng/include/Makefile
  projects/calloutng/include/stdio.h   (contents, props changed)
  projects/calloutng/kerberos5/libexec/digest-service/Makefile
  projects/calloutng/lib/Makefile
  projects/calloutng/lib/clang/Makefile
  projects/calloutng/lib/clang/clang.build.mk
  projects/calloutng/lib/clang/libclanganalysis/Makefile
  projects/calloutng/lib/clang/libclangarcmigrate/Makefile
  projects/calloutng/lib/clang/libclangast/Makefile
  projects/calloutng/lib/clang/libclangbasic/Makefile
  projects/calloutng/lib/clang/libclangcodegen/Makefile
  projects/calloutng/lib/clang/libclangdriver/Makefile
  projects/calloutng/lib/clang/libclangedit/Makefile
  projects/calloutng/lib/clang/libclangfrontend/Makefile
  projects/calloutng/lib/clang/libclangfrontendtool/Makefile
  projects/calloutng/lib/clang/libclanglex/Makefile
  projects/calloutng/lib/clang/libclangparse/Makefile
  projects/calloutng/lib/clang/libclangrewritecore/Makefile
  projects/calloutng/lib/clang/libclangrewritefrontend/Makefile
  projects/calloutng/lib/clang/libclangsema/Makefile
  projects/calloutng/lib/clang/libclangserialization/Makefile
  projects/calloutng/lib/clang/libclangstaticanalyzercheckers/Makefile
  projects/calloutng/lib/clang/libclangstaticanalyzercore/Makefile
  projects/calloutng/lib/clang/libclangstaticanalyzerfrontend/Makefile
  projects/calloutng/lib/clang/libllvmarchive/Makefile
  projects/calloutng/lib/clang/libllvmarmasmparser/Makefile
  projects/calloutng/lib/clang/libllvmarmcodegen/Makefile
  projects/calloutng/lib/clang/libllvmarmdesc/Makefile
  projects/calloutng/lib/clang/libllvmarmdisassembler/Makefile
  projects/calloutng/lib/clang/libllvmarminfo/Makefile
  projects/calloutng/lib/clang/libllvmarminstprinter/Makefile
  projects/calloutng/lib/clang/libllvmasmparser/Makefile
  projects/calloutng/lib/clang/libllvmasmprinter/Makefile
  projects/calloutng/lib/clang/libllvmbitreader/Makefile
  projects/calloutng/lib/clang/libllvmbitwriter/Makefile
  projects/calloutng/lib/clang/libllvmcodegen/Makefile
  projects/calloutng/lib/clang/libllvmcore/Makefile
  projects/calloutng/lib/clang/libllvmdebuginfo/Makefile
  projects/calloutng/lib/clang/libllvmexecutionengine/Makefile
  projects/calloutng/lib/clang/libllvminstcombine/Makefile
  projects/calloutng/lib/clang/libllvminstrumentation/Makefile
  projects/calloutng/lib/clang/libllvminterpreter/Makefile
  projects/calloutng/lib/clang/libllvmjit/Makefile
  projects/calloutng/lib/clang/libllvmlinker/Makefile
  projects/calloutng/lib/clang/libllvmmcdisassembler/Makefile
  projects/calloutng/lib/clang/libllvmmcparser/Makefile
  projects/calloutng/lib/clang/libllvmmipsasmparser/Makefile
  projects/calloutng/lib/clang/libllvmmipscodegen/Makefile
  projects/calloutng/lib/clang/libllvmmipsdesc/Makefile
  projects/calloutng/lib/clang/libllvmmipsdisassembler/Makefile
  projects/calloutng/lib/clang/libllvmmipsinfo/Makefile
  projects/calloutng/lib/clang/libllvmmipsinstprinter/Makefile
  projects/calloutng/lib/clang/libllvmobject/Makefile
  projects/calloutng/lib/clang/libllvmpowerpccodegen/Makefile
  projects/calloutng/lib/clang/libllvmpowerpcdesc/Makefile
  projects/calloutng/lib/clang/libllvmpowerpcinfo/Makefile
  projects/calloutng/lib/clang/libllvmpowerpcinstprinter/Makefile
  projects/calloutng/lib/clang/libllvmruntimedyld/Makefile
  projects/calloutng/lib/clang/libllvmselectiondag/Makefile
  projects/calloutng/lib/clang/libllvmtablegen/Makefile
  projects/calloutng/lib/clang/libllvmtarget/Makefile
  projects/calloutng/lib/clang/libllvmvectorize/Makefile
  projects/calloutng/lib/clang/libllvmx86asmparser/Makefile
  projects/calloutng/lib/clang/libllvmx86codegen/Makefile
  projects/calloutng/lib/clang/libllvmx86desc/Makefile
  projects/calloutng/lib/clang/libllvmx86info/Makefile
  projects/calloutng/lib/clang/libllvmx86instprinter/Makefile
  projects/calloutng/lib/clang/libllvmx86utils/Makefile
  projects/calloutng/lib/libc/amd64/sys/__vdso_gettc.c
  projects/calloutng/lib/libc/arm/sys/Makefile.inc
  projects/calloutng/lib/libc/gen/fts.c
  projects/calloutng/lib/libc/i386/sys/__vdso_gettc.c
  projects/calloutng/lib/libc/ia64/sys/Makefile.inc
  projects/calloutng/lib/libc/mips/sys/Makefile.inc
  projects/calloutng/lib/libc/net/sctp_sys_calls.c
  projects/calloutng/lib/libc/powerpc/Makefile.inc
  projects/calloutng/lib/libc/powerpc64/Makefile.inc
  projects/calloutng/lib/libc/sparc64/Makefile.inc
  projects/calloutng/lib/libc/stdio/Makefile.inc   (contents, props changed)
  projects/calloutng/lib/libc/stdio/Symbol.map   (contents, props changed)
  projects/calloutng/lib/libc/stdio/fopen.3   (contents, props changed)
  projects/calloutng/lib/libc/sys/__vdso_gettimeofday.c
  projects/calloutng/lib/libc/sys/chflags.2
  projects/calloutng/lib/libc/sys/gettimeofday.c
  projects/calloutng/lib/libc/sys/open.2
  projects/calloutng/lib/libc/sys/ptrace.2
  projects/calloutng/lib/libc/sys/sigqueue.2
  projects/calloutng/lib/libcompiler_rt/Makefile
  projects/calloutng/lib/libcxxrt/Version.map
  projects/calloutng/lib/libpmc/Makefile
  projects/calloutng/lib/libpmc/libpmc.c
  projects/calloutng/lib/libpmc/pmc.ivybridge.3
  projects/calloutng/lib/libpmc/pmc.sandybridge.3
  projects/calloutng/lib/libpmc/pmc.sandybridgexeon.3
  projects/calloutng/lib/libstand/Makefile
  projects/calloutng/libexec/bootpd/rtmsg.c
  projects/calloutng/libexec/rtld-elf/powerpc64/reloc.c
  projects/calloutng/libexec/tftpd/tftp-io.c
  projects/calloutng/libexec/tftpd/tftp-options.c
  projects/calloutng/libexec/tftpd/tftp-utils.h
  projects/calloutng/libexec/tftpd/tftpd.c
  projects/calloutng/release/Makefile
  projects/calloutng/release/amd64/mkisoimages.sh
  projects/calloutng/release/generate-release.sh
  projects/calloutng/release/i386/mkisoimages.sh
  projects/calloutng/release/ia64/mkisoimages.sh
  projects/calloutng/release/pc98/mkisoimages.sh
  projects/calloutng/release/powerpc/mkisoimages.sh
  projects/calloutng/release/sparc64/mkisoimages.sh
  projects/calloutng/sbin/devd/devd.8
  projects/calloutng/sbin/devd/devd.cc
  projects/calloutng/sbin/devd/devd.hh
  projects/calloutng/sbin/geom/class/eli/geom_eli.c
  projects/calloutng/sbin/ifconfig/ifieee80211.c
  projects/calloutng/sbin/recoverdisk/recoverdisk.c
  projects/calloutng/sbin/route/route.c
  projects/calloutng/share/man/man5/group.5
  projects/calloutng/share/man/man5/src.conf.5
  projects/calloutng/share/man/man7/release.7
  projects/calloutng/share/man/man9/timeout.9
  projects/calloutng/share/man/man9/vfs_busy.9
  projects/calloutng/share/misc/committers-src.dot
  projects/calloutng/share/mk/bsd.own.mk
  projects/calloutng/sys/amd64/amd64/minidump_machdep.c
  projects/calloutng/sys/amd64/amd64/mp_machdep.c
  projects/calloutng/sys/amd64/amd64/pmap.c
  projects/calloutng/sys/amd64/conf/GENERIC
  projects/calloutng/sys/amd64/include/intr_machdep.h
  projects/calloutng/sys/amd64/include/pmap.h
  projects/calloutng/sys/amd64/include/vmm_instruction_emul.h   (contents, props changed)
  projects/calloutng/sys/amd64/linux32/linux.h
  projects/calloutng/sys/amd64/linux32/linux32_sysvec.c
  projects/calloutng/sys/amd64/vmm/io/ppt.c
  projects/calloutng/sys/amd64/vmm/vmm.c
  projects/calloutng/sys/amd64/vmm/vmm_instruction_emul.c
  projects/calloutng/sys/arm/allwinner/a10_clk.c
  projects/calloutng/sys/arm/allwinner/a10_ehci.c
  projects/calloutng/sys/arm/allwinner/a10_machdep.c
  projects/calloutng/sys/arm/allwinner/files.a10
  projects/calloutng/sys/arm/arm/busdma_machdep.c
  projects/calloutng/sys/arm/arm/vm_machdep.c
  projects/calloutng/sys/arm/conf/BEAGLEBONE
  projects/calloutng/sys/arm/conf/CUBIEBOARD
  projects/calloutng/sys/arm/include/vmparam.h
  projects/calloutng/sys/arm/ti/cpsw/if_cpsw.c
  projects/calloutng/sys/arm/ti/cpsw/if_cpswreg.h
  projects/calloutng/sys/arm/ti/cpsw/if_cpswvar.h
  projects/calloutng/sys/boot/arm/uboot/Makefile
  projects/calloutng/sys/boot/common/part.c
  projects/calloutng/sys/boot/fdt/dts/cubieboard.dts
  projects/calloutng/sys/boot/powerpc/ps3/Makefile
  projects/calloutng/sys/boot/powerpc/uboot/Makefile
  projects/calloutng/sys/boot/uboot/common/metadata.c
  projects/calloutng/sys/cam/scsi/scsi_all.c
  projects/calloutng/sys/cddl/boot/zfs/README
  projects/calloutng/sys/cddl/boot/zfs/zfsimpl.h
  projects/calloutng/sys/cddl/boot/zfs/zfssubr.c
  projects/calloutng/sys/cddl/compat/opensolaris/sys/byteorder.h
  projects/calloutng/sys/cddl/compat/opensolaris/sys/kmem.h
  projects/calloutng/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
  projects/calloutng/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
  projects/calloutng/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/calloutng/sys/cddl/dev/dtrace/dtrace_ioctl.c
  projects/calloutng/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S
  projects/calloutng/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
  projects/calloutng/sys/compat/linprocfs/linprocfs.c
  projects/calloutng/sys/compat/linux/linux_emul.c
  projects/calloutng/sys/compat/linux/linux_file.c
  projects/calloutng/sys/compat/linux/linux_file.h
  projects/calloutng/sys/compat/linux/linux_fork.c
  projects/calloutng/sys/compat/linux/linux_ioctl.h
  projects/calloutng/sys/compat/linux/linux_ipc.h
  projects/calloutng/sys/compat/linux/linux_mib.c
  projects/calloutng/sys/compat/linux/linux_misc.h
  projects/calloutng/sys/compat/linux/linux_signal.h
  projects/calloutng/sys/compat/linux/linux_socket.h
  projects/calloutng/sys/compat/linux/linux_sysctl.c
  projects/calloutng/sys/compat/linux/linux_time.c
  projects/calloutng/sys/conf/NOTES
  projects/calloutng/sys/conf/files
  projects/calloutng/sys/conf/newvers.sh
  projects/calloutng/sys/conf/options
  projects/calloutng/sys/dev/acpi_support/acpi_asus_wmi.c
  projects/calloutng/sys/dev/acpi_support/acpi_fujitsu.c   (contents, props changed)
  projects/calloutng/sys/dev/acpi_support/acpi_hp.c
  projects/calloutng/sys/dev/acpi_support/acpi_ibm.c   (contents, props changed)
  projects/calloutng/sys/dev/acpi_support/acpi_panasonic.c   (contents, props changed)
  projects/calloutng/sys/dev/acpi_support/acpi_sony.c   (contents, props changed)
  projects/calloutng/sys/dev/acpi_support/acpi_toshiba.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_acad.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_button.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_cmbat.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_dock.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_ec.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_hpet.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_lid.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_pci.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_pci_link.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_pcib_pci.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_perf.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_resource.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_smbat.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_thermal.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_throttle.c   (contents, props changed)
  projects/calloutng/sys/dev/acpica/acpi_timer.c   (contents, props changed)
  projects/calloutng/sys/dev/adlink/adlink.c   (contents, props changed)
  projects/calloutng/sys/dev/age/if_age.c
  projects/calloutng/sys/dev/age/if_agevar.h
  projects/calloutng/sys/dev/amdsbwd/amdsbwd.c
  projects/calloutng/sys/dev/amdtemp/amdtemp.c   (contents, props changed)
  projects/calloutng/sys/dev/ata/ata-all.h
  projects/calloutng/sys/dev/ata/ata-lowlevel.c
  projects/calloutng/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
  projects/calloutng/sys/dev/ath/if_ath.c
  projects/calloutng/sys/dev/ath/if_ath_ahb.c
  projects/calloutng/sys/dev/ath/if_ath_alq.c
  projects/calloutng/sys/dev/ath/if_ath_alq.h
  projects/calloutng/sys/dev/ath/if_ath_misc.h
  projects/calloutng/sys/dev/ath/if_ath_pci.c
  projects/calloutng/sys/dev/ath/if_ath_rx.c
  projects/calloutng/sys/dev/ath/if_ath_tx.c
  projects/calloutng/sys/dev/ath/if_ath_tx_edma.c
  projects/calloutng/sys/dev/ath/if_ath_tx_ht.c
  projects/calloutng/sys/dev/ath/if_athvar.h
  projects/calloutng/sys/dev/auxio/auxio.c   (contents, props changed)
  projects/calloutng/sys/dev/bxe/if_bxe.c
  projects/calloutng/sys/dev/ce/if_ce.c   (contents, props changed)
  projects/calloutng/sys/dev/cfi/cfi_bus_fdt.c
  projects/calloutng/sys/dev/cfi/cfi_bus_ixp4xx.c
  projects/calloutng/sys/dev/coretemp/coretemp.c   (contents, props changed)
  projects/calloutng/sys/dev/cp/if_cp.c   (contents, props changed)
  projects/calloutng/sys/dev/cpufreq/ichss.c   (contents, props changed)
  projects/calloutng/sys/dev/ctau/if_ct.c   (contents, props changed)
  projects/calloutng/sys/dev/cx/if_cx.c   (contents, props changed)
  projects/calloutng/sys/dev/cxgbe/common/t4_hw.c
  projects/calloutng/sys/dev/cxgbe/t4_main.c
  projects/calloutng/sys/dev/cxgbe/t4_sge.c
  projects/calloutng/sys/dev/digi/digi_isa.c   (contents, props changed)
  projects/calloutng/sys/dev/digi/digi_pci.c   (contents, props changed)
  projects/calloutng/sys/dev/e1000/if_em.c   (contents, props changed)
  projects/calloutng/sys/dev/e1000/if_igb.c   (contents, props changed)
  projects/calloutng/sys/dev/e1000/if_lem.c
  projects/calloutng/sys/dev/ep/if_ep_eisa.c   (contents, props changed)
  projects/calloutng/sys/dev/ep/if_ep_isa.c   (contents, props changed)
  projects/calloutng/sys/dev/ep/if_ep_mca.c   (contents, props changed)
  projects/calloutng/sys/dev/ep/if_ep_pccard.c   (contents, props changed)
  projects/calloutng/sys/dev/fdc/fdc_acpi.c   (contents, props changed)
  projects/calloutng/sys/dev/hwpmc/hwpmc_core.c
  projects/calloutng/sys/dev/hwpmc/hwpmc_intel.c
  projects/calloutng/sys/dev/hwpmc/pmc_events.h
  projects/calloutng/sys/dev/iicbus/ad7418.c   (contents, props changed)
  projects/calloutng/sys/dev/iicbus/ds133x.c   (contents, props changed)
  projects/calloutng/sys/dev/iicbus/ds1672.c   (contents, props changed)
  projects/calloutng/sys/dev/iicbus/icee.c   (contents, props changed)
  projects/calloutng/sys/dev/ixgb/if_ixgb.c   (contents, props changed)
  projects/calloutng/sys/dev/ixgbe/ixgbe.c   (contents, props changed)
  projects/calloutng/sys/dev/ixgbe/ixv.c
  projects/calloutng/sys/dev/mfi/mfi_cam.c   (contents, props changed)
  projects/calloutng/sys/dev/mn/if_mn.c   (contents, props changed)
  projects/calloutng/sys/dev/mxge/if_mxge.c   (contents, props changed)
  projects/calloutng/sys/dev/my/if_my.c   (contents, props changed)
  projects/calloutng/sys/dev/nvram2env/nvram2env.c   (contents, props changed)
  projects/calloutng/sys/dev/nxge/if_nxge.c   (contents, props changed)
  projects/calloutng/sys/dev/oce/oce_if.c   (contents, props changed)
  projects/calloutng/sys/dev/sdhci/sdhci_pci.c
  projects/calloutng/sys/dev/sound/pci/emu10kx-midi.c   (contents, props changed)
  projects/calloutng/sys/dev/sound/pci/emu10kx-pcm.c   (contents, props changed)
  projects/calloutng/sys/dev/sound/pci/emu10kx.c   (contents, props changed)
  projects/calloutng/sys/dev/sound/pcm/mixer.c
  projects/calloutng/sys/dev/sound/pcm/mixer.h
  projects/calloutng/sys/dev/sound/sbus/cs4231.c   (contents, props changed)
  projects/calloutng/sys/dev/sound/usb/uaudio.c
  projects/calloutng/sys/dev/sound/usb/uaudio_pcm.c
  projects/calloutng/sys/dev/syscons/syscons.c
  projects/calloutng/sys/dev/uart/uart_bus.h
  projects/calloutng/sys/dev/uart/uart_bus_acpi.c
  projects/calloutng/sys/dev/uart/uart_bus_isa.c
  projects/calloutng/sys/dev/uart/uart_bus_pci.c
  projects/calloutng/sys/dev/uart/uart_core.c
  projects/calloutng/sys/dev/usb/controller/at91dci.c
  projects/calloutng/sys/dev/usb/controller/atmegadci.c
  projects/calloutng/sys/dev/usb/controller/avr32dci.c
  projects/calloutng/sys/dev/usb/controller/dwc_otg.c
  projects/calloutng/sys/dev/usb/controller/ehci.c
  projects/calloutng/sys/dev/usb/controller/musb_otg.c
  projects/calloutng/sys/dev/usb/controller/ohci.c
  projects/calloutng/sys/dev/usb/controller/uhci.c
  projects/calloutng/sys/dev/usb/controller/usb_controller.c
  projects/calloutng/sys/dev/usb/controller/uss820dci.c
  projects/calloutng/sys/dev/usb/controller/xhci.c
  projects/calloutng/sys/dev/usb/controller/xhci.h
  projects/calloutng/sys/dev/usb/input/uhid.c
  projects/calloutng/sys/dev/usb/input/ukbd.c
  projects/calloutng/sys/dev/usb/input/ums.c
  projects/calloutng/sys/dev/usb/misc/udbp.c
  projects/calloutng/sys/dev/usb/misc/ufm.c
  projects/calloutng/sys/dev/usb/net/if_cdce.c
  projects/calloutng/sys/dev/usb/net/if_cue.c
  projects/calloutng/sys/dev/usb/net/if_ipheth.c
  projects/calloutng/sys/dev/usb/net/if_kue.c
  projects/calloutng/sys/dev/usb/net/if_smsc.c
  projects/calloutng/sys/dev/usb/storage/umass.c
  projects/calloutng/sys/dev/usb/storage/urio.c
  projects/calloutng/sys/dev/usb/storage/ustorage_fs.c
  projects/calloutng/sys/dev/usb/template/usb_template.c
  projects/calloutng/sys/dev/usb/template/usb_template_audio.c
  projects/calloutng/sys/dev/usb/template/usb_template_cdce.c
  projects/calloutng/sys/dev/usb/template/usb_template_kbd.c
  projects/calloutng/sys/dev/usb/template/usb_template_modem.c
  projects/calloutng/sys/dev/usb/template/usb_template_mouse.c
  projects/calloutng/sys/dev/usb/template/usb_template_msc.c
  projects/calloutng/sys/dev/usb/template/usb_template_mtp.c
  projects/calloutng/sys/dev/usb/ufm_ioctl.h
  projects/calloutng/sys/dev/usb/usb.h
  projects/calloutng/sys/dev/usb/usb_bus.h
  projects/calloutng/sys/dev/usb/usb_busdma.c
  projects/calloutng/sys/dev/usb/usb_busdma.h
  projects/calloutng/sys/dev/usb/usb_compat_linux.c
  projects/calloutng/sys/dev/usb/usb_controller.h
  projects/calloutng/sys/dev/usb/usb_core.c
  projects/calloutng/sys/dev/usb/usb_core.h
  projects/calloutng/sys/dev/usb/usb_debug.c
  projects/calloutng/sys/dev/usb/usb_dev.c
  projects/calloutng/sys/dev/usb/usb_dev.h
  projects/calloutng/sys/dev/usb/usb_device.c
  projects/calloutng/sys/dev/usb/usb_device.h
  projects/calloutng/sys/dev/usb/usb_dynamic.c
  projects/calloutng/sys/dev/usb/usb_endian.h
  projects/calloutng/sys/dev/usb/usb_error.c
  projects/calloutng/sys/dev/usb/usb_freebsd.h
  projects/calloutng/sys/dev/usb/usb_generic.c
  projects/calloutng/sys/dev/usb/usb_handle_request.c
  projects/calloutng/sys/dev/usb/usb_hid.c
  projects/calloutng/sys/dev/usb/usb_hub.c
  projects/calloutng/sys/dev/usb/usb_ioctl.h
  projects/calloutng/sys/dev/usb/usb_lookup.c
  projects/calloutng/sys/dev/usb/usb_mbuf.c
  projects/calloutng/sys/dev/usb/usb_msctest.c
  projects/calloutng/sys/dev/usb/usb_parse.c
  projects/calloutng/sys/dev/usb/usb_pci.h
  projects/calloutng/sys/dev/usb/usb_pf.c
  projects/calloutng/sys/dev/usb/usb_process.c
  projects/calloutng/sys/dev/usb/usb_process.h
  projects/calloutng/sys/dev/usb/usb_request.c
  projects/calloutng/sys/dev/usb/usb_transfer.c
  projects/calloutng/sys/dev/usb/usb_util.c
  projects/calloutng/sys/dev/usb/usbdi.h
  projects/calloutng/sys/dev/usb/usbhid.h
  projects/calloutng/sys/dev/usb/wlan/if_rum.c
  projects/calloutng/sys/dev/usb/wlan/if_rumvar.h
  projects/calloutng/sys/dev/usb/wlan/if_run.c
  projects/calloutng/sys/dev/usb/wlan/if_runvar.h
  projects/calloutng/sys/dev/usb/wlan/if_uath.c
  projects/calloutng/sys/dev/usb/wlan/if_upgt.c
  projects/calloutng/sys/dev/usb/wlan/if_upgtvar.h
  projects/calloutng/sys/dev/usb/wlan/if_ural.c
  projects/calloutng/sys/dev/usb/wlan/if_uralvar.h
  projects/calloutng/sys/dev/usb/wlan/if_urtw.c
  projects/calloutng/sys/dev/usb/wlan/if_urtwvar.h
  projects/calloutng/sys/dev/usb/wlan/if_zyd.c
  projects/calloutng/sys/dev/usb/wlan/if_zydreg.h
  projects/calloutng/sys/dev/vx/if_vx_eisa.c   (contents, props changed)
  projects/calloutng/sys/dev/vx/if_vx_pci.c   (contents, props changed)
  projects/calloutng/sys/dev/vxge/vxge.c   (contents, props changed)
  projects/calloutng/sys/dev/xen/console/console.c
  projects/calloutng/sys/fs/devfs/devfs_vnops.c
  projects/calloutng/sys/fs/ext2fs/ext2_alloc.c
  projects/calloutng/sys/fs/ext2fs/ext2_balloc.c
  projects/calloutng/sys/fs/ext2fs/ext2_bmap.c
  projects/calloutng/sys/fs/ext2fs/ext2_dir.h
  projects/calloutng/sys/fs/ext2fs/ext2_inode.c
  projects/calloutng/sys/fs/ext2fs/ext2_inode_cnv.c
  projects/calloutng/sys/fs/ext2fs/ext2_lookup.c
  projects/calloutng/sys/fs/ext2fs/ext2_mount.h
  projects/calloutng/sys/fs/ext2fs/ext2_subr.c
  projects/calloutng/sys/fs/ext2fs/ext2_vfsops.c
  projects/calloutng/sys/fs/ext2fs/ext2_vnops.c
  projects/calloutng/sys/fs/ext2fs/ext2fs.h
  projects/calloutng/sys/fs/ext2fs/fs.h
  projects/calloutng/sys/fs/ext2fs/inode.h
  projects/calloutng/sys/fs/msdosfs/msdosfs_fat.c
  projects/calloutng/sys/fs/msdosfs/msdosfs_vfsops.c
  projects/calloutng/sys/fs/msdosfs/msdosfs_vnops.c
  projects/calloutng/sys/fs/nfs/nfs_commonkrpc.c
  projects/calloutng/sys/fs/nfs/nfs_commonsubs.c
  projects/calloutng/sys/fs/tmpfs/tmpfs_vnops.c
  projects/calloutng/sys/i386/conf/GENERIC
  projects/calloutng/sys/i386/i386/mp_machdep.c
  projects/calloutng/sys/i386/include/intr_machdep.h
  projects/calloutng/sys/i386/include/vmparam.h
  projects/calloutng/sys/i386/linux/linux.h
  projects/calloutng/sys/i386/linux/linux_ptrace.c
  projects/calloutng/sys/i386/linux/linux_sysvec.c
  projects/calloutng/sys/kern/imgact_elf.c
  projects/calloutng/sys/kern/init_main.c
  projects/calloutng/sys/kern/kern_clocksource.c
  projects/calloutng/sys/kern/kern_descrip.c
  projects/calloutng/sys/kern/kern_exec.c
  projects/calloutng/sys/kern/kern_exit.c
  projects/calloutng/sys/kern/kern_intr.c
  projects/calloutng/sys/kern/kern_ktr.c
  projects/calloutng/sys/kern/kern_malloc.c
  projects/calloutng/sys/kern/kern_mib.c
  projects/calloutng/sys/kern/kern_sig.c
  projects/calloutng/sys/kern/subr_blist.c
  projects/calloutng/sys/kern/subr_sleepqueue.c
  projects/calloutng/sys/kern/sys_process.c
  projects/calloutng/sys/kern/uipc_syscalls.c
  projects/calloutng/sys/kern/vfs_acl.c
  projects/calloutng/sys/kern/vfs_syscalls.c
  projects/calloutng/sys/kern/vfs_vnops.c
  projects/calloutng/sys/modules/Makefile
  projects/calloutng/sys/modules/usb/Makefile
  projects/calloutng/sys/modules/usb/smsc/Makefile
  projects/calloutng/sys/modules/wlan/Makefile
  projects/calloutng/sys/net/if.c
  projects/calloutng/sys/net/if_llatbl.c
  projects/calloutng/sys/net/if_llatbl.h
  projects/calloutng/sys/net/if_var.h
  projects/calloutng/sys/net80211/ieee80211_action.c
  projects/calloutng/sys/net80211/ieee80211_ddb.c
  projects/calloutng/sys/net80211/ieee80211_hwmp.c
  projects/calloutng/sys/net80211/ieee80211_input.c
  projects/calloutng/sys/net80211/ieee80211_ioctl.h
  projects/calloutng/sys/net80211/ieee80211_mesh.c
  projects/calloutng/sys/net80211/ieee80211_mesh.h
  projects/calloutng/sys/net80211/ieee80211_node.h
  projects/calloutng/sys/net80211/ieee80211_output.c
  projects/calloutng/sys/net80211/ieee80211_superg.c
  projects/calloutng/sys/netgraph/ng_ether.c
  projects/calloutng/sys/netinet/if_ether.h
  projects/calloutng/sys/netinet/in.c
  projects/calloutng/sys/netinet/ip_carp.c
  projects/calloutng/sys/netinet/ip_carp.h
  projects/calloutng/sys/netinet/libalias/alias.c
  projects/calloutng/sys/netinet/libalias/libalias.3
  projects/calloutng/sys/netinet/sctp.h
  projects/calloutng/sys/netinet/sctp_asconf.c
  projects/calloutng/sys/netinet/sctp_indata.c
  projects/calloutng/sys/netinet/sctp_input.c
  projects/calloutng/sys/netinet/sctp_output.c
  projects/calloutng/sys/netinet/sctp_output.h
  projects/calloutng/sys/netinet/sctp_pcb.c
  projects/calloutng/sys/netinet/sctp_structs.h
  projects/calloutng/sys/netinet/sctp_sysctl.c
  projects/calloutng/sys/netinet/sctp_timer.c
  projects/calloutng/sys/netinet/sctp_usrreq.c
  projects/calloutng/sys/netinet/sctputil.c
  projects/calloutng/sys/netinet/tcp.h
  projects/calloutng/sys/netinet/tcp_reass.c
  projects/calloutng/sys/netinet/tcp_syncache.c
  projects/calloutng/sys/netinet/udp.h
  projects/calloutng/sys/nfsclient/nfs_krpc.c
  projects/calloutng/sys/ofed/drivers/net/mlx4/en_tx.c
  projects/calloutng/sys/pc98/conf/GENERIC
  projects/calloutng/sys/powerpc/wii/wii_gpio.c
  projects/calloutng/sys/powerpc/wii/wii_ipc.c
  projects/calloutng/sys/powerpc/wii/wii_pic.c
  projects/calloutng/sys/security/audit/audit.h
  projects/calloutng/sys/sparc64/conf/GENERIC
  projects/calloutng/sys/sparc64/include/vmparam.h
  projects/calloutng/sys/sys/buf_ring.h
  projects/calloutng/sys/sys/diskmbr.h
  projects/calloutng/sys/sys/param.h
  projects/calloutng/sys/sys/pmc.h
  projects/calloutng/sys/sys/proc.h
  projects/calloutng/sys/sys/queue.h
  projects/calloutng/sys/sys/signalvar.h
  projects/calloutng/sys/sys/socket.h
  projects/calloutng/sys/sys/systm.h
  projects/calloutng/sys/sys/un.h
  projects/calloutng/sys/sys/vdso.h
  projects/calloutng/sys/ufs/ffs/ffs_alloc.c
  projects/calloutng/sys/ufs/ffs/ffs_inode.c
  projects/calloutng/sys/ufs/ufs/inode.h
  projects/calloutng/sys/ufs/ufs/ufs_lookup.c
  projects/calloutng/sys/vm/uma_core.c
  projects/calloutng/sys/vm/vm_kern.c
  projects/calloutng/sys/x86/x86/intr_machdep.c
  projects/calloutng/sys/x86/x86/local_apic.c
  projects/calloutng/sys/x86/x86/tsc.c
  projects/calloutng/tools/regression/sockets/unix_cmsg/README
  projects/calloutng/tools/regression/sockets/unix_cmsg/unix_cmsg.c
  projects/calloutng/tools/regression/sockets/unix_cmsg/unix_cmsg.t
  projects/calloutng/tools/test/pthread_vfork/pthread_vfork_test.c
  projects/calloutng/tools/tools/ath/athalq/ar5210_ds.c
  projects/calloutng/tools/tools/ath/athalq/ar5211_ds.c
  projects/calloutng/tools/tools/ath/athalq/ar5212_ds.c
  projects/calloutng/tools/tools/ath/athalq/ar5416_ds.c
  projects/calloutng/tools/tools/ath/athalq/main.c
  projects/calloutng/usr.bin/Makefile
  projects/calloutng/usr.bin/bmake/Makefile
  projects/calloutng/usr.bin/bmake/config.h
  projects/calloutng/usr.bin/bmake/unit-tests/Makefile
  projects/calloutng/usr.bin/clang/clang/Makefile
  projects/calloutng/usr.bin/csup/csup.1
  projects/calloutng/usr.bin/ee/Makefile
  projects/calloutng/usr.bin/find/function.c
  projects/calloutng/usr.bin/find/main.c
  projects/calloutng/usr.bin/join/join.c
  projects/calloutng/usr.bin/newgrp/newgrp.1
  projects/calloutng/usr.bin/newgrp/newgrp.c
  projects/calloutng/usr.bin/procstat/procstat_files.c
  projects/calloutng/usr.bin/xinstall/xinstall.c
  projects/calloutng/usr.sbin/arp/arp.8
  projects/calloutng/usr.sbin/arp/arp.c
  projects/calloutng/usr.sbin/bhyve/Makefile
  projects/calloutng/usr.sbin/bhyve/pci_emul.c
  projects/calloutng/usr.sbin/bhyve/pci_emul.h
  projects/calloutng/usr.sbin/bhyve/pci_passthru.c
  projects/calloutng/usr.sbin/bhyve/pci_virtio_block.c
  projects/calloutng/usr.sbin/bhyve/pci_virtio_net.c
  projects/calloutng/usr.sbin/bhyve/virtio.h
  projects/calloutng/usr.sbin/bsdconfig/Makefile
  projects/calloutng/usr.sbin/crunch/crunchgen/crunchgen.c
  projects/calloutng/usr.sbin/crunch/crunchide/exec_elf32.c
  projects/calloutng/usr.sbin/crunch/examples/really-big.conf
  projects/calloutng/usr.sbin/named/Makefile
  projects/calloutng/usr.sbin/ndp/ndp.c
  projects/calloutng/usr.sbin/pciconf/Makefile
  projects/calloutng/usr.sbin/pciconf/cap.c
  projects/calloutng/usr.sbin/pciconf/pciconf.c
  projects/calloutng/usr.sbin/ppp/arp.c
  projects/calloutng/usr.sbin/pw/pw_user.c
  projects/calloutng/usr.sbin/rarpd/rarpd.c
  projects/calloutng/usr.sbin/sysrc/Makefile
  projects/calloutng/usr.sbin/tcpdrop/tcpdrop.8
  projects/calloutng/usr.sbin/tcpdrop/tcpdrop.c
  projects/calloutng/usr.sbin/timed/timed/acksend.c
  projects/calloutng/usr.sbin/timed/timed/byteorder.c
  projects/calloutng/usr.sbin/timed/timed/candidate.c
  projects/calloutng/usr.sbin/timed/timed/cksum.c
  projects/calloutng/usr.sbin/timed/timed/correct.c
  projects/calloutng/usr.sbin/timed/timed/master.c
  projects/calloutng/usr.sbin/timed/timed/measure.c
  projects/calloutng/usr.sbin/timed/timed/networkdelta.c
  projects/calloutng/usr.sbin/timed/timed/readmsg.c
  projects/calloutng/usr.sbin/timed/timed/slave.c
  projects/calloutng/usr.sbin/timed/timed/timed.c
  projects/calloutng/usr.sbin/timed/timedc/cmds.c
  projects/calloutng/usr.sbin/timed/timedc/timedc.c
Directory Properties:
  projects/calloutng/   (props changed)
  projects/calloutng/cddl/contrib/opensolaris/   (props changed)
  projects/calloutng/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/calloutng/contrib/binutils/   (props changed)
  projects/calloutng/contrib/bmake/   (props changed)
  projects/calloutng/contrib/gcc/   (props changed)
  projects/calloutng/contrib/gdb/   (props changed)
  projects/calloutng/contrib/libarchive/   (props changed)
  projects/calloutng/contrib/libarchive/libarchive/   (props changed)
  projects/calloutng/contrib/libc++/   (props changed)
  projects/calloutng/contrib/libcxxrt/   (props changed)
  projects/calloutng/contrib/libstdc++/   (props changed)
  projects/calloutng/contrib/llvm/   (props changed)
  projects/calloutng/contrib/llvm/tools/clang/   (props changed)
  projects/calloutng/lib/libc/   (props changed)
  projects/calloutng/sbin/   (props changed)
  projects/calloutng/sys/   (props changed)
  projects/calloutng/sys/amd64/vmm/   (props changed)
  projects/calloutng/sys/boot/   (props changed)
  projects/calloutng/sys/cddl/contrib/opensolaris/   (props changed)
  projects/calloutng/sys/conf/   (props changed)
  projects/calloutng/usr.bin/csup/   (props changed)
  projects/calloutng/usr.bin/procstat/   (props changed)
  projects/calloutng/usr.sbin/bhyve/   (props changed)

Modified: projects/calloutng/Makefile.inc1
==============================================================================
--- projects/calloutng/Makefile.inc1	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/Makefile.inc1	Mon Feb 11 19:23:23 2013	(r246685)
@@ -27,6 +27,8 @@
 #	TARGET="machine" to crossbuild world for a different machine type
 #	TARGET_ARCH= may be required when a TARGET supports multiple endians
 #	BUILDENV_SHELL= shell to launch for the buildenv target (def:/bin/sh)
+#	WORLD_FLAGS= additional flags to pass to make(1) during buildworld
+#	KERNEL_FLAGS= additional flags to pass to make(1) during buildkernel
 
 #
 # The intended user-driven targets are:
@@ -185,7 +187,7 @@ OBJTREE=	${MAKEOBJDIRPREFIX}/${TARGET}.$
 .endif
 WORLDTMP=	${OBJTREE}${.CURDIR}/tmp
 # /usr/games added for fortune which depend on strfile
-BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
+BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
 XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
 STRICTTMPPATH=	${BPATH}:${XPATH}
 TMPPATH=	${STRICTTMPPATH}:${PATH}
@@ -245,7 +247,7 @@ BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/i
 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
 		COMPILER_TYPE=${COMPILER_TYPE}
 BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
-		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
+		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
@@ -255,7 +257,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
-		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
+		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
@@ -288,7 +290,7 @@ WMAKE_COMPILER_TYPE=	gcc
 WMAKE_COMPILER_TYPE=	clang
 .endif
 WMAKEENV+=	COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
-WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
+WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 # 32 bit world
@@ -378,7 +380,7 @@ IMAKE_MTREE=	MTREE_CMD="nmtree ${MTREEFL
 
 # kernel stage
 KMAKEENV=	${WMAKEENV}
-KMAKE=		${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME}
+KMAKE=		${KMAKEENV} ${MAKE} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME}
 
 #
 # buildworld
@@ -412,7 +414,7 @@ _worldtmp:
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
 .endif
 .for _dir in \
-    lib usr legacy/usr
+    lib usr legacy/bin legacy/usr
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
@@ -671,10 +673,14 @@ _install-info=	install-info
 _zoneinfo=	zic tzsetup
 .endif
 
+.if exists(/usr/sbin/nmtree)
+_nmtree_itools=	nmtree
+.endif
+
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
 	date echo egrep find grep id install ${_install-info} \
-	ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
-	test true uname wc ${_zoneinfo}
+	ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \
+	rm sed sh sysctl test true uname wc ${_zoneinfo}
 
 #
 # distributeworld
@@ -964,7 +970,7 @@ reinstallkernel reinstallkernel.debug: i
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${CROSSENV} PATH=${TMPPATH} \
-	    ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
+	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
 
 distributekernel distributekernel.debug:
 .if empty(INSTALLKERNEL)
@@ -1134,6 +1140,10 @@ _nmtree=	lib/libnetbsd \
 		usr.sbin/nmtree
 .endif
 
+.if ${BOOTSTRAPPING} < 1000027
+_cat=		bin/cat
+.endif
+
 .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
 _awk=		usr.bin/awk
 .endif
@@ -1189,6 +1199,7 @@ bootstrap-tools:
     ${_ar} \
     ${_dtc} \
     ${_awk} \
+    ${_cat} \
     usr.bin/lorder \
     usr.bin/makewhatis \
     ${_mklocale} \
@@ -1724,7 +1735,8 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOU
 
 XDDIR=${XDEV_ARCH}-freebsd
 XDTP=/usr/${XDDIR}
-CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR}
+CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
+	INSTALL="sh ${.CURDIR}/tools/install.sh"
 CDENV= ${CDBENV} \
 	_SHLIBDIRPREFIX=${XDTP} \
 	TOOLS_PREFIX=${XDTP}

Modified: projects/calloutng/ObsoleteFiles.inc
==============================================================================
--- projects/calloutng/ObsoleteFiles.inc	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/ObsoleteFiles.inc	Mon Feb 11 19:23:23 2013	(r246685)
@@ -45,6 +45,10 @@ OLD_DIRS+=usr/share/man/man1aout
 OLD_DIRS+=usr/share/man/cat1aout
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1aout
 OLD_DIRS+=usr/share/man/en.UTF-8/cat1aout
+# 20130110: bsd.compat.mk removed
+OLD_FILES+=usr/share/mk/bsd.compat.mk
+# 20130103: gnats-supfile removed
+OLD_FILES+=usr/share/examples/cvsup/gnats-supfile
 # 20121230: libdisk removed
 OLD_FILES+=usr/share/man/man3/libdisk.3.gz usr/include/libdisk.h
 OLD_FILES+=usr/lib/libdisk.a usr/lib32/libdisk.a

Modified: projects/calloutng/UPDATING
==============================================================================
--- projects/calloutng/UPDATING	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/UPDATING	Mon Feb 11 19:23:23 2013	(r246685)
@@ -26,6 +26,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130129:
+	A BSD-licensed patch(1) variant has been added and is installed
+	as bsdpatch, being the GNU version the default patch.
+	To inverse the logic and use the BSD-licensed one as default,
+	while having the GNU version installed as gnupatch, rebuild
+	and install world with the WITH_BSD_PATCH knob set.
+
 20130118:
 	The install(1) option -M has changed meaning and now takes an
 	argument that is a file or path to append logs to.  In the

Modified: projects/calloutng/bin/cat/cat.1
==============================================================================
--- projects/calloutng/bin/cat/cat.1	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/cat/cat.1	Mon Feb 11 19:23:23 2013	(r246685)
@@ -32,7 +32,7 @@
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
 .\" $FreeBSD$
 .\"
-.Dd March 21, 2004
+.Dd January 29, 2013
 .Dt CAT 1
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nd concatenate and print files
 .Sh SYNOPSIS
 .Nm
-.Op Fl benstuv
+.Op Fl belnstuv
 .Op Ar
 .Sh DESCRIPTION
 The
@@ -79,6 +79,16 @@ Display non-printing characters (see the
 option), and display a dollar sign
 .Pq Ql \&$
 at the end of each line.
+.It Fl l
+Set an exclusive advisory lock on the standard output file descriptor.
+This lock is set using
+.Xr fcntl 2
+with the
+.Dv F_SETLKW
+command.
+If the output file is already locked,
+.Nm
+will block until the lock is acquired.
 .It Fl n
 Number the output lines, starting at 1.
 .It Fl s
@@ -160,6 +170,7 @@ operand.
 .Xr tail 1 ,
 .Xr vis 1 ,
 .Xr zcat 1 ,
+.Xr fcntl 2 ,
 .Xr setbuf 3
 .Rs
 .%A Rob Pike
@@ -175,7 +186,7 @@ utility is compliant with the
 specification.
 .Pp
 The flags
-.Op Fl benstv
+.Op Fl belnstv
 are extensions to the specification.
 .Sh HISTORY
 A

Modified: projects/calloutng/bin/cat/cat.c
==============================================================================
--- projects/calloutng/bin/cat/cat.c	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/cat/cat.c	Mon Feb 11 19:23:23 2013	(r246685)
@@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-static int bflag, eflag, nflag, sflag, tflag, vflag;
+static int bflag, eflag, lflag, nflag, sflag, tflag, vflag;
 static int rval;
 static const char *filename;
 
@@ -96,10 +96,11 @@ int
 main(int argc, char *argv[])
 {
 	int ch;
+	struct flock stdout_lock;
 
 	setlocale(LC_CTYPE, "");
 
-	while ((ch = getopt(argc, argv, "benstuv")) != -1)
+	while ((ch = getopt(argc, argv, "belnstuv")) != -1)
 		switch (ch) {
 		case 'b':
 			bflag = nflag = 1;	/* -b implies -n */
@@ -107,6 +108,9 @@ main(int argc, char *argv[])
 		case 'e':
 			eflag = vflag = 1;	/* -e implies -v */
 			break;
+		case 'l':
+			lflag = 1;
+			break;
 		case 'n':
 			nflag = 1;
 			break;
@@ -127,6 +131,15 @@ main(int argc, char *argv[])
 		}
 	argv += optind;
 
+	if (lflag) {
+		stdout_lock.l_len = 0;
+		stdout_lock.l_start = 0;
+		stdout_lock.l_type = F_WRLCK;
+		stdout_lock.l_whence = SEEK_SET;
+		if (fcntl(STDOUT_FILENO, F_SETLKW, &stdout_lock) == -1)
+			err(EXIT_FAILURE, "stdout");
+	}
+
 	if (bflag || eflag || nflag || sflag || tflag || vflag)
 		scanfiles(argv, 1);
 	else
@@ -140,7 +153,7 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
-	fprintf(stderr, "usage: cat [-benstuv] [file ...]\n");
+	fprintf(stderr, "usage: cat [-belnstuv] [file ...]\n");
 	exit(1);
 	/* NOTREACHED */
 }

Modified: projects/calloutng/bin/ps/ps.1
==============================================================================
--- projects/calloutng/bin/ps/ps.1	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/ps/ps.1	Mon Feb 11 19:23:23 2013	(r246685)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd September 18, 2012
+.Dd February 7, 2013
 .Dt PS 1
 .Os
 .Sh NAME
@@ -323,6 +323,7 @@ the include file
 .It Dv "P_INMEM" Ta No "0x10000000" Ta "Loaded into memory"
 .It Dv "P_SWAPPINGOUT" Ta No "0x20000000" Ta "Process is being swapped out"
 .It Dv "P_SWAPPINGIN" Ta No "0x40000000" Ta "Process is being swapped in"
+.It Dv "P_PPTRACE" Ta No "0x80000000" Ta "Vforked child issued ptrace(PT_TRACEME)"
 .El
 .It Cm label
 The MAC label of the process.

Modified: projects/calloutng/bin/setfacl/setfacl.1
==============================================================================
--- projects/calloutng/bin/setfacl/setfacl.1	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/setfacl/setfacl.1	Mon Feb 11 19:23:23 2013	(r246685)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 2, 2012
+.Dd February 8, 2013
 .Dt SETFACL 1
 .Os
 .Sh NAME
@@ -91,10 +91,16 @@ An error will be reported if any of
 the specified files cannot have a default entry (i.e.\&
 non-directories).  This option is not applicable to NFSv4 ACLs.
 .It Fl m Ar entries
-Modify the ACL entries on the specified files by adding new
-entries and modifying existing ACL entries with the ACL entries
-specified in
-.Ar entries .
+Modify the ACL on the specified file.
+New entries will be added, and existing entries will be modified
+according to the
+.Ar entries
+argument.
+For NFSv4 ACLs, it is recommended to use the
+.Fl a
+and
+.Fl x
+options instead.
 .It Fl M Ar file
 Modify the ACL entries on the specified files by adding new
 ACL entries and modifying existing ACL entries with the ACL
@@ -319,9 +325,9 @@ write_data
 execute
 .It p
 append_data
-.It d
-delete_child
 .It D
+delete_child
+.It d
 delete
 .It a
 read_attributes

Modified: projects/calloutng/bin/sh/eval.c
==============================================================================
--- projects/calloutng/bin/sh/eval.c	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/sh/eval.c	Mon Feb 11 19:23:23 2013	(r246685)
@@ -92,6 +92,7 @@ static void evalfor(union node *, int);
 static union node *evalcase(union node *);
 static void evalsubshell(union node *, int);
 static void evalredir(union node *, int);
+static void exphere(union node *, struct arglist *);
 static void expredir(union node *);
 static void evalpipe(union node *);
 static int is_valid_fast_cmdsubst(union node *n);
@@ -488,6 +489,37 @@ evalredir(union node *n, int flags)
 }
 
 
+static void
+exphere(union node *redir, struct arglist *fn)
+{
+	struct jmploc jmploc;
+	struct jmploc *savehandler;
+	struct localvar *savelocalvars;
+	int need_longjmp = 0;
+
+	redir->nhere.expdoc = nullstr;
+	savelocalvars = localvars;
+	localvars = NULL;
+	forcelocal++;
+	savehandler = handler;
+	if (setjmp(jmploc.loc))
+		need_longjmp = exception != EXERROR && exception != EXEXEC;
+	else {
+		handler = &jmploc;
+		expandarg(redir->nhere.doc, fn, 0);
+		redir->nhere.expdoc = fn->list->text;
+		INTOFF;
+	}
+	handler = savehandler;
+	forcelocal--;
+	poplocalvars();
+	localvars = savelocalvars;
+	if (need_longjmp)
+		longjmp(handler->loc, 1);
+	INTON;
+}
+
+
 /*
  * Compute the names of the files in a redirection list.
  */
@@ -516,6 +548,9 @@ expredir(union node *n)
 				fixredir(redir, fn.list->text, 1);
 			}
 			break;
+		case NXHERE:
+			exphere(redir, &fn);
+			break;
 		}
 	}
 }

Modified: projects/calloutng/bin/sh/expand.c
==============================================================================
--- projects/calloutng/bin/sh/expand.c	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/sh/expand.c	Mon Feb 11 19:23:23 2013	(r246685)
@@ -127,19 +127,6 @@ collate_range_cmp(wchar_t c1, wchar_t c2
 	return (wcscoll(s1, s2));
 }
 
-/*
- * Expand shell variables and backquotes inside a here document.
- *	union node *arg		the document
- *	int fd;			where to write the expanded version
- */
-
-void
-expandhere(union node *arg, int fd)
-{
-	expandarg(arg, (struct arglist *)NULL, 0);
-	xwrite(fd, stackblock(), expdest - stackblock());
-}
-
 static char *
 stputs_quotes(const char *data, const char *syntax, char *p)
 {

Modified: projects/calloutng/bin/sh/expand.h
==============================================================================
--- projects/calloutng/bin/sh/expand.h	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/sh/expand.h	Mon Feb 11 19:23:23 2013	(r246685)
@@ -57,7 +57,6 @@ struct arglist {
 
 
 union node;
-void expandhere(union node *, int);
 void expandarg(union node *, struct arglist *, int);
 void expari(int);
 void rmescapes(char *);

Modified: projects/calloutng/bin/sh/jobs.c
==============================================================================
--- projects/calloutng/bin/sh/jobs.c	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/sh/jobs.c	Mon Feb 11 19:23:23 2013	(r246685)
@@ -1030,7 +1030,7 @@ dowait(int mode, struct job *job)
 	int wflags;
 	int restore_sigchld;
 
-	TRACE(("dowait(%d) called\n", block));
+	TRACE(("dowait(%d, %p) called\n", mode, job));
 	restore_sigchld = 0;
 	if ((mode & DOWAIT_SIG) != 0) {
 		sigfillset(&mask);
@@ -1298,6 +1298,10 @@ until:
 		cmdputs(n->narg.text);
 		cmdputs("() ...");
 		break;
+	case NNOT:
+		cmdputs("! ");
+		cmdtxt(n->nnot.com);
+		break;
 	case NCMD:
 		for (np = n->ncmd.args ; np ; np = np->narg.next) {
 			cmdtxt(np);

Modified: projects/calloutng/bin/sh/miscbltin.c
==============================================================================
--- projects/calloutng/bin/sh/miscbltin.c	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/sh/miscbltin.c	Mon Feb 11 19:23:23 2013	(r246685)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <unistd.h>
-#include <ctype.h>
 #include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -60,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #include "memalloc.h"
 #include "error.h"
 #include "mystring.h"
+#include "syntax.h"
 
 #undef eflag
 
@@ -307,7 +307,7 @@ umaskcmd(int argc __unused, char **argv 
 			out1fmt("%.4o\n", mask);
 		}
 	} else {
-		if (isdigit(*ap)) {
+		if (is_digit(*ap)) {
 			mask = 0;
 			do {
 				if (*ap >= '8' || *ap < '0')

Modified: projects/calloutng/bin/sh/mksyntax.c
==============================================================================
--- projects/calloutng/bin/sh/mksyntax.c	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/sh/mksyntax.c	Mon Feb 11 19:23:23 2013	(r246685)
@@ -103,29 +103,19 @@ static char writer[] = "\
 
 static FILE *cfile;
 static FILE *hfile;
-static const char *syntax[513];
-static int base;
-static int size;	/* number of values which a char variable can have */
-static int nbits;	/* number of bits in a character */
-static int digit_contig;/* true if digits are contiguous */
 
-static void filltable(const char *);
-static void init(void);
+static void add_default(void);
+static void finish(void);
+static void init(const char *);
 static void add(const char *, const char *);
-static void print(const char *);
 static void output_type_macros(void);
-static void digit_convert(void);
 
 int
 main(int argc __unused, char **argv __unused)
 {
-	char c;
-	char d;
-	int sign;
 	int i;
 	char buf[80];
 	int pos;
-	static char digit[] = "0123456789";
 
 	/* Create output files */
 	if ((cfile = fopen("syntax.c", "w")) == NULL) {
@@ -139,33 +129,8 @@ main(int argc __unused, char **argv __un
 	fputs(writer, hfile);
 	fputs(writer, cfile);
 
-	/* Determine the characteristics of chars. */
-	c = -1;
-	sign = (c > 0) ? 0 : 1;
-	for (nbits = 1 ; ; nbits++) {
-		d = (1 << nbits) - 1;
-		if (d == c)
-			break;
-	}
-#if 0
-	printf("%s %d bit chars\n", sign? "signed" : "unsigned", nbits);
-#endif
-	if (nbits > 9) {
-		fputs("Characters can't have more than 9 bits\n", stderr);
-		exit(2);
-	}
-	size = (1 << nbits) + 1;
-	base = 1;
-	if (sign)
-		base += 1 << (nbits - 1);
-	digit_contig = 1;
-	for (i = 0 ; i < 10 ; i++) {
-		if (digit[i] != '0' + i)
-			digit_contig = 0;
-	}
-
 	fputs("#include <sys/cdefs.h>\n", hfile);
-	fputs("#include <ctype.h>\n", hfile);
+	fputs("#include <limits.h>\n\n", hfile);
 
 	/* Generate the #define statements in the header file */
 	fputs("/* Syntax classes */\n", hfile);
@@ -186,8 +151,8 @@ main(int argc __unused, char **argv __un
 		fprintf(hfile, "/* %s */\n", is_entry[i].comment);
 	}
 	putc('\n', hfile);
-	fprintf(hfile, "#define SYNBASE %d\n", base);
-	fprintf(hfile, "#define PEOF %d\n\n", -base);
+	fputs("#define SYNBASE (1 - CHAR_MIN)\n", hfile);
+	fputs("#define PEOF -SYNBASE\n\n", hfile);
 	putc('\n', hfile);
 	fputs("#define BASESYNTAX (basesyntax + SYNBASE)\n", hfile);
 	fputs("#define DQSYNTAX (dqsyntax + SYNBASE)\n", hfile);
@@ -198,10 +163,13 @@ main(int argc __unused, char **argv __un
 	putc('\n', hfile);
 
 	/* Generate the syntax tables. */
+	fputs("#include \"parser.h\"\n", cfile);
 	fputs("#include \"shell.h\"\n", cfile);
 	fputs("#include \"syntax.h\"\n\n", cfile);
-	init();
+
 	fputs("/* syntax table used when not in quotes */\n", cfile);
+	init("basesyntax");
+	add_default();
 	add("\n", "CNL");
 	add("\\", "CBACK");
 	add("'", "CSQUOTE");
@@ -210,9 +178,11 @@ main(int argc __unused, char **argv __un
 	add("$", "CVAR");
 	add("}", "CENDVAR");
 	add("<>();&| \t", "CSPCL");
-	print("basesyntax");
-	init();
+	finish();
+
 	fputs("\n/* syntax table used when in double quotes */\n", cfile);
+	init("dqsyntax");
+	add_default();
 	add("\n", "CNL");
 	add("\\", "CBACK");
 	add("\"", "CENDQUOTE");
@@ -221,17 +191,21 @@ main(int argc __unused, char **argv __un
 	add("}", "CENDVAR");
 	/* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */
 	add("!*?[]=~:/-^", "CCTL");
-	print("dqsyntax");
-	init();
+	finish();
+
 	fputs("\n/* syntax table used when in single quotes */\n", cfile);
+	init("sqsyntax");
+	add_default();
 	add("\n", "CNL");
 	add("\\", "CSBACK");
 	add("'", "CENDQUOTE");
 	/* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */
 	add("!*?[]=~:/-^", "CCTL");
-	print("sqsyntax");
-	init();
+	finish();
+
 	fputs("\n/* syntax table used when in arithmetic */\n", cfile);
+	init("arisyntax");
+	add_default();
 	add("\n", "CNL");
 	add("\\", "CBACK");
 	add("`", "CBQUOTE");
@@ -240,114 +214,108 @@ main(int argc __unused, char **argv __un
 	add("}", "CENDVAR");
 	add("(", "CLP");
 	add(")", "CRP");
-	print("arisyntax");
-	filltable("0");
+	finish();
+
 	fputs("\n/* character classification table */\n", cfile);
+	init("is_type");
 	add("0123456789", "ISDIGIT");
 	add("abcdefghijklmnopqrstuvwxyz", "ISLOWER");
 	add("ABCDEFGHIJKLMNOPQRSTUVWXYZ", "ISUPPER");
 	add("_", "ISUNDER");
 	add("#?$!-*@", "ISSPECL");
-	print("is_type");
-	if (! digit_contig)
-		digit_convert();
+	finish();
+
 	exit(0);
 }
 
 
-
 /*
- * Clear the syntax table.
+ * Output the header and declaration of a syntax table.
  */
 
 static void
-filltable(const char *dftval)
+init(const char *name)
 {
-	int i;
+	fprintf(hfile, "extern const char %s[];\n", name);
+	fprintf(cfile, "const char %s[SYNBASE + CHAR_MAX + 1] = {\n", name);
+}
+
 
-	for (i = 0 ; i < size ; i++)
-		syntax[i] = dftval;
+static void
+add_one(const char *key, const char *type)
+{
+	fprintf(cfile, "\t[SYNBASE + %s] = %s,\n", key, type);
 }
 
 
 /*
- * Initialize the syntax table with default values.
+ * Add default values to the syntax table.
  */
 
 static void
-init(void)
+add_default(void)
 {
-	filltable("CWORD");
-	syntax[0] = "CEOF";
-	syntax[base + CTLESC] = "CCTL";
-	syntax[base + CTLVAR] = "CCTL";
-	syntax[base + CTLENDVAR] = "CCTL";
-	syntax[base + CTLBACKQ] = "CCTL";
-	syntax[base + CTLBACKQ + CTLQUOTE] = "CCTL";
-	syntax[base + CTLARI] = "CCTL";
-	syntax[base + CTLENDARI] = "CCTL";
-	syntax[base + CTLQUOTEMARK] = "CCTL";
-	syntax[base + CTLQUOTEEND] = "CCTL";
+	add_one("PEOF",                "CEOF");
+	add_one("CTLESC",              "CCTL");
+	add_one("CTLVAR",              "CCTL");
+	add_one("CTLENDVAR",           "CCTL");
+	add_one("CTLBACKQ",            "CCTL");
+	add_one("CTLBACKQ + CTLQUOTE", "CCTL");
+	add_one("CTLARI",              "CCTL");
+	add_one("CTLENDARI",           "CCTL");
+	add_one("CTLQUOTEMARK",        "CCTL");
+	add_one("CTLQUOTEEND",         "CCTL");
 }
 
 
 /*
- * Add entries to the syntax table.
+ * Output the footer of a syntax table.
  */
 
 static void
-add(const char *p, const char *type)
+finish(void)
 {
-	while (*p)
-		syntax[*p++ + base] = type;
+	fputs("};\n", cfile);
 }
 
 
-
 /*
- * Output the syntax table.
+ * Add entries to the syntax table.
  */
 
 static void
-print(const char *name)
+add(const char *p, const char *type)
 {
-	int i;
-	int col;
-
-	fprintf(hfile, "extern const char %s[];\n", name);
-	fprintf(cfile, "const char %s[%d] = {\n", name, size);
-	col = 0;
-	for (i = 0 ; i < size ; i++) {
-		if (i == 0) {
-			fputs("      ", cfile);
-		} else if ((i & 03) == 0) {
-			fputs(",\n      ", cfile);
-			col = 0;
-		} else {
-			putc(',', cfile);
-			while (++col < 9 * (i & 03))
-				putc(' ', cfile);
+	for (; *p; ++p) {
+		char c = *p;
+		switch (c) {
+		case '\t': c = 't';  break;
+		case '\n': c = 'n';  break;
+		case '\'': c = '\''; break;
+		case '\\': c = '\\'; break;
+
+		default:
+			fprintf(cfile, "\t[SYNBASE + '%c'] = %s,\n", c, type);
+			continue;
 		}
-		fputs(syntax[i], cfile);
-		col += strlen(syntax[i]);
+		fprintf(cfile, "\t[SYNBASE + '\\%c'] = %s,\n", c, type);
 	}
-	fputs("\n};\n", cfile);
 }
 
 
-
 /*
  * Output character classification macros (e.g. is_digit).  If digits are
  * contiguous, we can test for them quickly.
  */
 
 static const char *macro[] = {
-	"#define is_digit(c)\t((is_type+SYNBASE)[(int)c] & ISDIGIT)",
+	"#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)",
 	"#define is_eof(c)\t((c) == PEOF)",
 	"#define is_alpha(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))",
 	"#define is_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))",
 	"#define is_in_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))",
 	"#define is_special(c)\t((is_type+SYNBASE)[(int)c] & (ISSPECL|ISDIGIT))",
+	"#define digit_val(c)\t((c) - '0')",
 	NULL
 };
 
@@ -356,41 +324,6 @@ output_type_macros(void)
 {
 	const char **pp;
 
-	if (digit_contig)
-		macro[0] = "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)";
 	for (pp = macro ; *pp ; pp++)
 		fprintf(hfile, "%s\n", *pp);
-	if (digit_contig)
-		fputs("#define digit_val(c)\t((c) - '0')\n", hfile);
-	else
-		fputs("#define digit_val(c)\t(digit_value[c])\n", hfile);
-}
-
-
-
-/*
- * Output digit conversion table (if digits are not contiguous).
- */
-
-static void
-digit_convert(void)
-{
-	int maxdigit;
-	static char digit[] = "0123456789";
-	char *p;
-	int i;
-
-	maxdigit = 0;
-	for (p = digit ; *p ; p++)
-		if (*p > maxdigit)
-			maxdigit = *p;
-	fputs("extern const char digit_value[];\n", hfile);
-	fputs("\n\nconst char digit_value[] = {\n", cfile);
-	for (i = 0 ; i <= maxdigit ; i++) {
-		for (p = digit ; *p && *p != i ; p++);
-		if (*p == '\0')
-			p = digit;
-		fprintf(cfile, "      %d,\n", (int)(p - digit));
-	}
-	fputs("};\n", cfile);
 }

Modified: projects/calloutng/bin/sh/nodetypes
==============================================================================
--- projects/calloutng/bin/sh/nodetypes	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/sh/nodetypes	Mon Feb 11 19:23:23 2013	(r246685)
@@ -138,6 +138,7 @@ NXHERE nhere			# fd<<!
 	next	  nodeptr		# next redirection in list
 	fd	  int			# file descriptor being redirected
 	doc	  nodeptr		# input to command (NARG node)
+	expdoc    temp	char *expdoc	# actual document (for NXHERE)
 
 NNOT nnot			# ! command  (actually pipeline)
 	type	int

Modified: projects/calloutng/bin/sh/parser.h
==============================================================================
--- projects/calloutng/bin/sh/parser.h	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/sh/parser.h	Mon Feb 11 19:23:23 2013	(r246685)
@@ -39,7 +39,7 @@
 #define CTLENDVAR '\371'
 #define CTLBACKQ '\372'
 #define CTLQUOTE 01		/* ored with CTLBACKQ code if in quotes */
-/*	CTLBACKQ | CTLQUOTE == '\205' */
+/*	CTLBACKQ | CTLQUOTE == '\373' */
 #define	CTLARI	'\374'
 #define	CTLENDARI '\375'
 #define	CTLQUOTEMARK '\376'

Modified: projects/calloutng/bin/sh/redir.c
==============================================================================
--- projects/calloutng/bin/sh/redir.c	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/bin/sh/redir.c	Mon Feb 11 19:23:23 2013	(r246685)
@@ -251,18 +251,23 @@ movefd:
 static int
 openhere(union node *redir)
 {
+	char *p;
 	int pip[2];
 	int len = 0;
 
 	if (pipe(pip) < 0)
 		error("Pipe call failed: %s", strerror(errno));
-	if (redir->type == NHERE) {
-		len = strlen(redir->nhere.doc->narg.text);
-		if (len <= PIPESIZE) {
-			xwrite(pip[1], redir->nhere.doc->narg.text, len);
-			goto out;
-		}
+
+	if (redir->type == NXHERE)
+		p = redir->nhere.expdoc;
+	else
+		p = redir->nhere.doc->narg.text;
+	len = strlen(p);
+	if (len <= PIPESIZE) {
+		xwrite(pip[1], p, len);
+		goto out;
 	}
+
 	if (forkshell((struct job *)NULL, (union node *)NULL, FORK_NOJOB) == 0) {
 		close(pip[0]);
 		signal(SIGINT, SIG_IGN);
@@ -270,10 +275,7 @@ openhere(union node *redir)
 		signal(SIGHUP, SIG_IGN);
 		signal(SIGTSTP, SIG_IGN);
 		signal(SIGPIPE, SIG_DFL);
-		if (redir->type == NHERE)
-			xwrite(pip[1], redir->nhere.doc->narg.text, len);
-		else
-			expandhere(redir->nhere.doc, pip[1]);
+		xwrite(pip[1], p, len);
 		_exit(0);
 	}
 out:

Modified: projects/calloutng/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/calloutng/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Feb 11 19:23:23 2013	(r246685)
@@ -983,7 +983,7 @@ visit_indirect(spa_t *spa, const dnode_p
 		arc_buf_t *buf;
 		uint64_t fill = 0;
 
-		err = arc_read_nolock(NULL, spa, bp, arc_getbuf_func, &buf,
+		err = arc_read(NULL, spa, bp, arc_getbuf_func, &buf,
 		    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
 		if (err)
 			return (err);
@@ -2001,9 +2001,8 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t *
 	    bp, NULL, NULL, ZIO_FLAG_CANFAIL)), ==, 0);
 }
 
-/* ARGSUSED */
 static int
-zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf,
+zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
     const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
 {
 	zdb_cb_t *zcb = arg;
@@ -2410,7 +2409,7 @@ typedef struct zdb_ddt_entry {
 /* ARGSUSED */
 static int
 zdb_ddt_add_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    arc_buf_t *pbuf, const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
 {
 	avl_tree_t *t = arg;
 	avl_index_t where;

Modified: projects/calloutng/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/calloutng/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Feb 11 18:22:26 2013	(r246684)
+++ projects/calloutng/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Feb 11 19:23:23 2013	(r246685)
@@ -1,5 +1,5 @@
 '\" te
-.\" Copyright (c) 2012, Martin Matuska <mm at FreeBSD.org>.
+.\" Copyright (c) 2013, Martin Matuska <mm at FreeBSD.org>.
 .\" All Rights Reserved.
 .\"
 .\" The contents of this file are subject to the terms of the
@@ -19,15 +19,16 @@
 .\"
 .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright (c) 2012 by Delphix. All rights reserved.
-.\" Copyright (c) 2012 Nexenta Systems, Inc. All Rights Reserved.
 .\" Copyright (c) 2012, Joyent, Inc. All rights reserved.
 .\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd at FreeBSD.org>
 .\" Copyright (c) 2012, Glen Barber <gjb at FreeBSD.org>
 .\" Copyright (c) 2012, Bryan Drewery <bdrewery at FreeBSD.org>
+.\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
+.\" Copyright (c) 2013 Nexenta Systems, Inc. All Rights Reserved.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 26, 2012
+.Dd February 10, 2013
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -39,14 +40,12 @@
 .Nm
 .Cm create
 .Op Fl pu
-.Op Fl o Ar property Ns = Ns Ar value
-.Ar ... filesystem
+.Oo Fl o Ar property Ns = Ns Ar value Oc Ns ... Ar filesystem
 .Nm
 .Cm create
 .Op Fl ps
 .Op Fl b Ar blocksize
-.Op Fl o Ar property Ns = Ns Ar value
-.Ar ...
+.Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
 .Fl V
 .Ar size volume
 .Nm
@@ -59,13 +58,13 @@
 .Sm off
 .Ar snapshot
 .Op % Ns Ar snapname
-.Op , Ns Ar ...
+.Op , Ns ...
 .Sm on
 .Nm
 .Cm snapshot
 .Op Fl r
-.Op Fl o Ar property Ns = Ns Ar value
-.Ar ... filesystem at snapname Ns | Ns Ar volume at snapname
+.Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
+.Ar filesystem at snapname Ns | Ns Ar volume at snapname
 .Nm
 .Cm rollback
 .Op Fl rRf
@@ -73,8 +72,8 @@
 .Nm
 .Cm clone
 .Op Fl p
-.Op Fl o Ar property Ns = Ns Ar value
-.Ar ... snapshot filesystem Ns | Ns Ar volume
+.Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
+.Ar snapshot filesystem Ns | Ns Ar volume
 .Nm
 .Cm promote
 .Ar clone-filesystem
@@ -102,31 +101,29 @@
 .Cm list
 .Op Fl r Ns | Ns Fl d Ar depth
 .Op Fl H
-.Op Fl o Ar property Ns Op , Ns Ar ...
-.Op Fl t Ar type Ns Op , Ns Ar ...
-.Op Fl s Ar property
-.Ar ...
-.Op Fl S Ar property
-.Ar ...
+.Op Fl o Ar property Ns Oo , Ns property Ns Oc Ns ...
+.Op Fl t Ar type Ns Oo , Ns type Ns Oc Ns ...
+.Oo Fl s Ar property Oc Ns ...
+.Oo Fl S Ar property Oc Ns ...
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Nm
 .Cm set
 .Ar property Ns = Ns Ar value
-.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
 .Nm
 .Cm get
 .Op Fl r Ns | Ns Fl d Ar depth
 .Op Fl Hp
-.Op Fl o Ar all | field Ns Op , Ns Ar ...
-.Op Fl t Ar type Ns Op , Ns Ar ...
-.Op Fl s Ar source Ns Op , Ns Ar ...
-.Ar all | property Ns Op , Ns Ar ...

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

More information about the svn-src-projects mailing list