svn commit: r239011 - in projects/pf/head: . bin/cat bin/ps bin/sh bin/stty cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/include cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma cd...

Fri Aug 3 14:49:20 UTC 2012

Author: glebius
Date: Fri Aug  3 14:49:18 2012
New Revision: 239011
URL: http://svn.freebsd.org/changeset/base/239011

Log:
  Merge head r233826 through r239010.

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

Modified: projects/pf/head/Makefile.inc1
==============================================================================

--- projects/pf/head/Makefile.inc1	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/Makefile.inc1	Fri Aug  3 14:49:18 2012	(r239011)
@@ -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/pf/head/ObsoleteFiles.inc
==============================================================================
--- projects/pf/head/ObsoleteFiles.inc	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/ObsoleteFiles.inc	Fri Aug  3 14:49:18 2012	(r239011)
@@ -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/pf/head/UPDATING
==============================================================================
--- projects/pf/head/UPDATING	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/UPDATING	Fri Aug  3 14:49:18 2012	(r239011)
@@ -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/pf/head/bin/cat/cat.c
==============================================================================
--- projects/pf/head/bin/cat/cat.c	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/bin/cat/cat.c	Fri Aug  3 14:49:18 2012	(r239011)
@@ -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/pf/head/bin/ps/print.c
==============================================================================
--- projects/pf/head/bin/ps/print.c	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/bin/ps/print.c	Fri Aug  3 14:49:18 2012	(r239011)
@@ -387,12 +387,13 @@ started(KINFO *k, VARENT *ve __unused)
 	size_t buflen = 100;
 	char *buf;
 
+	if (!k->ki_valid)
+		return (NULL);
+
 	buf = malloc(buflen);
 	if (buf == NULL)
 		errx(1, "malloc failed");
 
-	if (!k->ki_valid)
-		return (NULL);
 	if (use_ampm < 0)
 		use_ampm = (*nl_langinfo(T_FMT_AMPM) != '\0');
 	then = k->ki_p->ki_start.tv_sec;
@@ -415,12 +416,13 @@ lstarted(KINFO *k, VARENT *ve __unused)
 	char *buf;
 	size_t buflen = 100;
 
+	if (!k->ki_valid)
+		return (NULL);
+
 	buf = malloc(buflen);
 	if (buf == NULL)
 		errx(1, "malloc failed");
 
-	if (!k->ki_valid)
-		return (NULL);
 	then = k->ki_p->ki_start.tv_sec;
 	(void)strftime(buf, buflen, "%c", localtime(&then));
 	return (buf);

Modified: projects/pf/head/bin/sh/eval.c
==============================================================================
--- projects/pf/head/bin/sh/eval.c	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/bin/sh/eval.c	Fri Aug  3 14:49:18 2012	(r239011)
@@ -672,6 +672,52 @@ out:
 		result->fd, result->buf, result->nleft, result->jp));
 }
 
+static int
+mustexpandto(const char *argtext, const char *mask)
+{
+	for (;;) {
+		if (*argtext == CTLQUOTEMARK || *argtext == CTLQUOTEEND) {
+			argtext++;
+			continue;
+		}
+		if (*argtext == CTLESC)
+			argtext++;
+		else if (BASESYNTAX[(int)*argtext] == CCTL)
+			return (0);
+		if (*argtext != *mask)
+			return (0);
+		if (*argtext == '\0')
+			return (1);
+		argtext++;
+		mask++;
+	}
+}
+
+static int
+isdeclarationcmd(struct narg *arg)
+{
+	int have_command = 0;
+
+	if (arg == NULL)
+		return (0);
+	while (mustexpandto(arg->text, "command")) {
+		have_command = 1;
+		arg = &arg->next->narg;
+		if (arg == NULL)
+			return (0);
+		/*
+		 * To also allow "command -p" and "command --" as part of
+		 * a declaration command, add code here.
+		 * We do not do this, as ksh does not do it either and it
+		 * is not required by POSIX.
+		 */
+	}
+	return (mustexpandto(arg->text, "export") ||
+	    mustexpandto(arg->text, "readonly") ||
+	    (mustexpandto(arg->text, "local") &&
+		(have_command || !isfunc("local"))));
+}
+
 /*
  * Check if a builtin can safely be executed in the same process,
  * even though it should be in a subshell (command substitution).
@@ -743,11 +789,12 @@ evalcommand(union node *cmd, int flags, 
 	exitstatus = 0;
 	for (argp = cmd->ncmd.args ; argp ; argp = argp->narg.next) {
 		if (varflag && isassignment(argp->narg.text)) {
-			expandarg(argp, &varlist, EXP_VARTILDE);
+			expandarg(argp, varflag == 1 ? &varlist : &arglist,
+			    EXP_VARTILDE);
 			continue;
-		}
+		} else if (varflag == 1)
+			varflag = isdeclarationcmd(&argp->narg) ? 2 : 0;
 		expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
-		varflag = 0;
 	}
 	*arglist.lastp = NULL;
 	*varlist.lastp = NULL;

Modified: projects/pf/head/bin/sh/exec.c
==============================================================================
--- projects/pf/head/bin/sh/exec.c	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/bin/sh/exec.c	Fri Aug  3 14:49:18 2012	(r239011)
@@ -648,6 +648,19 @@ unsetfunc(const char *name)
 	return (0);
 }
 
+
+/*
+ * Check if a function by a certain name exists.
+ */
+int
+isfunc(const char *name)
+{
+	struct tblentry *cmdp;
+	cmdp = cmdlookup(name, 0);
+	return (cmdp != NULL && cmdp->cmdtype == CMDFUNCTION);
+}
+
+
 /*
  * Shared code for the following builtin commands:
  *    type, command -v, command -V

Modified: projects/pf/head/bin/sh/exec.h
==============================================================================
--- projects/pf/head/bin/sh/exec.h	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/bin/sh/exec.h	Fri Aug  3 14:49:18 2012	(r239011)
@@ -72,5 +72,6 @@ void hashcd(void);
 void changepath(const char *);
 void defun(const char *, union node *);
 int unsetfunc(const char *);
+int isfunc(const char *);
 int typecmd_impl(int, char **, int, const char *);
 void clearcmdentry(void);

Modified: projects/pf/head/bin/sh/jobs.c
==============================================================================
--- projects/pf/head/bin/sh/jobs.c	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/bin/sh/jobs.c	Fri Aug  3 14:49:18 2012	(r239011)
@@ -84,10 +84,13 @@ static struct job *jobmru;	/* most recen
 static pid_t initialpgrp;	/* pgrp of shell on invocation */
 #endif
 int in_waitcmd = 0;		/* are we in waitcmd()? */
