svn commit: r239018 - in projects/calloutng: . bin/cat bin/sh bin/stty cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/include cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma cddl/co...

Davide Italiano davide at FreeBSD.org
Fri Aug 3 16:18:22 UTC 2012 

Author: davide
Date: Fri Aug  3 16:18:20 2012
New Revision: 239018
URL: http://svn.freebsd.org/changeset/base/239018

Log:
  MFC as per r239013.

Added:
  projects/calloutng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/include/
     - copied from r239017, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/include/
  projects/calloutng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh
     - copied unchanged from r239017, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh
  projects/calloutng/contrib/dtc/dtdiff
     - copied unchanged from r239017, head/contrib/dtc/dtdiff
  projects/calloutng/contrib/dtc/fdtdump.c
     - copied unchanged from r239017, head/contrib/dtc/fdtdump.c
  projects/calloutng/contrib/dtc/fdtget.c
     - copied unchanged from r239017, head/contrib/dtc/fdtget.c
  projects/calloutng/contrib/dtc/fdtput.c
     - copied unchanged from r239017, head/contrib/dtc/fdtput.c
  projects/calloutng/contrib/dtc/libfdt/fdt_empty_tree.c
     - copied unchanged from r239017, head/contrib/dtc/libfdt/fdt_empty_tree.c
  projects/calloutng/contrib/libarchive/libarchive/archive_getdate.c
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/archive_getdate.c
  projects/calloutng/contrib/libarchive/libarchive/archive_match.c
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/archive_match.c
  projects/calloutng/contrib/libarchive/libarchive/archive_pathmatch.c
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/archive_pathmatch.c
  projects/calloutng/contrib/libarchive/libarchive/archive_pathmatch.h
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/archive_pathmatch.h
  projects/calloutng/contrib/libarchive/libarchive/archive_write_add_filter.c
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/archive_write_add_filter.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_disk_acl.c
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/archive_write_disk_acl.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_archive_getdate.c
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/test/test_archive_getdate.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_archive_match_owner.c
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/test/test_archive_match_owner.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_archive_match_path.c
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/test/test_archive_match_path.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_archive_match_time.c
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/test/test_archive_match_time.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_archive_pathmatch.c
     - copied unchanged from r239017, head/contrib/libarchive/libarchive/test/test_archive_pathmatch.c
  projects/calloutng/contrib/libarchive/tar/test/test_format_newc.c
     - copied unchanged from r239017, head/contrib/libarchive/tar/test/test_format_newc.c
  projects/calloutng/contrib/libarchive/tar/test/test_option_nodump.c
     - copied unchanged from r239017, head/contrib/libarchive/tar/test/test_option_nodump.c
  projects/calloutng/lib/libc/locale/iswalnum_l.3
     - copied unchanged from r239017, head/lib/libc/locale/iswalnum_l.3
  projects/calloutng/lib/msun/ld128/s_expl.c
     - copied unchanged from r239017, head/lib/msun/ld128/s_expl.c
  projects/calloutng/lib/msun/ld80/s_expl.c
     - copied unchanged from r239017, head/lib/msun/ld80/s_expl.c
  projects/calloutng/share/dtrace/hotopen
     - copied unchanged from r239017, head/share/dtrace/hotopen
  projects/calloutng/share/dtrace/nfsattrstats
     - copied unchanged from r239017, head/share/dtrace/nfsattrstats
  projects/calloutng/share/examples/libusb20/
     - copied from r239017, head/share/examples/libusb20/
  projects/calloutng/share/man/man4/vale.4
     - copied unchanged from r239017, head/share/man/man4/vale.4
  projects/calloutng/sys/arm/at91/at91_pio_sam9g45.h
     - copied unchanged from r239017, head/sys/arm/at91/at91_pio_sam9g45.h
  projects/calloutng/sys/arm/at91/at91sam9g45.c
     - copied unchanged from r239017, head/sys/arm/at91/at91sam9g45.c
  projects/calloutng/sys/arm/at91/at91sam9g45reg.h
     - copied unchanged from r239017, head/sys/arm/at91/at91sam9g45reg.h
  projects/calloutng/sys/arm/at91/at91sam9x5.c
     - copied unchanged from r239017, head/sys/arm/at91/at91sam9x5.c
  projects/calloutng/sys/arm/at91/at91sam9x5reg.h
     - copied unchanged from r239017, head/sys/arm/at91/at91sam9x5reg.h
  projects/calloutng/sys/arm/at91/board_sn9g45.c
     - copied unchanged from r239017, head/sys/arm/at91/board_sn9g45.c
  projects/calloutng/sys/arm/at91/std.at91sam9g45
     - copied unchanged from r239017, head/sys/arm/at91/std.at91sam9g45
  projects/calloutng/sys/arm/at91/std.sn9g45
     - copied unchanged from r239017, head/sys/arm/at91/std.sn9g45
  projects/calloutng/sys/arm/conf/SN9G45
     - copied unchanged from r239017, head/sys/arm/conf/SN9G45
  projects/calloutng/sys/contrib/libfdt/fdt_empty_tree.c
     - copied unchanged from r239017, head/sys/contrib/libfdt/fdt_empty_tree.c
  projects/calloutng/sys/dev/ahci/ahciem.c
     - copied unchanged from r239017, head/sys/dev/ahci/ahciem.c
  projects/calloutng/sys/dev/ath/if_ath_tx_edma.c
     - copied unchanged from r239017, head/sys/dev/ath/if_ath_tx_edma.c
  projects/calloutng/sys/dev/ath/if_ath_tx_edma.h
     - copied unchanged from r239017, head/sys/dev/ath/if_ath_tx_edma.h
  projects/calloutng/tools/tools/ath/athratestats/
     - copied from r239017, head/tools/tools/ath/athratestats/
Deleted:
  projects/calloutng/contrib/dtc/Makefile.convert-dtsv0
  projects/calloutng/contrib/dtc/Makefile.ftdump
  projects/calloutng/contrib/dtc/convert-dtsv0-lexer.l
  projects/calloutng/contrib/dtc/ftdump.c
  projects/calloutng/contrib/libarchive/cpio/test/test_pathmatch.c
  projects/calloutng/contrib/libarchive/libarchive_fe/matching.c
  projects/calloutng/contrib/libarchive/libarchive_fe/matching.h
  projects/calloutng/contrib/libarchive/libarchive_fe/pathmatch.c
  projects/calloutng/contrib/libarchive/libarchive_fe/pathmatch.h
  projects/calloutng/contrib/libarchive/tar/getdate.c
  projects/calloutng/contrib/libarchive/tar/test/test_getdate.c
  projects/calloutng/contrib/libarchive/tar/tree.c
  projects/calloutng/contrib/libarchive/tar/tree.h
  projects/calloutng/sys/arm/at91/at91sam9x25.c
  projects/calloutng/sys/arm/at91/at91sam9x25reg.h
  projects/calloutng/sys/vm/vm_contig.c
Modified:
  projects/calloutng/Makefile.inc1
  projects/calloutng/ObsoleteFiles.inc
  projects/calloutng/UPDATING
  projects/calloutng/bin/cat/cat.c
  projects/calloutng/bin/sh/jobs.c
  projects/calloutng/bin/sh/trap.c
  projects/calloutng/bin/sh/trap.h
  projects/calloutng/bin/stty/extern.h
  projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
  projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c
  projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
  projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.c
  projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.h
  projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
  projects/calloutng/cddl/lib/libzfs/Makefile
  projects/calloutng/contrib/bind9/CHANGES
  projects/calloutng/contrib/bind9/lib/dns/resolver.c
  projects/calloutng/contrib/bind9/lib/dns/zone.c
  projects/calloutng/contrib/bind9/version
  projects/calloutng/contrib/dtc/Documentation/dts-format.txt
  projects/calloutng/contrib/dtc/Documentation/manual.txt
  projects/calloutng/contrib/dtc/Makefile
  projects/calloutng/contrib/dtc/checks.c
  projects/calloutng/contrib/dtc/data.c
  projects/calloutng/contrib/dtc/dtc-lexer.l
  projects/calloutng/contrib/dtc/dtc-parser.y
  projects/calloutng/contrib/dtc/dtc.c
  projects/calloutng/contrib/dtc/dtc.h
  projects/calloutng/contrib/dtc/flattree.c
  projects/calloutng/contrib/dtc/fstree.c
  projects/calloutng/contrib/dtc/libfdt/Makefile.libfdt
  projects/calloutng/contrib/dtc/libfdt/fdt.c
  projects/calloutng/contrib/dtc/libfdt/fdt_ro.c
  projects/calloutng/contrib/dtc/libfdt/fdt_rw.c
  projects/calloutng/contrib/dtc/libfdt/libfdt.h
  projects/calloutng/contrib/dtc/libfdt/libfdt_env.h
  projects/calloutng/contrib/dtc/libfdt/libfdt_internal.h
  projects/calloutng/contrib/dtc/livetree.c
  projects/calloutng/contrib/dtc/srcpos.c
  projects/calloutng/contrib/dtc/srcpos.h
  projects/calloutng/contrib/dtc/treesource.c
  projects/calloutng/contrib/dtc/util.c
  projects/calloutng/contrib/dtc/util.h
  projects/calloutng/contrib/groff/tmac/doc-common
  projects/calloutng/contrib/groff/tmac/doc-syms
  projects/calloutng/contrib/groff/tmac/doc.tmac
  projects/calloutng/contrib/groff/tmac/groff_mdoc.man
  projects/calloutng/contrib/less/NEWS
  projects/calloutng/contrib/less/README
  projects/calloutng/contrib/less/brac.c
  projects/calloutng/contrib/less/ch.c
  projects/calloutng/contrib/less/charset.c
  projects/calloutng/contrib/less/charset.h
  projects/calloutng/contrib/less/cmd.h
  projects/calloutng/contrib/less/cmdbuf.c
  projects/calloutng/contrib/less/command.c
  projects/calloutng/contrib/less/cvt.c
  projects/calloutng/contrib/less/decode.c
  projects/calloutng/contrib/less/defines.ds
  projects/calloutng/contrib/less/defines.o2
  projects/calloutng/contrib/less/defines.o9
  projects/calloutng/contrib/less/defines.wn
  projects/calloutng/contrib/less/edit.c
  projects/calloutng/contrib/less/filename.c
  projects/calloutng/contrib/less/forwback.c
  projects/calloutng/contrib/less/funcs.h
  projects/calloutng/contrib/less/help.c
  projects/calloutng/contrib/less/ifile.c
  projects/calloutng/contrib/less/input.c
  projects/calloutng/contrib/less/jump.c
  projects/calloutng/contrib/less/less.h
  projects/calloutng/contrib/less/less.hlp
  projects/calloutng/contrib/less/less.man
  projects/calloutng/contrib/less/less.nro
  projects/calloutng/contrib/less/lessecho.c
  projects/calloutng/contrib/less/lessecho.man
  projects/calloutng/contrib/less/lessecho.nro
  projects/calloutng/contrib/less/lesskey.c
  projects/calloutng/contrib/less/lesskey.h
  projects/calloutng/contrib/less/lesskey.man
  projects/calloutng/contrib/less/lesskey.nro
  projects/calloutng/contrib/less/lglob.h
  projects/calloutng/contrib/less/line.c
  projects/calloutng/contrib/less/linenum.c
  projects/calloutng/contrib/less/lsystem.c
  projects/calloutng/contrib/less/main.c
  projects/calloutng/contrib/less/mark.c
  projects/calloutng/contrib/less/mkhelp.c
  projects/calloutng/contrib/less/optfunc.c
  projects/calloutng/contrib/less/option.c
  projects/calloutng/contrib/less/option.h
  projects/calloutng/contrib/less/opttbl.c
  projects/calloutng/contrib/less/os.c
  projects/calloutng/contrib/less/output.c
  projects/calloutng/contrib/less/pattern.c
  projects/calloutng/contrib/less/pattern.h
  projects/calloutng/contrib/less/pckeys.h
  projects/calloutng/contrib/less/position.c
  projects/calloutng/contrib/less/position.h
  projects/calloutng/contrib/less/prompt.c
  projects/calloutng/contrib/less/screen.c
  projects/calloutng/contrib/less/scrsize.c
  projects/calloutng/contrib/less/search.c
  projects/calloutng/contrib/less/signal.c
  projects/calloutng/contrib/less/tags.c
  projects/calloutng/contrib/less/ttyin.c
  projects/calloutng/contrib/less/version.c
  projects/calloutng/contrib/libarchive/FREEBSD-Xlist   (contents, props changed)
  projects/calloutng/contrib/libarchive/FREEBSD-upgrade
  projects/calloutng/contrib/libarchive/NEWS
  projects/calloutng/contrib/libarchive/README
  projects/calloutng/contrib/libarchive/cpio/bsdcpio.1
  projects/calloutng/contrib/libarchive/cpio/cmdline.c
  projects/calloutng/contrib/libarchive/cpio/cpio.c
  projects/calloutng/contrib/libarchive/cpio/cpio.h
  projects/calloutng/contrib/libarchive/cpio/test/main.c
  projects/calloutng/contrib/libarchive/cpio/test/test.h
  projects/calloutng/contrib/libarchive/libarchive/archive.h
  projects/calloutng/contrib/libarchive/libarchive/archive_acl.c
  projects/calloutng/contrib/libarchive/libarchive/archive_check_magic.c
  projects/calloutng/contrib/libarchive/libarchive/archive_endian.h
  projects/calloutng/contrib/libarchive/libarchive/archive_entry.3
  projects/calloutng/contrib/libarchive/libarchive/archive_entry.c
  projects/calloutng/contrib/libarchive/libarchive/archive_entry.h
  projects/calloutng/contrib/libarchive/libarchive/archive_entry_acl.3
  projects/calloutng/contrib/libarchive/libarchive/archive_entry_link_resolver.c
  projects/calloutng/contrib/libarchive/libarchive/archive_entry_linkify.3
  projects/calloutng/contrib/libarchive/libarchive/archive_entry_paths.3
  projects/calloutng/contrib/libarchive/libarchive/archive_entry_perms.3
  projects/calloutng/contrib/libarchive/libarchive/archive_entry_stat.3
  projects/calloutng/contrib/libarchive/libarchive/archive_entry_stat.c
  projects/calloutng/contrib/libarchive/libarchive/archive_entry_time.3
  projects/calloutng/contrib/libarchive/libarchive/archive_ppmd7.c
  projects/calloutng/contrib/libarchive/libarchive/archive_private.h
  projects/calloutng/contrib/libarchive/libarchive/archive_read.3
  projects/calloutng/contrib/libarchive/libarchive/archive_read.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_data.3
  projects/calloutng/contrib/libarchive/libarchive/archive_read_disk.3
  projects/calloutng/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_disk_posix.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_disk_private.h
  projects/calloutng/contrib/libarchive/libarchive/archive_read_extract.3
  projects/calloutng/contrib/libarchive/libarchive/archive_read_filter.3
  projects/calloutng/contrib/libarchive/libarchive/archive_read_format.3
  projects/calloutng/contrib/libarchive/libarchive/archive_read_free.3
  projects/calloutng/contrib/libarchive/libarchive/archive_read_header.3
  projects/calloutng/contrib/libarchive/libarchive/archive_read_new.3
  projects/calloutng/contrib/libarchive/libarchive/archive_read_open.3
  projects/calloutng/contrib/libarchive/libarchive/archive_read_open_fd.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_open_filename.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_private.h
  projects/calloutng/contrib/libarchive/libarchive/archive_read_set_options.3
  projects/calloutng/contrib/libarchive/libarchive/archive_read_support_filter_rpm.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_support_format_7zip.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_support_format_cab.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_support_format_cpio.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_support_format_lha.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_support_format_mtree.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_support_format_rar.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_support_format_tar.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_support_format_xar.c
  projects/calloutng/contrib/libarchive/libarchive/archive_read_support_format_zip.c
  projects/calloutng/contrib/libarchive/libarchive/archive_string.c
  projects/calloutng/contrib/libarchive/libarchive/archive_string.h
  projects/calloutng/contrib/libarchive/libarchive/archive_string_composition.h
  projects/calloutng/contrib/libarchive/libarchive/archive_string_sprintf.c
  projects/calloutng/contrib/libarchive/libarchive/archive_util.3
  projects/calloutng/contrib/libarchive/libarchive/archive_util.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write.3
  projects/calloutng/contrib/libarchive/libarchive/archive_write.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_add_filter_bzip2.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_add_filter_compress.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_add_filter_gzip.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_add_filter_program.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_add_filter_xz.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_blocksize.3
  projects/calloutng/contrib/libarchive/libarchive/archive_write_data.3
  projects/calloutng/contrib/libarchive/libarchive/archive_write_disk.3
  projects/calloutng/contrib/libarchive/libarchive/archive_write_disk_posix.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_disk_private.h
  projects/calloutng/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_filter.3
  projects/calloutng/contrib/libarchive/libarchive/archive_write_finish_entry.3
  projects/calloutng/contrib/libarchive/libarchive/archive_write_format.3
  projects/calloutng/contrib/libarchive/libarchive/archive_write_free.3
  projects/calloutng/contrib/libarchive/libarchive/archive_write_header.3
  projects/calloutng/contrib/libarchive/libarchive/archive_write_new.3
  projects/calloutng/contrib/libarchive/libarchive/archive_write_open.3
  projects/calloutng/contrib/libarchive/libarchive/archive_write_open_filename.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_private.h
  projects/calloutng/contrib/libarchive/libarchive/archive_write_set_format_7zip.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_set_format_ar.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_set_format_cpio.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_set_format_gnutar.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_set_format_mtree.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_set_format_pax.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_set_format_ustar.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_set_format_xar.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_set_format_zip.c
  projects/calloutng/contrib/libarchive/libarchive/archive_write_set_options.3
  projects/calloutng/contrib/libarchive/libarchive/cpio.5
  projects/calloutng/contrib/libarchive/libarchive/libarchive-formats.5
  projects/calloutng/contrib/libarchive/libarchive/libarchive.3
  projects/calloutng/contrib/libarchive/libarchive/libarchive_changes.3
  projects/calloutng/contrib/libarchive/libarchive/libarchive_internals.3
  projects/calloutng/contrib/libarchive/libarchive/tar.5
  projects/calloutng/contrib/libarchive/libarchive/test/main.c
  projects/calloutng/contrib/libarchive/libarchive/test/read_open_memory.c
  projects/calloutng/contrib/libarchive/libarchive/test/test.h
  projects/calloutng/contrib/libarchive/libarchive/test/test_archive_string_conversion.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_compat_zip.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_read_format_7zip.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_read_format_cab.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_read_format_rar.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_read_format_rar_unicode.rar.uu
  projects/calloutng/contrib/libarchive/libarchive/test/test_read_format_tar_filename.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_read_pax_truncated.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_read_position.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_sparse_basic.c
  projects/calloutng/contrib/libarchive/libarchive/test/test_write_format_zip.c
  projects/calloutng/contrib/libarchive/libarchive_fe/err.c
  projects/calloutng/contrib/libarchive/libarchive_fe/err.h
  projects/calloutng/contrib/libarchive/tar/bsdtar.1
  projects/calloutng/contrib/libarchive/tar/bsdtar.c
  projects/calloutng/contrib/libarchive/tar/bsdtar.h
  projects/calloutng/contrib/libarchive/tar/read.c
  projects/calloutng/contrib/libarchive/tar/test/main.c
  projects/calloutng/contrib/libarchive/tar/test/test.h
  projects/calloutng/contrib/libarchive/tar/test/test_basic.c
  projects/calloutng/contrib/libarchive/tar/write.c
  projects/calloutng/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  projects/calloutng/etc/mtree/BSD.usr.dist
  projects/calloutng/etc/rc.d/bgfsck
  projects/calloutng/etc/rc.d/ip6addrctl
  projects/calloutng/etc/rc.d/jail
  projects/calloutng/games/fortune/datfiles/fortunes
  projects/calloutng/gnu/usr.bin/groff/tmac/Makefile
  projects/calloutng/gnu/usr.bin/groff/tmac/mdoc.local
  projects/calloutng/lib/libarchive/Makefile
  projects/calloutng/lib/libarchive/config_freebsd.h
  projects/calloutng/lib/libarchive/test/Makefile
  projects/calloutng/lib/libc/gen/fts.c
  projects/calloutng/lib/libc/locale/Makefile.inc
  projects/calloutng/lib/libc/locale/isgraph.3
  projects/calloutng/lib/libc/locale/islower.3
  projects/calloutng/lib/libc/locale/ispunct.3
  projects/calloutng/lib/libc/locale/isspace.3
  projects/calloutng/lib/libc/locale/nl_langinfo.3
  projects/calloutng/lib/libc/net/getaddrinfo.c
  projects/calloutng/lib/libc/stdlib/at_quick_exit.3
  projects/calloutng/lib/libc/stdlib/quick_exit.3
  projects/calloutng/lib/libc/string/strerror.3
  projects/calloutng/lib/libc/sys/fcntl.2
  projects/calloutng/lib/libc/sys/fcntl.c
  projects/calloutng/lib/libedit/el.c
  projects/calloutng/lib/libedit/histedit.h
  projects/calloutng/lib/libedit/makelist
  projects/calloutng/lib/libedit/term.c
  projects/calloutng/lib/libedit/tokenizer.c
  projects/calloutng/lib/libelf/Makefile
  projects/calloutng/lib/libthr/thread/thr_getschedparam.c
  projects/calloutng/lib/libthr/thread/thr_info.c
  projects/calloutng/lib/libthr/thread/thr_setprio.c
  projects/calloutng/lib/libthr/thread/thr_setschedparam.c
  projects/calloutng/lib/msun/Makefile
  projects/calloutng/lib/msun/Symbol.map
  projects/calloutng/lib/msun/man/exp.3
  projects/calloutng/lib/msun/src/e_exp.c
  projects/calloutng/lib/msun/src/math.h
  projects/calloutng/lib/msun/src/math_private.h
  projects/calloutng/lib/msun/src/s_cbrtl.c
  projects/calloutng/rescue/rescue/Makefile
  projects/calloutng/sbin/fsck_ffs/suj.c
  projects/calloutng/sbin/geom/class/multipath/geom_multipath.c
  projects/calloutng/sbin/geom/class/multipath/gmultipath.8
  projects/calloutng/sbin/geom/class/sched/gsched.8
  projects/calloutng/sbin/hastd/hast.conf.5
  projects/calloutng/sbin/ipfw/dummynet.c
  projects/calloutng/sbin/ipfw/ipfw.8
  projects/calloutng/sbin/ipfw/ipfw2.c
  projects/calloutng/sbin/ipfw/nat.c
  projects/calloutng/sbin/md5/Makefile
  projects/calloutng/sbin/md5/md5.1
  projects/calloutng/sbin/md5/md5.c
  projects/calloutng/sbin/shutdown/shutdown.c
  projects/calloutng/share/dtrace/Makefile
  projects/calloutng/share/examples/Makefile
  projects/calloutng/share/man/man4/Makefile
  projects/calloutng/share/man/man4/ahci.4
  projects/calloutng/share/man/man4/gpib.4
  projects/calloutng/share/man/man4/netmap.4
  projects/calloutng/share/man/man4/ugen.4
  projects/calloutng/share/man/man4/uplcom.4
  projects/calloutng/share/man/man4/uslcom.4
  projects/calloutng/share/man/man5/moduli.5
  projects/calloutng/share/man/man5/rc.conf.5
  projects/calloutng/share/man/man9/ieee80211_node.9
  projects/calloutng/share/man/man9/kernel_mount.9
  projects/calloutng/share/man/man9/malloc.9
  projects/calloutng/share/misc/bsd-family-tree
  projects/calloutng/share/misc/committers-ports.dot
  projects/calloutng/sys/amd64/amd64/fpu.c
  projects/calloutng/sys/amd64/amd64/machdep.c
  projects/calloutng/sys/amd64/amd64/pmap.c
  projects/calloutng/sys/amd64/amd64/ptrace_machdep.c
  projects/calloutng/sys/amd64/amd64/trap.c
  projects/calloutng/sys/amd64/amd64/vm_machdep.c
  projects/calloutng/sys/amd64/include/cpufunc.h
  projects/calloutng/sys/amd64/include/fpu.h
  projects/calloutng/sys/amd64/include/pcpu.h
  projects/calloutng/sys/arm/arm/nexus.c
  projects/calloutng/sys/arm/at91/at91.c
  projects/calloutng/sys/arm/at91/at91_machdep.c
  projects/calloutng/sys/arm/at91/at91_pmc.c
  projects/calloutng/sys/arm/at91/at91_pmcreg.h
  projects/calloutng/sys/arm/at91/at91_spi.c
  projects/calloutng/sys/arm/at91/board_sam9260ek.c
  projects/calloutng/sys/arm/at91/files.at91
  projects/calloutng/sys/arm/at91/if_ate.c
  projects/calloutng/sys/arm/at91/std.atmel
  projects/calloutng/sys/arm/at91/std.sam9x25ek
  projects/calloutng/sys/arm/at91/uart_bus_at91usart.c
  projects/calloutng/sys/arm/conf/ATMEL
  projects/calloutng/sys/arm/conf/ETHERNUT5
  projects/calloutng/sys/arm/conf/ETHERNUT5.hints
  projects/calloutng/sys/arm/conf/HL201
  projects/calloutng/sys/arm/conf/KB920X
  projects/calloutng/sys/arm/conf/QILA9G20
  projects/calloutng/sys/arm/conf/SAM9260EK
  projects/calloutng/sys/arm/conf/SAM9260EK.hints
  projects/calloutng/sys/arm/conf/SAM9G20EK
  projects/calloutng/sys/arm/conf/SAM9X25EK
  projects/calloutng/sys/arm/econa/econa.c
  projects/calloutng/sys/arm/mv/common.c
  projects/calloutng/sys/arm/mv/gpio.c
  projects/calloutng/sys/arm/mv/ic.c
  projects/calloutng/sys/arm/mv/kirkwood/kirkwood.c
  projects/calloutng/sys/arm/mv/mv_sata.c
  projects/calloutng/sys/arm/mv/mvreg.h
  projects/calloutng/sys/arm/s3c2xx0/s3c24x0.c
  projects/calloutng/sys/arm/xscale/i8134x/i81342.c
  projects/calloutng/sys/arm/xscale/pxa/pxa_obio.c
  projects/calloutng/sys/boot/ficl/Makefile
  projects/calloutng/sys/boot/sparc64/loader/main.c
  projects/calloutng/sys/boot/zfs/Makefile
  projects/calloutng/sys/cam/ata/ata_all.h
  projects/calloutng/sys/cam/ata/ata_xpt.c
  projects/calloutng/sys/cam/cam_ccb.h
  projects/calloutng/sys/cam/cam_periph.c
  projects/calloutng/sys/cam/cam_xpt.c
  projects/calloutng/sys/cam/ctl/scsi_ctl.c
  projects/calloutng/sys/cam/scsi/scsi_all.c
  projects/calloutng/sys/cam/scsi/scsi_cd.c
  projects/calloutng/sys/cam/scsi/scsi_da.c
  projects/calloutng/sys/cam/scsi/scsi_enc.c
  projects/calloutng/sys/cam/scsi/scsi_enc_safte.c
  projects/calloutng/sys/cam/scsi/scsi_enc_ses.c
  projects/calloutng/sys/cam/scsi/scsi_ses.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  projects/calloutng/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  projects/calloutng/sys/cddl/dev/dtrace/i386/dtrace_subr.c
  projects/calloutng/sys/compat/ia32/ia32_sysvec.c
  projects/calloutng/sys/compat/ia32/ia32_util.h
  projects/calloutng/sys/conf/NOTES
  projects/calloutng/sys/conf/files
  projects/calloutng/sys/contrib/libfdt/fdt.c
  projects/calloutng/sys/contrib/libfdt/fdt_ro.c
  projects/calloutng/sys/contrib/libfdt/fdt_rw.c
  projects/calloutng/sys/contrib/libfdt/libfdt.h
  projects/calloutng/sys/contrib/libfdt/libfdt_env.h
  projects/calloutng/sys/contrib/libfdt/libfdt_internal.h
  projects/calloutng/sys/contrib/pf/net/pf_if.c
  projects/calloutng/sys/dev/aac/aac_disk.c
  projects/calloutng/sys/dev/acpica/acpi_cpu.c
  projects/calloutng/sys/dev/ahci/ahci.c
  projects/calloutng/sys/dev/ahci/ahci.h
  projects/calloutng/sys/dev/ata/ata-all.c
  projects/calloutng/sys/dev/ata/ata-lowlevel.c
  projects/calloutng/sys/dev/ath/ath_hal/ah.c
  projects/calloutng/sys/dev/ath/ath_hal/ah.h
  projects/calloutng/sys/dev/ath/ath_hal/ah_desc.h
  projects/calloutng/sys/dev/ath/ath_hal/ah_internal.h
  projects/calloutng/sys/dev/ath/ath_hal/ar5210/ar5210.h
  projects/calloutng/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
  projects/calloutng/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c
  projects/calloutng/sys/dev/ath/ath_hal/ar5211/ar5211.h
  projects/calloutng/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
  projects/calloutng/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c
  projects/calloutng/sys/dev/ath/ath_hal/ar5212/ar5212.h
  projects/calloutng/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
  projects/calloutng/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
  projects/calloutng/sys/dev/ath/ath_hal/ar5416/ar5416.h
  projects/calloutng/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  projects/calloutng/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
  projects/calloutng/sys/dev/ath/ath_rate/amrr/amrr.c
  projects/calloutng/sys/dev/ath/ath_rate/onoe/onoe.c
  projects/calloutng/sys/dev/ath/ath_rate/sample/sample.c
  projects/calloutng/sys/dev/ath/ath_rate/sample/sample.h
  projects/calloutng/sys/dev/ath/if_ath.c
  projects/calloutng/sys/dev/ath/if_ath_ahb.c
  projects/calloutng/sys/dev/ath/if_ath_beacon.c
  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_rx_edma.c
  projects/calloutng/sys/dev/ath/if_ath_sysctl.c
  projects/calloutng/sys/dev/ath/if_ath_tx.c
  projects/calloutng/sys/dev/ath/if_ath_tx.h
  projects/calloutng/sys/dev/ath/if_ath_tx_ht.c
  projects/calloutng/sys/dev/ath/if_athioctl.h
  projects/calloutng/sys/dev/ath/if_athrate.h
  projects/calloutng/sys/dev/ath/if_athvar.h
  projects/calloutng/sys/dev/cesa/cesa.c
  projects/calloutng/sys/dev/e1000/if_igb.c
  projects/calloutng/sys/dev/e1000/if_lem.c
  projects/calloutng/sys/dev/isp/isp.c
  projects/calloutng/sys/dev/isp/isp_freebsd.c
  projects/calloutng/sys/dev/isp/isp_freebsd.h
  projects/calloutng/sys/dev/isp/isp_library.c
  projects/calloutng/sys/dev/isp/isp_library.h
  projects/calloutng/sys/dev/isp/isp_pci.c
  projects/calloutng/sys/dev/isp/isp_sbus.c
  projects/calloutng/sys/dev/isp/isp_stds.h
  projects/calloutng/sys/dev/isp/isp_target.c
  projects/calloutng/sys/dev/isp/isp_target.h
  projects/calloutng/sys/dev/isp/ispmbox.h
  projects/calloutng/sys/dev/isp/ispvar.h
  projects/calloutng/sys/dev/ispfw/asm_2300.h
  projects/calloutng/sys/dev/md/md.c
  projects/calloutng/sys/dev/mge/if_mge.c
  projects/calloutng/sys/dev/mii/e1000phy.c
  projects/calloutng/sys/dev/mlx/mlxvar.h
  projects/calloutng/sys/dev/mps/mps.c
  projects/calloutng/sys/dev/mps/mps_sas.c
  projects/calloutng/sys/dev/mps/mps_sas_lsi.c
  projects/calloutng/sys/dev/mps/mps_table.c
  projects/calloutng/sys/dev/mps/mps_user.c
  projects/calloutng/sys/dev/mps/mpsvar.h
  projects/calloutng/sys/dev/mvs/mvs_soc.c
  projects/calloutng/sys/dev/netmap/if_em_netmap.h
  projects/calloutng/sys/dev/netmap/if_igb_netmap.h
  projects/calloutng/sys/dev/netmap/ixgbe_netmap.h
  projects/calloutng/sys/dev/netmap/netmap.c
  projects/calloutng/sys/dev/netmap/netmap_kern.h
  projects/calloutng/sys/dev/netmap/netmap_mem2.c
  projects/calloutng/sys/dev/pccbb/pccbb_pci.c
  projects/calloutng/sys/dev/puc/puc_cfg.h
  projects/calloutng/sys/dev/puc/pucdata.c
  projects/calloutng/sys/dev/sdhci/sdhci.c
  projects/calloutng/sys/dev/spibus/spi.h
  projects/calloutng/sys/dev/spibus/spibus.c
  projects/calloutng/sys/dev/sym/sym_hipd.c
  projects/calloutng/sys/dev/usb/controller/at91dci_atmelarm.c
  projects/calloutng/sys/dev/usb/controller/ohci_atmelarm.c
  projects/calloutng/sys/dev/usb/controller/xhci_pci.c
  projects/calloutng/sys/dev/usb/controller/xhcireg.h
  projects/calloutng/sys/dev/usb/quirk/usb_quirk.c
  projects/calloutng/sys/dev/usb/serial/u3g.c
  projects/calloutng/sys/dev/usb/serial/uplcom.c
  projects/calloutng/sys/dev/usb/serial/uslcom.c
  projects/calloutng/sys/dev/usb/usbdevs
  projects/calloutng/sys/dev/wtap/if_wtap.c
  projects/calloutng/sys/fs/cd9660/cd9660_vfsops.c
  projects/calloutng/sys/fs/ext2fs/ext2_vfsops.c
  projects/calloutng/sys/fs/fifofs/fifo_vnops.c
  projects/calloutng/sys/fs/msdosfs/msdosfs_lookup.c
  projects/calloutng/sys/fs/portalfs/portal_vnops.c
  projects/calloutng/sys/fs/smbfs/smbfs_node.c
  projects/calloutng/sys/fs/udf/udf_vfsops.c
  projects/calloutng/sys/geom/gate/g_gate.c
  projects/calloutng/sys/geom/geom.h
  projects/calloutng/sys/geom/geom_dev.c
  projects/calloutng/sys/geom/geom_disk.c
  projects/calloutng/sys/geom/geom_disk.h
  projects/calloutng/sys/geom/geom_event.c
  projects/calloutng/sys/geom/geom_io.c
  projects/calloutng/sys/geom/geom_slice.c
  projects/calloutng/sys/geom/geom_subr.c
  projects/calloutng/sys/geom/multipath/g_multipath.c
  projects/calloutng/sys/geom/part/g_part.c
  projects/calloutng/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
  projects/calloutng/sys/i386/i386/machdep.c
  projects/calloutng/sys/i386/i386/pmap.c
  projects/calloutng/sys/i386/i386/ptrace_machdep.c
  projects/calloutng/sys/i386/i386/trap.c
  projects/calloutng/sys/i386/i386/vm86.c
  projects/calloutng/sys/i386/i386/vm_machdep.c
  projects/calloutng/sys/i386/include/cpufunc.h
  projects/calloutng/sys/i386/include/npx.h
  projects/calloutng/sys/i386/include/pcpu.h
  projects/calloutng/sys/i386/isa/npx.c
  projects/calloutng/sys/i386/linux/linux_proto.h
  projects/calloutng/sys/i386/linux/linux_syscall.h
  projects/calloutng/sys/i386/linux/linux_syscalls.c
  projects/calloutng/sys/i386/linux/linux_sysent.c
  projects/calloutng/sys/i386/linux/linux_systrace_args.c
  projects/calloutng/sys/i386/linux/syscalls.master
  projects/calloutng/sys/kern/imgact_aout.c
  projects/calloutng/sys/kern/imgact_elf.c
  projects/calloutng/sys/kern/kern_clocksource.c
  projects/calloutng/sys/kern/kern_descrip.c
  projects/calloutng/sys/kern/kern_ktr.c
  projects/calloutng/sys/kern/kern_malloc.c
  projects/calloutng/sys/kern/kern_proc.c
  projects/calloutng/sys/kern/kern_tc.c
  projects/calloutng/sys/kern/sys_pipe.c
  projects/calloutng/sys/kern/vfs_syscalls.c
  projects/calloutng/sys/kern/vfs_vnops.c
  projects/calloutng/sys/mips/mips/pmap.c
  projects/calloutng/sys/modules/ahci/Makefile
  projects/calloutng/sys/modules/ath/Makefile
  projects/calloutng/sys/modules/cam/Makefile
  projects/calloutng/sys/net/flowtable.c
  projects/calloutng/sys/net/if_llatbl.c
  projects/calloutng/sys/net/if_llatbl.h
  projects/calloutng/sys/net/if_loop.c
  projects/calloutng/sys/net/if_var.h
  projects/calloutng/sys/net80211/ieee80211_hwmp.c
  projects/calloutng/sys/netgraph/ng_ether.c
  projects/calloutng/sys/netgraph/ng_pptpgre.c
  projects/calloutng/sys/netinet/if_ether.c
  projects/calloutng/sys/netinet/in.c
  projects/calloutng/sys/netinet/in_cksum.c
  projects/calloutng/sys/netinet/in_var.h
  projects/calloutng/sys/netinet/ip_carp.c
  projects/calloutng/sys/netinet/ip_output.c
  projects/calloutng/sys/netinet/ipfw/ip_dummynet.c
  projects/calloutng/sys/netinet/ipfw/ip_fw2.c
  projects/calloutng/sys/netinet/ipfw/ip_fw_dynamic.c
  projects/calloutng/sys/netinet/ipfw/ip_fw_log.c
  projects/calloutng/sys/netinet/sctp_asconf.c
  projects/calloutng/sys/netinet/sctp_output.c
  projects/calloutng/sys/netinet/sctp_pcb.c
  projects/calloutng/sys/netinet/sctp_uio.h
  projects/calloutng/sys/netinet/sctp_usrreq.c
  projects/calloutng/sys/netinet/sctputil.c
  projects/calloutng/sys/netinet/tcp_input.c
  projects/calloutng/sys/netinet/tcp_output.c
  projects/calloutng/sys/netinet6/in6.c
  projects/calloutng/sys/netinet6/ip6_ipsec.c
  projects/calloutng/sys/netinet6/ip6_output.c
  projects/calloutng/sys/netinet6/sctp6_usrreq.c
  projects/calloutng/sys/netipsec/ipsec_output.c
  projects/calloutng/sys/powerpc/powerpc/busdma_machdep.c
  projects/calloutng/sys/sys/fcntl.h
  projects/calloutng/sys/sys/pipe.h
  projects/calloutng/sys/sys/refcount.h
  projects/calloutng/sys/sys/stat.h
  projects/calloutng/sys/sys/user.h
  projects/calloutng/sys/ufs/ffs/ffs_snapshot.c
  projects/calloutng/sys/ufs/ffs/ffs_vfsops.c
  projects/calloutng/sys/vm/memguard.c
  projects/calloutng/sys/vm/memguard.h
  projects/calloutng/sys/vm/vm_kern.c
  projects/calloutng/sys/vm/vm_map.h
  projects/calloutng/sys/vm/vm_page.c
  projects/calloutng/sys/vm/vm_page.h
  projects/calloutng/sys/vm/vm_pageout.c
  projects/calloutng/sys/vm/vm_pageout.h
  projects/calloutng/sys/vm/vm_reserv.c
  projects/calloutng/sys/x86/x86/busdma_machdep.c
  projects/calloutng/sys/x86/x86/local_apic.c
  projects/calloutng/sys/x86/x86/tsc.c
  projects/calloutng/tools/build/mk/OptionalObsoleteFiles.inc
  projects/calloutng/tools/tools/ath/Makefile
  projects/calloutng/tools/tools/ath/common/diag.h
  projects/calloutng/tools/tools/sysbuild/sysbuild.sh
  projects/calloutng/usr.bin/Makefile
  projects/calloutng/usr.bin/calendar/calendars/calendar.freebsd
  projects/calloutng/usr.bin/cpio/Makefile
  projects/calloutng/usr.bin/cpio/test/Makefile
  projects/calloutng/usr.bin/du/du.1
  projects/calloutng/usr.bin/du/du.c
  projects/calloutng/usr.bin/find/extern.h
  projects/calloutng/usr.bin/find/find.1
  projects/calloutng/usr.bin/find/find.c
  projects/calloutng/usr.bin/find/function.c
  projects/calloutng/usr.bin/find/main.c
  projects/calloutng/usr.bin/find/option.c
  projects/calloutng/usr.bin/netstat/Makefile
  projects/calloutng/usr.bin/netstat/sctp.c
  projects/calloutng/usr.bin/nfsstat/nfsstat.c
  projects/calloutng/usr.bin/procstat/procstat.1
  projects/calloutng/usr.bin/procstat/procstat_vm.c
  projects/calloutng/usr.bin/script/script.1
  projects/calloutng/usr.bin/script/script.c
  projects/calloutng/usr.bin/tar/Makefile
  projects/calloutng/usr.bin/tar/test/Makefile
  projects/calloutng/usr.sbin/ipfwpcap/ipfwpcap.8
  projects/calloutng/usr.sbin/lpr/common_source/common.c
  projects/calloutng/usr.sbin/wpa/hostapd/hostapd.8