-int in_dowait = 0;		/* are we in dowait()? */
 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
@@ -95,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 *);
@@ -520,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;
@@ -967,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) {
@@ -1005,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;
@@ -1022,17 +1030,49 @@ dowait(int block, struct job *job)
 	int stopped;
 	int sig;
 	int coredump;
+	int wflags;
+	int restore_sigchld;
 
-	in_dowait++;
 	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));
-	in_dowait--;
+		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)
@@ -1053,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)
@@ -1111,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/pf/head/bin/sh/jobs.h
==============================================================================
--- projects/pf/head/bin/sh/jobs.h	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/bin/sh/jobs.h	Fri Aug  3 14:49:18 2012	(r239011)
@@ -84,7 +84,6 @@ enum {
 
 extern int job_warning;		/* user was warned about stopped jobs */
 extern int in_waitcmd;		/* are we in waitcmd()? */
-extern int in_dowait;		/* are we in dowait()? */
 extern volatile sig_atomic_t breakwaitcmd; /* break wait to process traps? */
 
 void setjobctl(int);

Modified: projects/pf/head/bin/sh/sh.1
==============================================================================
--- projects/pf/head/bin/sh/sh.1	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/bin/sh/sh.1	Fri Aug  3 14:49:18 2012	(r239011)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd November 5, 2011
+.Dd July 15, 2012
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1164,6 +1164,20 @@ Assignments are expanded differently fro
 tilde expansion is also performed after the equals sign and after any colon
 and usernames are also terminated by colons,
 and field splitting and pathname expansion are not performed.
+.Pp
+This special expansion applies not only to assignments that form a simple
+command by themselves or precede a command word,
+but also to words passed to the
+.Ic export ,
+.Ic local
+or
+.Ic readonly
+built-in commands that have this form.
+For this, the builtin's name must be literal
+(not the result of an expansion)
+and may optionally be preceded by one or more literal instances of
+.Ic command
+without options.
 .Ss Positional Parameters
 A positional parameter is a parameter denoted by a number greater than zero.
 The shell sets these initially to the values of its command line

Modified: projects/pf/head/bin/sh/trap.c
==============================================================================
--- projects/pf/head/bin/sh/trap.c	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/bin/sh/trap.c	Fri Aug  3 14:49:18 2012	(r239011)
@@ -368,6 +368,14 @@ ignoresig(int signo)
 }
 
 
+int
+issigchldtrapped(void)
+{
+
+	return (trap[SIGCHLD] != NULL && *trap[SIGCHLD] != '\0');
+}
+
+
 /*
  * Signal handler.
  */
@@ -416,6 +424,7 @@ dotrap(void)
 
 	in_dotrap++;
 	for (;;) {
+		pendingsigs = 0;
 		for (i = 1; i < NSIG; i++) {
 			if (gotsig[i]) {
 				gotsig[i] = 0;
@@ -467,7 +476,6 @@ dotrap(void)
 			break;
 	}
 	in_dotrap--;
-	pendingsigs = 0;
 }
 
 

Modified: projects/pf/head/bin/sh/trap.h
==============================================================================
--- projects/pf/head/bin/sh/trap.h	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/bin/sh/trap.h	Fri Aug  3 14:49:18 2012	(r239011)
@@ -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/pf/head/bin/stty/extern.h
==============================================================================
--- projects/pf/head/bin/stty/extern.h	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/bin/stty/extern.h	Fri Aug  3 14:49:18 2012	(r239011)
@@ -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/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh (from r239010, 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/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh	Fri Aug  3 14:49:18 2012	(r239011, copy of r239010, 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/pf/head/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- projects/pf/head/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Fri Aug  3 14:49:18 2012	(r239011)
@@ -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/pf/head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/pf/head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Aug  3 14:25:35 2012	(r239010)
+++ projects/pf/head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Aug  3 14:49:18 2012	(r239011)
@@ -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;

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