Directory Properties:
  projects/calloutng/   (props changed)
  projects/calloutng/cddl/contrib/opensolaris/   (props changed)
  projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/calloutng/contrib/bind9/   (props changed)
  projects/calloutng/contrib/dtc/   (props changed)
  projects/calloutng/contrib/groff/   (props changed)
  projects/calloutng/contrib/less/   (props changed)
  projects/calloutng/contrib/libarchive/   (props changed)
  projects/calloutng/contrib/libarchive/cpio/   (props changed)
  projects/calloutng/contrib/libarchive/libarchive/   (props changed)
  projects/calloutng/contrib/libarchive/libarchive_fe/   (props changed)
  projects/calloutng/contrib/libarchive/tar/   (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/sbin/ipfw/   (props changed)
  projects/calloutng/share/man/man4/   (props changed)
  projects/calloutng/sys/   (props changed)
  projects/calloutng/sys/boot/   (props changed)
  projects/calloutng/sys/cddl/contrib/opensolaris/   (props changed)
  projects/calloutng/sys/conf/   (props changed)
  projects/calloutng/sys/contrib/libfdt/   (props changed)
  projects/calloutng/sys/contrib/pf/   (props changed)
  projects/calloutng/usr.bin/calendar/   (props changed)
  projects/calloutng/usr.bin/procstat/   (props changed)

Modified: projects/calloutng/Makefile.inc1
==============================================================================
--- projects/calloutng/Makefile.inc1	Fri Aug  3 16:04:35 2012	(r239017)
+++ projects/calloutng/Makefile.inc1	Fri Aug  3 16:18:20 2012	(r239018)
@@ -1260,7 +1260,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \
-		${_cddl_lib_libumem} \
+		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
 		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
 		${_secure_lib_libssl}
@@ -1284,6 +1284,7 @@ lib/libopie__L lib/libtacplus__L: lib/li
 
 .if ${MK_CDDL} != "no"
 _cddl_lib_libumem= cddl/lib/libumem
+_cddl_lib_libnvpair= cddl/lib/libnvpair
 _cddl_lib= cddl/lib
 .endif
 

Modified: projects/calloutng/ObsoleteFiles.inc
==============================================================================
--- projects/calloutng/ObsoleteFiles.inc	Fri Aug  3 16:04:35 2012	(r239017)
+++ projects/calloutng/ObsoleteFiles.inc	Fri Aug  3 16:18:20 2012	(r239018)
@@ -1358,6 +1358,11 @@ OLD_FILES+=usr/share/man/man2/kse_thr_in
 OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
 OLD_FILES+=usr/lib32/libkse.so
 OLD_LIBS+=usr/lib32/libkse.so.3
+# 20080225: bsdar/bsdranlib rename to ar/ranlib
+OLD_FILES+=usr/bin/bsdar
+OLD_FILES+=usr/bin/bsdranlib
+OLD_FILES+=usr/share/man/man1/bsdar.1.gz
+OLD_FILES+=usr/share/man/man1/bsdranlib.1.gz
 # 20080220: geom_lvm rename to geom_linux_lvm
 OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
 # 20080126: oldcard.4 removal

Modified: projects/calloutng/UPDATING
==============================================================================
--- projects/calloutng/UPDATING	Fri Aug  3 16:04:35 2012	(r239017)
+++ projects/calloutng/UPDATING	Fri Aug  3 16:18:20 2012	(r239018)
@@ -24,6 +24,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20120727:
+	The sparc64 ZFS loader has been changed to no longer try to auto-
+	detect ZFS providers based on diskN aliases but now requires these
+	to be explicitly listed in the OFW boot-device environment variable. 
+
 20120712:
 	The OpenSSL has been upgraded to 1.0.1c.  Any binaries requiring
 	libcrypto.so.6 or libssl.so.6 must be recompiled.  Also, there are

Modified: projects/calloutng/bin/cat/cat.c
==============================================================================
--- projects/calloutng/bin/cat/cat.c	Fri Aug  3 16:04:35 2012	(r239017)
+++ projects/calloutng/bin/cat/cat.c	Fri Aug  3 16:18:20 2012	(r239018)
@@ -58,11 +58,11 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <fcntl.h>
 #include <locale.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <stddef.h>
 
 static int bflag, eflag, nflag, sflag, tflag, vflag;
 static int rval;
@@ -77,16 +77,20 @@ static void raw_cat(int);
 static int udom_open(const char *path, int flags);
 #endif
 
-/* Memory strategy threshold, in pages: if physmem is larger then this, use a 
- * large buffer */
-#define PHYSPAGES_THRESHOLD (32*1024)
-
-/* Maximum buffer size in bytes - do not allow it to grow larger than this */
-#define BUFSIZE_MAX (2*1024*1024)
-
-/* Small (default) buffer size in bytes. It's inefficient for this to be
- * smaller than MAXPHYS */
-#define BUFSIZE_SMALL (MAXPHYS)
+/*
+ * Memory strategy threshold, in pages: if physmem is larger than this,
+ * use a large buffer.
+ */
+#define	PHYSPAGES_THRESHOLD (32 * 1024)
+
+/* Maximum buffer size in bytes - do not allow it to grow larger than this. */
+#define	BUFSIZE_MAX (2 * 1024 * 1024)
+
+/*
+ * Small (default) buffer size in bytes. It's inefficient for this to be
+ * smaller than MAXPHYS.
+ */
+#define	BUFSIZE_SMALL (MAXPHYS)
 
 int
 main(int argc, char *argv[])
@@ -144,13 +148,12 @@ usage(void)
 static void
 scanfiles(char *argv[], int cooked)
 {
-	int i = 0;
+	int fd, i;
 	char *path;
 	FILE *fp;
 
+	i = 0;
 	while ((path = argv[i]) != NULL || i == 0) {
-		int fd;
-
 		if (path == NULL || strcmp(path, "-") == 0) {
 			filename = "stdin";
 			fd = STDIN_FILENO;
@@ -257,16 +260,16 @@ raw_cat(int rfd)
 	wfd = fileno(stdout);
 	if (buf == NULL) {
 		if (fstat(wfd, &sbuf))
-			err(1, "%s", filename);
+			err(1, "stdout");
 		if (S_ISREG(sbuf.st_mode)) {
 			/* If there's plenty of RAM, use a large copy buffer */
 			if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD)
-				bsize = MIN(BUFSIZE_MAX, MAXPHYS*8);
+				bsize = MIN(BUFSIZE_MAX, MAXPHYS * 8);
 			else
 				bsize = BUFSIZE_SMALL;
 		} else
-			bsize = MAX(sbuf.st_blksize, 
-					(blksize_t)sysconf(_SC_PAGESIZE));
+			bsize = MAX(sbuf.st_blksize,
+			    (blksize_t)sysconf(_SC_PAGESIZE));
 		if ((buf = malloc(bsize)) == NULL)
 			err(1, "malloc() failure of IO buffer");
 	}
@@ -327,7 +330,7 @@ udom_open(const char *path, int flags)
 			break;
 		}
 	}
-	return(fd);
+	return (fd);
 }
 
 #endif

Modified: projects/calloutng/bin/sh/jobs.c
==============================================================================
--- projects/calloutng/bin/sh/jobs.c	Fri Aug  3 16:04:35 2012	(r239017)
+++ projects/calloutng/bin/sh/jobs.c	Fri Aug  3 16:18:20 2012	(r239018)
@@ -87,6 +87,10 @@ int in_waitcmd = 0;		/* are we in waitcm
 volatile sig_atomic_t breakwaitcmd = 0;	/* should wait be terminated? */
 static int ttyfd = -1;
 
+/* mode flags for dowait */
+#define DOWAIT_BLOCK	0x1 /* wait until a child exits */
+#define DOWAIT_SIG	0x2 /* if DOWAIT_BLOCK, abort on signals */
+
 #if JOBS
 static void restartjob(struct job *);
 #endif
@@ -94,7 +98,6 @@ static void freejob(struct job *);
 static struct job *getjob(char *);
 pid_t getjobpgrp(char *);
 static pid_t dowait(int, struct job *);
-static pid_t waitproc(int, int *);
 static void checkzombies(void);
 static void cmdtxt(union node *);
 static void cmdputs(const char *);
@@ -519,7 +522,7 @@ waitcmd(int argc, char **argv)
 					break;
 			}
 		}
-	} while (dowait(1, (struct job *)NULL) != -1);
+	} while (dowait(DOWAIT_BLOCK | DOWAIT_SIG, (struct job *)NULL) != -1);
 	in_waitcmd--;
 
 	return 0;
@@ -966,7 +969,7 @@ waitforjob(struct job *jp, int *origstat
 	INTOFF;
 	TRACE(("waitforjob(%%%td) called\n", jp - jobtab + 1));
 	while (jp->state == 0)
-		if (dowait(1, jp) == -1)
+		if (dowait(DOWAIT_BLOCK | (Tflag ? DOWAIT_SIG : 0), jp) == -1)
 			dotrap();
 #if JOBS
 	if (jp->jobctl) {
@@ -1004,14 +1007,20 @@ waitforjob(struct job *jp, int *origstat
 }
 
 
+static void
+dummy_handler(int sig)
+{
+}
 
 /*
  * Wait for a process to terminate.
  */
 
 static pid_t
-dowait(int block, struct job *job)
+dowait(int mode, struct job *job)
 {
+	struct sigaction sa, osa;
+	sigset_t mask, omask;
 	pid_t pid;
 	int status;
 	struct procstat *sp;
@@ -1021,15 +1030,49 @@ dowait(int block, struct job *job)
 	int stopped;
 	int sig;
 	int coredump;
+	int wflags;
+	int restore_sigchld;
 
 	TRACE(("dowait(%d) called\n", block));
+	restore_sigchld = 0;
+	if ((mode & DOWAIT_SIG) != 0) {
+		sigfillset(&mask);
+		sigprocmask(SIG_BLOCK, &mask, &omask);
+		INTOFF;
+		if (!issigchldtrapped()) {
+			restore_sigchld = 1;
+			sa.sa_handler = dummy_handler;
+			sa.sa_flags = 0;
+			sigemptyset(&sa.sa_mask);
+			sigaction(SIGCHLD, &sa, &osa);
+		}
+	}
 	do {
-		pid = waitproc(block, &status);
+#if JOBS
+		if (iflag)
+			wflags = WUNTRACED | WCONTINUED;
+		else
+#endif
+			wflags = 0;
+		if ((mode & (DOWAIT_BLOCK | DOWAIT_SIG)) != DOWAIT_BLOCK)
+			wflags |= WNOHANG;
+		pid = wait3(&status, wflags, (struct rusage *)NULL);
 		TRACE(("wait returns %d, status=%d\n", (int)pid, status));
-	} while ((pid == -1 && errno == EINTR && breakwaitcmd == 0) ||
-		 (pid > 0 && WIFSTOPPED(status) && !iflag));
+		if (pid == 0 && (mode & DOWAIT_SIG) != 0) {
+			sigsuspend(&omask);
+			pid = -1;
+			if (int_pending())
+				break;
+		}
+	} while (pid == -1 && errno == EINTR && breakwaitcmd == 0);
 	if (pid == -1 && errno == ECHILD && job != NULL)
 		job->state = JOBDONE;
+	if ((mode & DOWAIT_SIG) != 0) {
+		if (restore_sigchld)
+			sigaction(SIGCHLD, &osa, NULL);
+		sigprocmask(SIG_SETMASK, &omask, NULL);
+		INTON;
+	}
 	if (breakwaitcmd != 0) {
 		breakwaitcmd = 0;
 		if (pid <= 0)
@@ -1050,7 +1093,11 @@ dowait(int block, struct job *job)
 					TRACE(("Changing status of proc %d from 0x%x to 0x%x\n",
 						   (int)pid, sp->status,
 						   status));
-					sp->status = status;
+					if (WIFCONTINUED(status)) {
+						sp->status = -1;
+						jp->state = 0;
+					} else
+						sp->status = status;
 					thisjob = jp;
 				}
 				if (sp->status == -1)
@@ -1108,26 +1155,6 @@ dowait(int block, struct job *job)
 
 
 /*
- * Do a wait system call.  If job control is compiled in, we accept
- * stopped processes.  If block is zero, we return a value of zero
- * rather than blocking.
- */
-static pid_t
-waitproc(int block, int *status)
-{
-	int flags;
-
-#if JOBS
-	flags = WUNTRACED;
-#else
-	flags = 0;
-#endif
-	if (block == 0)
-		flags |= WNOHANG;
-	return wait3(status, flags, (struct rusage *)NULL);
-}
-
-/*
  * return 1 if there are stopped jobs, otherwise 0
  */
 int job_warning = 0;

Modified: projects/calloutng/bin/sh/trap.c
==============================================================================
--- projects/calloutng/bin/sh/trap.c	Fri Aug  3 16:04:35 2012	(r239017)
+++ projects/calloutng/bin/sh/trap.c	Fri Aug  3 16:18:20 2012	(r239018)
@@ -368,6 +368,14 @@ ignoresig(int signo)
 }
 
 
+int
+issigchldtrapped(void)
+{
+
+	return (trap[SIGCHLD] != NULL && *trap[SIGCHLD] != '\0');
+}
+
+
 /*
  * Signal handler.
  */

Modified: projects/calloutng/bin/sh/trap.h
==============================================================================
--- projects/calloutng/bin/sh/trap.h	Fri Aug  3 16:04:35 2012	(r239017)
+++ projects/calloutng/bin/sh/trap.h	Fri Aug  3 16:18:20 2012	(r239018)
@@ -41,6 +41,7 @@ void clear_traps(void);
 int have_traps(void);
 void setsignal(int);
 void ignoresig(int);
+int issigchldtrapped(void);
 void onsig(int);
 void dotrap(void);
 void setinteractive(int);

Modified: projects/calloutng/bin/stty/extern.h
==============================================================================
--- projects/calloutng/bin/stty/extern.h	Fri Aug  3 16:04:35 2012	(r239017)
+++ projects/calloutng/bin/stty/extern.h	Fri Aug  3 16:18:20 2012	(r239018)
@@ -40,6 +40,6 @@ int	ksearch(char ***, struct info *);
 int	msearch(char ***, struct info *);
 void	optlist(void);
 void	print(struct termios *, struct winsize *, int, enum FMT);
-void	usage(void);
+void	usage(void) __dead2;
 
 extern struct cchar cchars1[], cchars2[];

Copied: projects/calloutng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh (from r239017, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/calloutng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh	Fri Aug  3 16:18:20 2012	(r239018, copy of r239017, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh)
@@ -0,0 +1,76 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2011, Joyent Inc. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Test to catch that we properly look for libraries dependencies in
+# our full library parth
+#
+
+if [ $# != 1 ]; then
+	echo expected one argument: '<'dtrace-path'>'
+	exit 2
+fi
+
+libdira=${TMPDIR:-/tmp}/libdepa.$$
+libdirb=${TMPDIR:-/tmp}/libdepb.$$
+libdirc=${TMPDIR:-/tmp}/libdepc.$$
+dtrace=$1
+
+setup_libs()
+{
+        mkdir $libdira
+        mkdir $libdirb
+        mkdir $libdirc
+        cat > $libdira/liba.$$.d <<EOF
+#pragma D depends_on library libb.$$.d
+#pragma D depends_on library libc.$$.d
+#pragma D depends_on library libd.$$.d
+EOF
+        cat > $libdirb/libb.$$.d <<EOF
+#pragma D depends_on library libc.$$.d
+EOF
+        cat > $libdirb/libc.$$.d <<EOF
+EOF
+        cat > $libdirb/libd.$$.d <<EOF
+EOF
+        cat > $libdirc/libe.$$.d <<EOF
+#pragma D depends_on library liba.$$.d
+EOF
+        cat > $libdirc/libf.$$.d <<EOF
+EOF
+}
+
+
+setup_libs
+
+$dtrace -L$libdira -L$libdirb -L$libdirc -e
+
+status=$?
+rm -rf $libdira
+rm -rf $libdirb
+rm -rf $libdirc
+return $status
+

Modified: projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Fri Aug  3 16:04:35 2012	(r239017)
+++ projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Fri Aug  3 16:18:20 2012	(r239018)
@@ -1636,21 +1636,22 @@ for unixtime
 .Op Fl v
 .Xc
 .Pp
-Displays all pools formatted using a different
+Displays pools which do not have all supported features enabled and pools
+formatted using a legacy
 .Tn ZFS
-pool on-disk version. Older versions can continue to be used, but some
-features may not be available. These pools can be upgraded using
-.Qq Nm Cm upgrade Fl a .
-Pools that are formatted with a more recent version are also displayed,
-although these pools will be inaccessible on the system.
+version number.
+These pools can continue to be used, but some features may not be available.
+Use
+.Nm Cm upgrade Fl a
+to enable all features on all pools.
 .Bl -tag -width indent
 .It Fl v
-Displays
+Displays legacy
 .Tn ZFS
-pool versions supported by the current software. The current
-.Tn ZFS
-pool version and all previous supported versions are displayed, along
-with an explanation of the features provided with each version.
+versions supported by the current software.
+See
+.Xr zpool-features.5
+for a description of feature flags features supported by the current software.
 .El
 .It Xo
 .Nm
@@ -1659,18 +1660,22 @@ with an explanation of the features prov
 .Fl a | Ar pool ...
 .Xc
 .Pp
-Upgrades the given pool to the latest on-disk pool version. Once this is done,
-the pool will no longer be accessible on systems running older versions of the
-software.
+Enables all supported features on the given pool.
+Once this is done, the pool will no longer be accessible on systems that do
+not support feature flags.
+See
+.Xr zpool-features.5
+for details on compatability with system sthat support feature flags, but do
+not support all features enabled on the pool.
 .Bl -tag -width indent
 .It Fl a
-Upgrades all pools.
+Enables all supported features on all pools.
 .It Fl V Ar version
-Upgrade to the specified version. If the
+Upgrade to the specified legacy version. If the
 .Fl V
-flag is not specified, the pool is upgraded to the most recent version. This
-option can only be used to increase the version number, and only up to the most
-recent version supported by this software.
+flag is specified, no features will be enabled on the pool.
+This option can only be used to increase version number up to the last
+supported legacy version number.
 .El
 .El
 .Sh EXAMPLES

Modified: projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Aug  3 16:04:35 2012	(r239017)
+++ projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Aug  3 16:18:20 2012	(r239018)
@@ -389,6 +389,18 @@ print_vdev_tree(zpool_handle_t *zhp, con
 	}
 }
 
+static boolean_t
+prop_list_contains_feature(nvlist_t *proplist)
+{
+	nvpair_t *nvp;
+	for (nvp = nvlist_next_nvpair(proplist, NULL); NULL != nvp;
+	    nvp = nvlist_next_nvpair(proplist, nvp)) {
+		if (zpool_prop_feature(nvpair_name(nvp)))
+			return (B_TRUE);
+	}
+	return (B_FALSE);
+}
+
 /*
  * Add a property pair (name, string-value) into a property nvlist.
  */
@@ -412,12 +424,30 @@ add_prop_list(const char *propname, char
 	proplist = *props;
 
 	if (poolprop) {
+		const char *vname = zpool_prop_to_name(ZPOOL_PROP_VERSION);
+
 		if ((prop = zpool_name_to_prop(propname)) == ZPROP_INVAL &&
 		    !zpool_prop_feature(propname)) {
 			(void) fprintf(stderr, gettext("property '%s' is "
 			    "not a valid pool property\n"), propname);
 			return (2);
 		}
+
+		/*
+		 * feature@ properties and version should not be specified
+		 * at the same time.
+		 */
+		if ((prop == ZPROP_INVAL && zpool_prop_feature(propname) &&
+		    nvlist_exists(proplist, vname)) ||
+		    (prop == ZPOOL_PROP_VERSION &&
+		    prop_list_contains_feature(proplist))) {
+			(void) fprintf(stderr, gettext("'feature@' and "
+			    "'version' properties cannot be specified "
+			    "together\n"));
+			return (2);
+		}
+
+
 		if (zpool_prop_feature(propname))
 			normnm = propname;
 		else
@@ -1583,8 +1613,8 @@ show_import(nvlist_t *config)
 		break;
 
 	case ZPOOL_STATUS_VERSION_OLDER:
-		(void) printf(gettext(" status: The pool is formatted using an "
-		    "older on-disk version.\n"));
+		(void) printf(gettext(" status: The pool is formatted using a "
+		    "legacy on-disk version.\n"));
 		break;
 
 	case ZPOOL_STATUS_VERSION_NEWER:
@@ -1592,6 +1622,11 @@ show_import(nvlist_t *config)
 		    "incompatible version.\n"));
 		break;
 
+	case ZPOOL_STATUS_FEAT_DISABLED:
+		(void) printf(gettext(" status: Some supported features are "
+		    "not enabled on the pool.\n"));
+		break;
+
 	case ZPOOL_STATUS_UNSUP_FEAT_READ:
 		(void) printf(gettext("status: The pool uses the following "
 		    "feature(s) not supported on this sytem:\n"));
@@ -1638,19 +1673,21 @@ show_import(nvlist_t *config)
 	 * Print out an action according to the overall state of the pool.
 	 */
 	if (vs->vs_state == VDEV_STATE_HEALTHY) {
-		if (reason == ZPOOL_STATUS_VERSION_OLDER)
+		if (reason == ZPOOL_STATUS_VERSION_OLDER ||
+		    reason == ZPOOL_STATUS_FEAT_DISABLED) {
 			(void) printf(gettext(" action: The pool can be "
 			    "imported using its name or numeric identifier, "
 			    "though\n\tsome features will not be available "
 			    "without an explicit 'zpool upgrade'.\n"));
-		else if (reason == ZPOOL_STATUS_HOSTID_MISMATCH)
+		} else if (reason == ZPOOL_STATUS_HOSTID_MISMATCH) {
 			(void) printf(gettext(" action: The pool can be "
 			    "imported using its name or numeric "
 			    "identifier and\n\tthe '-f' flag.\n"));
-		else
+		} else {
 			(void) printf(gettext(" action: The pool can be "
 			    "imported using its name or numeric "
 			    "identifier.\n"));
+		}
 	} else if (vs->vs_state == VDEV_STATE_DEGRADED) {
 		(void) printf(gettext(" action: The pool can be imported "
 		    "despite missing or damaged devices.  The\n\tfault "
@@ -4108,12 +4145,13 @@ status_callback(zpool_handle_t *zhp, voi
 		break;
 
 	case ZPOOL_STATUS_VERSION_OLDER:
-		(void) printf(gettext("status: The pool is formatted using an "
-		    "older on-disk format.  The pool can\n\tstill be used, but "
-		    "some features are unavailable.\n"));
+		(void) printf(gettext("status: The pool is formatted using a "
+		    "legacy on-disk format.  The pool can\n\tstill be used, "
+		    "but some features are unavailable.\n"));
 		(void) printf(gettext("action: Upgrade the pool using 'zpool "
 		    "upgrade'.  Once this is done, the\n\tpool will no longer "
-		    "be accessible on older software versions.\n"));
+		    "be accessible on software that does not support feature\n"
+		    "\tflags.\n"));
 		break;
 
 	case ZPOOL_STATUS_VERSION_NEWER:
@@ -4125,6 +4163,16 @@ status_callback(zpool_handle_t *zhp, voi
 		    "backup.\n"));
 		break;
 
+	case ZPOOL_STATUS_FEAT_DISABLED:
+		(void) printf(gettext("status: Some supported features are not "
+		    "enabled on the pool. The pool can\n\tstill be used, but "
+		    "some features are unavailable.\n"));
+		(void) printf(gettext("action: Enable all features using "
+		    "'zpool upgrade'. Once this is done,\n\tthe pool may no "
+		    "longer be accessible by software that does not support\n\t"
+		    "the features. See zpool-features(5) for details.\n"));
+		break;
+
 	case ZPOOL_STATUS_UNSUP_FEAT_READ:
 		(void) printf(gettext("status: The pool cannot be accessed on "
 		    "this system because it uses the\n\tfollowing feature(s) "
@@ -4354,15 +4402,14 @@ zpool_do_status(int argc, char **argv)
 }
 
 typedef struct upgrade_cbdata {
-	int	cb_all;
 	int	cb_first;
-	int	cb_newer;
 	char	cb_poolname[ZPOOL_MAXNAMELEN];
 	int	cb_argc;
 	uint64_t cb_version;
 	char	**cb_argv;
 } upgrade_cbdata_t;
 
+#ifdef __FreeBSD__
 static int
 is_root_pool(zpool_handle_t *zhp)
 {
@@ -4388,56 +4435,161 @@ is_root_pool(zpool_handle_t *zhp)
 	return (poolname != NULL && strcmp(poolname, zpool_get_name(zhp)) == 0);
 }
 
+static void
+root_pool_upgrade_check(zpool_handle_t *zhp, char *poolname, int size) {
+
+	if (poolname[0] == '\0' && is_root_pool(zhp))
+		(void) strlcpy(poolname, zpool_get_name(zhp), size);
+}
+#endif	/* FreeBSD */
+
+static int
+upgrade_version(zpool_handle_t *zhp, uint64_t version)
+{
+	int ret;
+	nvlist_t *config;
+	uint64_t oldversion;
+
+	config = zpool_get_config(zhp, NULL);
+	verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION,
+	    &oldversion) == 0);
+
+	assert(SPA_VERSION_IS_SUPPORTED(oldversion));
+	assert(oldversion < version);
+
+	ret = zpool_upgrade(zhp, version);
+	if (ret != 0)
+		return (ret);
+
+	if (version >= SPA_VERSION_FEATURES) {
+		(void) printf(gettext("Successfully upgraded "
+		    "'%s' from version %llu to feature flags.\n"),
+		    zpool_get_name(zhp), oldversion);
+	} else {
+		(void) printf(gettext("Successfully upgraded "
+		    "'%s' from version %llu to version %llu.\n"),
+		    zpool_get_name(zhp), oldversion, version);
+	}
+
+	return (0);
+}
+
+static int
+upgrade_enable_all(zpool_handle_t *zhp, int *countp)
+{
+	int i, ret, count;
+	boolean_t firstff = B_TRUE;
+	nvlist_t *enabled = zpool_get_features(zhp);
+
+	count = 0;
+	for (i = 0; i < SPA_FEATURES; i++) {
+		const char *fname = spa_feature_table[i].fi_uname;
+		const char *fguid = spa_feature_table[i].fi_guid;
+		if (!nvlist_exists(enabled, fguid)) {
+			char *propname;
+			verify(-1 != asprintf(&propname, "feature@%s", fname));
+			ret = zpool_set_prop(zhp, propname,
+			    ZFS_FEATURE_ENABLED);
+			if (ret != 0) {
+				free(propname);
+				return (ret);
+			}
+			count++;
+
+			if (firstff) {
+				(void) printf(gettext("Enabled the "
+				    "following features on '%s':\n"),
+				    zpool_get_name(zhp));
+				firstff = B_FALSE;
+			}
+			(void) printf(gettext("  %s\n"), fname);
+			free(propname);
+		}
+	}
+
+	if (countp != NULL)
+		*countp = count;
+	return (0);
+}
+
 static int
 upgrade_cb(zpool_handle_t *zhp, void *arg)
 {
 	upgrade_cbdata_t *cbp = arg;
 	nvlist_t *config;
 	uint64_t version;
-	int ret = 0;
+	boolean_t printnl = B_FALSE;
+	int ret;
 
 	config = zpool_get_config(zhp, NULL);
 	verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION,
 	    &version) == 0);
 
-	if (!cbp->cb_newer && SPA_VERSION_IS_SUPPORTED(version) &&
-	    version != SPA_VERSION) {
-		if (!cbp->cb_all) {
-			if (cbp->cb_first) {
-				(void) printf(gettext("The following pools are "
-				    "out of date, and can be upgraded.  After "
-				    "being\nupgraded, these pools will no "
-				    "longer be accessible by older software "
-				    "versions.\n\n"));
-				(void) printf(gettext("VER  POOL\n"));
-				(void) printf(gettext("---  ------------\n"));
-				cbp->cb_first = B_FALSE;
-			}
+	assert(SPA_VERSION_IS_SUPPORTED(version));
 
-			(void) printf("%2llu   %s\n", (u_longlong_t)version,
-			    zpool_get_name(zhp));
-		} else {
+	if (version < cbp->cb_version) {
+		cbp->cb_first = B_FALSE;
+		ret = upgrade_version(zhp, cbp->cb_version);
+		if (ret != 0)
+			return (ret);
+#ifdef __FreeBSD__
+		root_pool_upgrade_check(zhp, cbp->cb_poolname,
+		    sizeof(cbp->cb_poolname));
+#endif	/* ___FreeBSD__ */
+		printnl = B_TRUE;
+
+#ifdef illumos
+		/*
+		 * If they did "zpool upgrade -a", then we could
+		 * be doing ioctls to different pools.  We need
+		 * to log this history once to each pool, and bypass
+		 * the normal history logging that happens in main().
+		 */
+		(void) zpool_log_history(g_zfs, history_str);
+		log_history = B_FALSE;
+#endif
+	}
+
+	if (cbp->cb_version >= SPA_VERSION_FEATURES) {
+		int count;
+		ret = upgrade_enable_all(zhp, &count);
+		if (ret != 0)
+			return (ret);
+
+		if (count > 0) {
 			cbp->cb_first = B_FALSE;
-			ret = zpool_upgrade(zhp, cbp->cb_version);
-			if (!ret) {
-				(void) printf(gettext("Successfully upgraded "
-				    "'%s'\n\n"), zpool_get_name(zhp));
-				if (cbp->cb_poolname[0] == '\0' &&
-				    is_root_pool(zhp)) {
-					(void) strlcpy(cbp->cb_poolname,
-					    zpool_get_name(zhp),
-					    sizeof(cbp->cb_poolname));
-				}
-			}
+			printnl = B_TRUE;
 		}
-	} else if (cbp->cb_newer && !SPA_VERSION_IS_SUPPORTED(version)) {
-		assert(!cbp->cb_all);
+	}
+
+	if (printnl) {
+		(void) printf(gettext("\n"));
+	}
+
+	return (0);
+}
+
+static int
+upgrade_list_older_cb(zpool_handle_t *zhp, void *arg)
+{
+	upgrade_cbdata_t *cbp = arg;
+	nvlist_t *config;
+	uint64_t version;
+
+	config = zpool_get_config(zhp, NULL);
+	verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION,
+	    &version) == 0);
+
+	assert(SPA_VERSION_IS_SUPPORTED(version));
 
+	if (version < SPA_VERSION_FEATURES) {
 		if (cbp->cb_first) {
 			(void) printf(gettext("The following pools are "
-			    "formatted using an unsupported software version "
-			    "and\ncannot be accessed on the current "
-			    "system.\n\n"));
+			    "formatted with legacy version numbers and can\n"
+			    "be upgraded to use feature flags.  After "
+			    "being upgraded, these pools\nwill no "
+			    "longer be accessible by software that does not "
+			    "support feature\nflags.\n\n"));
 			(void) printf(gettext("VER  POOL\n"));
 			(void) printf(gettext("---  ------------\n"));
 			cbp->cb_first = B_FALSE;
@@ -4447,14 +4599,65 @@ upgrade_cb(zpool_handle_t *zhp, void *ar
 		    zpool_get_name(zhp));
 	}
 
-	zpool_close(zhp);
-	return (ret);
+	return (0);
+}
+
+static int
+upgrade_list_disabled_cb(zpool_handle_t *zhp, void *arg)
+{
+	upgrade_cbdata_t *cbp = arg;
+	nvlist_t *config;
+	uint64_t version;
+
+	config = zpool_get_config(zhp, NULL);
+	verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION,
+	    &version) == 0);
+
+	if (version >= SPA_VERSION_FEATURES) {
+		int i;
+		boolean_t poolfirst = B_TRUE;
+		nvlist_t *enabled = zpool_get_features(zhp);
+
+		for (i = 0; i < SPA_FEATURES; i++) {
+			const char *fguid = spa_feature_table[i].fi_guid;
+			const char *fname = spa_feature_table[i].fi_uname;
+			if (!nvlist_exists(enabled, fguid)) {
+				if (cbp->cb_first) {
+					(void) printf(gettext("\nSome "
+					    "supported features are not "
+					    "enabled on the following pools. "
+					    "Once a\nfeature is enabled the "
+					    "pool may become incompatible with "
+					    "software\nthat does not support "
+					    "the feature. See "
+					    "zpool-features(5) for "
+					    "details.\n\n"));
+					(void) printf(gettext("POOL  "
+					    "FEATURE\n"));
+					(void) printf(gettext("------"
+					    "---------\n"));
+					cbp->cb_first = B_FALSE;
+				}
+
+				if (poolfirst) {
+					(void) printf(gettext("%s\n"),
+					    zpool_get_name(zhp));
+					poolfirst = B_FALSE;
+				}
+
+				(void) printf(gettext("      %s\n"), fname);
+			}
+		}
+	}
+
+	return (0);
 }
 
 /* ARGSUSED */
 static int
 upgrade_one(zpool_handle_t *zhp, void *data)
 {
+	boolean_t printnl = B_FALSE;
 	upgrade_cbdata_t *cbp = data;
 	uint64_t cur_version;
 	int ret;
@@ -4469,30 +4672,53 @@ upgrade_one(zpool_handle_t *zhp, void *d
 	cur_version = zpool_get_prop_int(zhp, ZPOOL_PROP_VERSION, NULL);
 	if (cur_version > cbp->cb_version) {
 		(void) printf(gettext("Pool '%s' is already formatted "
-		    "using more current version '%llu'.\n"),
+		    "using more current version '%llu'.\n\n"),
 		    zpool_get_name(zhp), cur_version);
 		return (0);
 	}
-	if (cur_version == cbp->cb_version) {
+
+	if (cbp->cb_version != SPA_VERSION && cur_version == cbp->cb_version) {
 		(void) printf(gettext("Pool '%s' is already formatted "
-		    "using the current version.\n"), zpool_get_name(zhp));
+		    "using version %llu.\n\n"), zpool_get_name(zhp),
+		    cbp->cb_version);
 		return (0);
 	}
 
-	ret = zpool_upgrade(zhp, cbp->cb_version);
+	if (cur_version != cbp->cb_version) {
+		printnl = B_TRUE;
+		ret = upgrade_version(zhp, cbp->cb_version);
+		if (ret != 0)
+			return (ret);
+#ifdef __FreeBSD__
+		root_pool_upgrade_check(zhp, cbp->cb_poolname,
+		    sizeof(cbp->cb_poolname));
+#endif	/* ___FreeBSD__ */
+	}
+
+	if (cbp->cb_version >= SPA_VERSION_FEATURES) {
+		int count = 0;
+		ret = upgrade_enable_all(zhp, &count);
+		if (ret != 0)
+			return (ret);
 
-	if (!ret) {
-		(void) printf(gettext("Successfully upgraded '%s' "
-		    "from version %llu to version %llu\n\n"),
-		    zpool_get_name(zhp), (u_longlong_t)cur_version,
-		    (u_longlong_t)cbp->cb_version);
-		if (cbp->cb_poolname[0] == '\0' && is_root_pool(zhp)) {
-			(void) strlcpy(cbp->cb_poolname, zpool_get_name(zhp),
+		if (count != 0) {
+			printnl = B_TRUE;
+#ifdef __FreeBSD__
+			root_pool_upgrade_check(zhp, cbp->cb_poolname,
 			    sizeof(cbp->cb_poolname));
+#endif	/* __FreeBSD __*/
+		} else if (cur_version == SPA_VERSION) {
+			(void) printf(gettext("Pool '%s' already has all "
+			    "supported features enabled.\n"),
+			    zpool_get_name(zhp));
 		}
 	}
 
-	return (ret != 0);
+	if (printnl) {
+		(void) printf(gettext("\n"));
+	}
+
+	return (0);
 }
 
 /*
@@ -4511,6 +4737,7 @@ zpool_do_upgrade(int argc, char **argv)
 	upgrade_cbdata_t cb = { 0 };
 	int ret = 0;
 	boolean_t showversions = B_FALSE;
+	boolean_t upgradeall = B_FALSE;
 	char *end;
 
 
@@ -4518,7 +4745,7 @@ zpool_do_upgrade(int argc, char **argv)
 	while ((c = getopt(argc, argv, ":avV:")) != -1) {
 		switch (c) {
 		case 'a':
-			cb.cb_all = B_TRUE;
+			upgradeall = B_TRUE;
 			break;
 		case 'v':
 			showversions = B_TRUE;
@@ -4551,19 +4778,19 @@ zpool_do_upgrade(int argc, char **argv)
 
 	if (cb.cb_version == 0) {
 		cb.cb_version = SPA_VERSION;
-	} else if (!cb.cb_all && argc == 0) {
+	} else if (!upgradeall && argc == 0) {
 		(void) fprintf(stderr, gettext("-V option is "
 		    "incompatible with other arguments\n"));
 		usage(B_FALSE);
 	}
 
 	if (showversions) {
-		if (cb.cb_all || argc != 0) {
+		if (upgradeall || argc != 0) {
 			(void) fprintf(stderr, gettext("-v option is "
 			    "incompatible with other arguments\n"));
 			usage(B_FALSE);
 		}
-	} else if (cb.cb_all) {
+	} else if (upgradeall) {
 		if (argc != 0) {
 			(void) fprintf(stderr, gettext("-a option should not "
 			    "be used along with a pool name\n"));
@@ -4573,9 +4800,25 @@ zpool_do_upgrade(int argc, char **argv)
 
 	(void) printf(gettext("This system supports ZFS pool feature "

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

More information about the svn-src-projects mailing list