svn commit: r286585 - in user/ngie/more-tests: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip cddl/contrib/opensolaris/cmd/zfs cd...

Garrett Cooper ngie at FreeBSD.org
Mon Aug 10 18:28:09 UTC 2015


Author: ngie
Date: Mon Aug 10 18:27:54 2015
New Revision: 286585
URL: https://svnweb.freebsd.org/changeset/base/286585

Log:
  MFhead @ r286584

Added:
     - copied from r286584, head/contrib/elftoolchain/ar/
     - copied from r286584, head/contrib/elftoolchain/brandelf/
     - copied from r286584, head/contrib/elftoolchain/elfdump/
  user/ngie/more-tests/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.c
     - copied unchanged from r286584, head/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.c
  user/ngie/more-tests/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu
     - copied unchanged from r286584, head/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu
  user/ngie/more-tests/share/man/man4/cloudabi.4
     - copied unchanged from r286584, head/share/man/man4/cloudabi.4
  user/ngie/more-tests/share/man/man4/iwm.4
     - copied unchanged from r286584, head/share/man/man4/iwm.4
  user/ngie/more-tests/share/man/man4/iwmfw.4
     - copied unchanged from r286584, head/share/man/man4/iwmfw.4
  user/ngie/more-tests/share/man/man9/pmap_quick_enter_page.9
     - copied unchanged from r286584, head/share/man/man9/pmap_quick_enter_page.9
  user/ngie/more-tests/sys/arm64/arm64/uma_machdep.c
     - copied unchanged from r286584, head/sys/arm64/arm64/uma_machdep.c
  user/ngie/more-tests/sys/arm64/cavium/
     - copied from r286584, head/sys/arm64/cavium/
  user/ngie/more-tests/sys/contrib/alpine-hal/
     - copied from r286584, head/sys/contrib/alpine-hal/
  user/ngie/more-tests/sys/contrib/dev/iwm/
     - copied from r286584, head/sys/contrib/dev/iwm/
  user/ngie/more-tests/sys/dev/cxgbe/firmware/t4fw-1.14.4.0.bin.uu
     - copied unchanged from r286584, head/sys/dev/cxgbe/firmware/t4fw-1.14.4.0.bin.uu
  user/ngie/more-tests/sys/dev/cxgbe/firmware/t5fw-1.14.4.0.bin.uu
     - copied unchanged from r286584, head/sys/dev/cxgbe/firmware/t5fw-1.14.4.0.bin.uu
  user/ngie/more-tests/sys/dev/gpio/gpiobacklight.c
     - copied unchanged from r286584, head/sys/dev/gpio/gpiobacklight.c
  user/ngie/more-tests/sys/dev/iwm/
     - copied from r286584, head/sys/dev/iwm/
  user/ngie/more-tests/sys/modules/iwm/
     - copied from r286584, head/sys/modules/iwm/
  user/ngie/more-tests/sys/modules/iwmfw/
     - copied from r286584, head/sys/modules/iwmfw/
  user/ngie/more-tests/tools/build/options/WITHOUT_ELFCOPY_AS_OBJCOPY
     - copied unchanged from r286584, head/tools/build/options/WITHOUT_ELFCOPY_AS_OBJCOPY
  user/ngie/more-tests/tools/build/options/WITH_DTRACE_TESTS
     - copied unchanged from r286584, head/tools/build/options/WITH_DTRACE_TESTS
  user/ngie/more-tests/tools/build/options/WITH_ELFCOPY_AS_OBJCOPY
     - copied unchanged from r286584, head/tools/build/options/WITH_ELFCOPY_AS_OBJCOPY
  user/ngie/more-tests/tools/bus_space/examples/
     - copied from r286584, head/tools/bus_space/examples/
  user/ngie/more-tests/usr.bin/xargs/tests/regress.0P1.out
     - copied unchanged from r286584, head/usr.bin/xargs/tests/regress.0P1.out
  user/ngie/more-tests/usr.bin/xargs/tests/regress.P1.out
     - copied unchanged from r286584, head/usr.bin/xargs/tests/regress.P1.out
  user/ngie/more-tests/usr.bin/xargs/tests/regress.n2P0.out
     - copied unchanged from r286584, head/usr.bin/xargs/tests/regress.n2P0.out
  user/ngie/more-tests/usr.sbin/pw/pw_utils.c
     - copied unchanged from r286584, head/usr.sbin/pw/pw_utils.c
  user/ngie/more-tests/usr.sbin/pw/strtounum.c
     - copied unchanged from r286584, head/usr.sbin/pw/strtounum.c
  user/ngie/more-tests/usr.sbin/pw/tests/pw_groupadd.sh
     - copied unchanged from r286584, head/usr.sbin/pw/tests/pw_groupadd.sh
Directory Properties:
  user/ngie/more-tests/contrib/elftoolchain/ar/   (props changed)
  user/ngie/more-tests/contrib/elftoolchain/brandelf/   (props changed)
  user/ngie/more-tests/contrib/elftoolchain/elfdump/   (props changed)
Deleted:
  user/ngie/more-tests/gnu/usr.bin/binutils/addr2line/
  user/ngie/more-tests/gnu/usr.bin/binutils/ar/
  user/ngie/more-tests/gnu/usr.bin/binutils/nm/
  user/ngie/more-tests/gnu/usr.bin/binutils/ranlib/
  user/ngie/more-tests/gnu/usr.bin/binutils/readelf/
  user/ngie/more-tests/gnu/usr.bin/binutils/size/
  user/ngie/more-tests/gnu/usr.bin/binutils/strings/
  user/ngie/more-tests/gnu/usr.bin/binutils/strip/
  user/ngie/more-tests/gnu/usr.bin/cc/c++filt/Makefile
  user/ngie/more-tests/gnu/usr.bin/cc/c++filt/Makefile.depend
  user/ngie/more-tests/sys/amd64/include/xen/xenfunc.h
  user/ngie/more-tests/sys/amd64/include/xen/xenvar.h
  user/ngie/more-tests/sys/arm/annapurna/alpine/hal/
  user/ngie/more-tests/sys/dev/cxgbe/firmware/t4fw-1.14.2.0.bin.uu
  user/ngie/more-tests/sys/dev/cxgbe/firmware/t5fw-1.14.2.0.bin.uu
  user/ngie/more-tests/sys/i386/include/privatespace.h
  user/ngie/more-tests/sys/i386/include/xen/xenfunc.h
  user/ngie/more-tests/sys/i386/include/xen/xenvar.h
  user/ngie/more-tests/sys/mips/rmi/dev/iic/ds1374u.c
  user/ngie/more-tests/sys/pc98/include/privatespace.h
  user/ngie/more-tests/usr.bin/vgrind/vgrindefs.c
Modified:
  user/ngie/more-tests/Makefile.inc1
  user/ngie/more-tests/ObsoleteFiles.inc
  user/ngie/more-tests/UPDATING
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  user/ngie/more-tests/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
  user/ngie/more-tests/cddl/lib/libdtrace/io.d
  user/ngie/more-tests/cddl/lib/libdtrace/ip.d
  user/ngie/more-tests/cddl/lib/libdtrace/nfs.d
  user/ngie/more-tests/cddl/lib/libdtrace/nfssrv.d
  user/ngie/more-tests/cddl/lib/libdtrace/psinfo.d
  user/ngie/more-tests/cddl/lib/libdtrace/regs_x86.d
  user/ngie/more-tests/cddl/lib/libdtrace/sched.d
  user/ngie/more-tests/cddl/lib/libdtrace/siftr.d
  user/ngie/more-tests/cddl/lib/libdtrace/tcp.d
  user/ngie/more-tests/cddl/lib/libdtrace/udp.d
  user/ngie/more-tests/cddl/usr.sbin/dtrace/Makefile
  user/ngie/more-tests/contrib/apr/CHANGES
  user/ngie/more-tests/contrib/apr/CMakeLists.txt
  user/ngie/more-tests/contrib/apr/Makefile.in
  user/ngie/more-tests/contrib/apr/NOTICE
  user/ngie/more-tests/contrib/apr/NWGNUmakefile
  user/ngie/more-tests/contrib/apr/apr.dsp
  user/ngie/more-tests/contrib/apr/apr.spec
  user/ngie/more-tests/contrib/apr/build-outputs.mk
  user/ngie/more-tests/contrib/apr/configure
  user/ngie/more-tests/contrib/apr/configure.in
  user/ngie/more-tests/contrib/apr/encoding/apr_escape.c
  user/ngie/more-tests/contrib/apr/include/apr_skiplist.h
  user/ngie/more-tests/contrib/apr/include/apr_version.h
  user/ngie/more-tests/contrib/apr/libapr.dsp
  user/ngie/more-tests/contrib/apr/locks/unix/proc_mutex.c
  user/ngie/more-tests/contrib/apr/memory/unix/apr_pools.c
  user/ngie/more-tests/contrib/apr/misc/unix/errorcodes.c
  user/ngie/more-tests/contrib/apr/network_io/unix/sockaddr.c
  user/ngie/more-tests/contrib/apr/network_io/unix/sockets.c
  user/ngie/more-tests/contrib/apr/poll/unix/epoll.c
  user/ngie/more-tests/contrib/apr/poll/unix/kqueue.c
  user/ngie/more-tests/contrib/apr/poll/unix/poll.c
  user/ngie/more-tests/contrib/apr/poll/unix/pollcb.c
  user/ngie/more-tests/contrib/apr/poll/unix/port.c
  user/ngie/more-tests/contrib/apr/poll/unix/z_asio.c
  user/ngie/more-tests/contrib/apr/tables/apr_skiplist.c
  user/ngie/more-tests/contrib/binutils/gas/config/tc-i386.c
  user/ngie/more-tests/contrib/bsnmp/snmp_mibII/mibII_ip.c
  user/ngie/more-tests/contrib/gcc/c-cppbuiltin.c
  user/ngie/more-tests/contrib/gcc/cfgexpand.c
  user/ngie/more-tests/contrib/gcc/common.opt
  user/ngie/more-tests/contrib/gcc/doc/cpp.texi
  user/ngie/more-tests/contrib/gcc/doc/gcc.1
  user/ngie/more-tests/contrib/gcc/doc/invoke.texi
  user/ngie/more-tests/contrib/gcc/gcc.c
  user/ngie/more-tests/contrib/libarchive/libarchive/archive_read_support_format_tar.c
  user/ngie/more-tests/contrib/llvm/tools/lldb/docs/lldb.1
  user/ngie/more-tests/contrib/sendmail/FREEBSD-upgrade
  user/ngie/more-tests/contrib/serf/CHANGES
  user/ngie/more-tests/contrib/serf/auth/auth_spnego_sspi.c
  user/ngie/more-tests/contrib/serf/buckets/deflate_buckets.c
  user/ngie/more-tests/contrib/serf/buckets/ssl_buckets.c
  user/ngie/more-tests/contrib/serf/serf.h
  user/ngie/more-tests/contrib/sqlite3/Makefile.am
  user/ngie/more-tests/contrib/sqlite3/Makefile.in
  user/ngie/more-tests/contrib/sqlite3/configure
  user/ngie/more-tests/contrib/sqlite3/configure.ac
  user/ngie/more-tests/contrib/sqlite3/shell.c
  user/ngie/more-tests/contrib/sqlite3/sqlite3.c
  user/ngie/more-tests/contrib/sqlite3/sqlite3.h
  user/ngie/more-tests/contrib/sqlite3/sqlite3ext.h
  user/ngie/more-tests/contrib/subversion/CHANGES
  user/ngie/more-tests/contrib/subversion/Makefile.in
  user/ngie/more-tests/contrib/subversion/NOTICE
  user/ngie/more-tests/contrib/subversion/autogen.sh
  user/ngie/more-tests/contrib/subversion/build-outputs.mk
  user/ngie/more-tests/contrib/subversion/build.conf
  user/ngie/more-tests/contrib/subversion/configure
  user/ngie/more-tests/contrib/subversion/configure.ac
  user/ngie/more-tests/contrib/subversion/get-deps.sh
  user/ngie/more-tests/contrib/subversion/subversion/include/private/svn_diff_private.h
  user/ngie/more-tests/contrib/subversion/subversion/include/private/svn_mergeinfo_private.h
  user/ngie/more-tests/contrib/subversion/subversion/include/private/svn_repos_private.h
  user/ngie/more-tests/contrib/subversion/subversion/include/private/svn_sqlite.h
  user/ngie/more-tests/contrib/subversion/subversion/include/svn_io.h
  user/ngie/more-tests/contrib/subversion/subversion/include/svn_version.h
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_client/copy.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_client/externals.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_client/log.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_client/merge.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_client/patch.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_client/upgrade.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_delta/svndiff.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_diff/parse-diff.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_diff/util.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_fs_fs/caching.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_fs_fs/tree.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_ra_serf/commit.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_ra_serf/options.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_repos/commit.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_repos/load-fs-vtable.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_repos/rev_hunt.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_subr/cache-membuffer.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_subr/config.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_subr/dso.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_subr/error.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_subr/gpg_agent.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_subr/io.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_subr/mergeinfo.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_subr/string.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_subr/version.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/adm_ops.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/cleanup.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/conflicts.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/copy.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/diff.h
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/diff_editor.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/diff_local.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/entries.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/externals.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/update_editor.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/wc-metadata.sql
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/wc.h
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/wc_db.c
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/wc_db.h
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/wc_db_private.h
  user/ngie/more-tests/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c
  user/ngie/more-tests/contrib/subversion/subversion/svn/conflict-callbacks.c
  user/ngie/more-tests/contrib/subversion/subversion/svn/list-cmd.c
  user/ngie/more-tests/contrib/subversion/subversion/svn/svn.c
  user/ngie/more-tests/contrib/subversion/subversion/svn_private_config.h.in
  user/ngie/more-tests/contrib/subversion/subversion/svnadmin/svnadmin.c
  user/ngie/more-tests/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
  user/ngie/more-tests/contrib/subversion/subversion/svnrdump/load_editor.c
  user/ngie/more-tests/contrib/subversion/subversion/svnserve/serve.c
  user/ngie/more-tests/contrib/subversion/subversion/svnsync/sync.c
  user/ngie/more-tests/contrib/subversion/win-tests.py
  user/ngie/more-tests/crypto/openssh/auth2-chall.c
  user/ngie/more-tests/crypto/openssh/sshconnect.c
  user/ngie/more-tests/etc/defaults/rc.conf
  user/ngie/more-tests/etc/devd/usb.conf
  user/ngie/more-tests/etc/group
  user/ngie/more-tests/etc/mtree/BSD.usr.dist
  user/ngie/more-tests/etc/portsnap.conf
  user/ngie/more-tests/etc/rc.d/rctl
  user/ngie/more-tests/etc/rc.subr
  user/ngie/more-tests/gnu/usr.bin/binutils/Makefile
  user/ngie/more-tests/gnu/usr.bin/cc/Makefile
  user/ngie/more-tests/lib/libarchive/test/Makefile
  user/ngie/more-tests/lib/libc/amd64/sys/__vdso_gettc.c
  user/ngie/more-tests/lib/libc/i386/sys/__vdso_gettc.c
  user/ngie/more-tests/lib/libc/locale/utf8.c
  user/ngie/more-tests/lib/libc/stdio/open_memstream.3
  user/ngie/more-tests/lib/libc/sys/__vdso_gettimeofday.c
  user/ngie/more-tests/lib/libc/sys/kqueue.2
  user/ngie/more-tests/lib/libc/sys/shutdown.2
  user/ngie/more-tests/lib/libc/sys/unlink.2
  user/ngie/more-tests/lib/libsqlite3/Makefile
  user/ngie/more-tests/lib/libthr/arch/amd64/Makefile.inc
  user/ngie/more-tests/lib/libthr/arch/i386/Makefile.inc
  user/ngie/more-tests/lib/libthr/thread/thr_rtld.c
  user/ngie/more-tests/lib/libthr/thread/thr_sig.c
  user/ngie/more-tests/lib/msun/src/s_exp2.c
  user/ngie/more-tests/libexec/rtld-elf/amd64/Makefile.inc
  user/ngie/more-tests/libexec/rtld-elf/i386/Makefile.inc
  user/ngie/more-tests/libexec/ypxfr/ypxfr_getmap.c
  user/ngie/more-tests/libexec/ypxfr/ypxfr_main.c
  user/ngie/more-tests/libexec/ypxfr/ypxfrd_getmap.c
  user/ngie/more-tests/release/doc/en_US.ISO8859-1/hardware/article.xml
  user/ngie/more-tests/release/doc/en_US.ISO8859-1/relnotes/article.xml
  user/ngie/more-tests/release/tools/ec2.conf
  user/ngie/more-tests/sbin/geom/class/eli/geli.8
  user/ngie/more-tests/sbin/geom/class/eli/geom_eli.c
  user/ngie/more-tests/sbin/ipfw/ipfw2.c
  user/ngie/more-tests/sbin/mdconfig/mdconfig.8
  user/ngie/more-tests/sbin/routed/input.c
  user/ngie/more-tests/sbin/setkey/parse.y
  user/ngie/more-tests/sbin/setkey/setkey.8
  user/ngie/more-tests/sbin/setkey/token.l
  user/ngie/more-tests/sbin/swapon/swapon.c
  user/ngie/more-tests/sbin/sysctl/sysctl.c
  user/ngie/more-tests/share/man/man4/Makefile
  user/ngie/more-tests/share/man/man4/bwi.4
  user/ngie/more-tests/share/man/man4/ctl.4
  user/ngie/more-tests/share/man/man4/pms.4
  user/ngie/more-tests/share/man/man4/proto.4
  user/ngie/more-tests/share/man/man4/ral.4
  user/ngie/more-tests/share/man/man4/uftdi.4
  user/ngie/more-tests/share/man/man4/wlan.4
  user/ngie/more-tests/share/man/man5/fstab.5
  user/ngie/more-tests/share/man/man5/src.conf.5
  user/ngie/more-tests/share/man/man9/CTASSERT.9
  user/ngie/more-tests/share/man/man9/Makefile
  user/ngie/more-tests/share/man/man9/atomic.9
  user/ngie/more-tests/share/man/man9/pmap.9
  user/ngie/more-tests/share/man/man9/sysctl.9
  user/ngie/more-tests/share/misc/committers-ports.dot
  user/ngie/more-tests/share/misc/committers-src.dot
  user/ngie/more-tests/share/mk/bsd.cpu.mk
  user/ngie/more-tests/share/mk/src.opts.mk
  user/ngie/more-tests/sys/amd64/amd64/genassym.c
  user/ngie/more-tests/sys/amd64/amd64/machdep.c
  user/ngie/more-tests/sys/amd64/amd64/mp_machdep.c
  user/ngie/more-tests/sys/amd64/amd64/pmap.c
  user/ngie/more-tests/sys/amd64/cloudabi64/cloudabi64_sysvec.c
  user/ngie/more-tests/sys/amd64/include/atomic.h
  user/ngie/more-tests/sys/amd64/include/in_cksum.h
  user/ngie/more-tests/sys/amd64/include/md_var.h
  user/ngie/more-tests/sys/arm/arm/machdep.c
  user/ngie/more-tests/sys/arm/arm/pmap-v6-new.c
  user/ngie/more-tests/sys/arm/arm/pmap-v6.c
  user/ngie/more-tests/sys/arm/arm/pmap.c
  user/ngie/more-tests/sys/arm/at91/at91_machdep.c
  user/ngie/more-tests/sys/arm/cavium/cns11xx/econa_machdep.c
  user/ngie/more-tests/sys/arm/conf/BEAGLEBONE
  user/ngie/more-tests/sys/arm/include/float.h
  user/ngie/more-tests/sys/arm/include/param.h
  user/ngie/more-tests/sys/arm/include/pcpu.h
  user/ngie/more-tests/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
  user/ngie/more-tests/sys/arm/ti/ti_gpio.c
  user/ngie/more-tests/sys/arm/xscale/i80321/ep80219_machdep.c
  user/ngie/more-tests/sys/arm/xscale/i80321/iq31244_machdep.c
  user/ngie/more-tests/sys/arm/xscale/i8134x/crb_machdep.c
  user/ngie/more-tests/sys/arm/xscale/ixp425/avila_machdep.c
  user/ngie/more-tests/sys/arm/xscale/pxa/pxa_machdep.c
  user/ngie/more-tests/sys/arm64/arm64/elf_machdep.c
  user/ngie/more-tests/sys/arm64/arm64/gic_v3.c
  user/ngie/more-tests/sys/arm64/arm64/gic_v3_its.c
  user/ngie/more-tests/sys/arm64/arm64/gic_v3_var.h
  user/ngie/more-tests/sys/arm64/arm64/machdep.c
  user/ngie/more-tests/sys/arm64/arm64/mem.c
  user/ngie/more-tests/sys/arm64/arm64/pmap.c
  user/ngie/more-tests/sys/arm64/arm64/stack_machdep.c
  user/ngie/more-tests/sys/arm64/arm64/swtch.S
  user/ngie/more-tests/sys/arm64/arm64/trap.c
  user/ngie/more-tests/sys/arm64/arm64/uio_machdep.c
  user/ngie/more-tests/sys/arm64/arm64/vfp.c
  user/ngie/more-tests/sys/arm64/arm64/vm_machdep.c
  user/ngie/more-tests/sys/arm64/conf/GENERIC
  user/ngie/more-tests/sys/arm64/include/atomic.h
  user/ngie/more-tests/sys/arm64/include/cpu.h
  user/ngie/more-tests/sys/arm64/include/float.h
  user/ngie/more-tests/sys/arm64/include/in_cksum.h
  user/ngie/more-tests/sys/arm64/include/vfp.h
  user/ngie/more-tests/sys/arm64/include/vmparam.h
  user/ngie/more-tests/sys/boot/common/module.c
  user/ngie/more-tests/sys/boot/forth/loader.conf
  user/ngie/more-tests/sys/boot/forth/loader.rc
  user/ngie/more-tests/sys/boot/forth/menu.rc
  user/ngie/more-tests/sys/boot/i386/loader/Makefile
  user/ngie/more-tests/sys/boot/mips/beri/loader/Makefile
  user/ngie/more-tests/sys/boot/pc98/loader/Makefile
  user/ngie/more-tests/sys/boot/powerpc/kboot/Makefile
  user/ngie/more-tests/sys/boot/powerpc/ofw/Makefile
  user/ngie/more-tests/sys/boot/powerpc/ps3/Makefile
  user/ngie/more-tests/sys/boot/sparc64/loader/Makefile
  user/ngie/more-tests/sys/cam/ata/ata_da.c
  user/ngie/more-tests/sys/cam/ctl/ctl.c
  user/ngie/more-tests/sys/cam/ctl/ctl.h
  user/ngie/more-tests/sys/cam/ctl/ctl_backend_block.c
  user/ngie/more-tests/sys/cam/ctl/ctl_cmd_table.c
  user/ngie/more-tests/sys/cam/ctl/ctl_private.h
  user/ngie/more-tests/sys/cam/ctl/ctl_ser_table.c
  user/ngie/more-tests/sys/cam/ctl/ctl_tpc.c
  user/ngie/more-tests/sys/cddl/compat/opensolaris/sys/kstat.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
  user/ngie/more-tests/sys/cddl/dev/fbt/aarch64/fbt_isa.c
  user/ngie/more-tests/sys/cddl/dev/fbt/arm/fbt_isa.c
  user/ngie/more-tests/sys/cddl/dev/fbt/fbt.h
  user/ngie/more-tests/sys/cddl/dev/fbt/powerpc/fbt_isa.c
  user/ngie/more-tests/sys/cddl/dev/fbt/x86/fbt_isa.c
  user/ngie/more-tests/sys/compat/cloudabi/cloudabi_clock.c
  user/ngie/more-tests/sys/compat/cloudabi/cloudabi_fd.c
  user/ngie/more-tests/sys/compat/cloudabi/cloudabi_file.c
  user/ngie/more-tests/sys/compat/cloudabi/cloudabi_futex.c
  user/ngie/more-tests/sys/compat/cloudabi/cloudabi_proc.c
  user/ngie/more-tests/sys/compat/cloudabi/cloudabi_sock.c
  user/ngie/more-tests/sys/compat/cloudabi/cloudabi_thread.c
  user/ngie/more-tests/sys/compat/cloudabi/cloudabi_util.h
  user/ngie/more-tests/sys/compat/cloudabi64/cloudabi64_poll.c
  user/ngie/more-tests/sys/compat/cloudabi64/cloudabi64_proto.h
  user/ngie/more-tests/sys/compat/cloudabi64/cloudabi64_syscall.h
  user/ngie/more-tests/sys/compat/cloudabi64/cloudabi64_syscalls.c
  user/ngie/more-tests/sys/compat/cloudabi64/cloudabi64_sysent.c
  user/ngie/more-tests/sys/compat/cloudabi64/cloudabi64_systrace_args.c
  user/ngie/more-tests/sys/compat/cloudabi64/syscalls.master
  user/ngie/more-tests/sys/compat/linux/linux_event.c
  user/ngie/more-tests/sys/compat/linux/linux_file.c
  user/ngie/more-tests/sys/compat/linux/linux_fork.c
  user/ngie/more-tests/sys/conf/WITHOUT_SOURCELESS_UCODE
  user/ngie/more-tests/sys/conf/files
  user/ngie/more-tests/sys/conf/files.amd64
  user/ngie/more-tests/sys/conf/files.arm64
  user/ngie/more-tests/sys/conf/options
  user/ngie/more-tests/sys/conf/options.arm64
  user/ngie/more-tests/sys/contrib/cloudabi/syscalldefs_md.h
  user/ngie/more-tests/sys/contrib/cloudabi/syscalldefs_mi.h
  user/ngie/more-tests/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
  user/ngie/more-tests/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c
  user/ngie/more-tests/sys/crypto/aesni/aesni.h
  user/ngie/more-tests/sys/crypto/aesni/aesni_ghash.c
  user/ngie/more-tests/sys/ddb/db_ps.c
  user/ngie/more-tests/sys/dev/ata/ata-all.c
  user/ngie/more-tests/sys/dev/ata/ata-lowlevel.c
  user/ngie/more-tests/sys/dev/ata/chipsets/ata-intel.c
  user/ngie/more-tests/sys/dev/ath/if_ath.c
  user/ngie/more-tests/sys/dev/bxe/bxe.c
  user/ngie/more-tests/sys/dev/bxe/bxe.h
  user/ngie/more-tests/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  user/ngie/more-tests/sys/dev/cxgb/ulp/tom/cxgb_listen.c
  user/ngie/more-tests/sys/dev/cxgbe/firmware/t4fw_interface.h
  user/ngie/more-tests/sys/dev/cxgbe/t4_main.c
  user/ngie/more-tests/sys/dev/cxgbe/tom/t4_connect.c
  user/ngie/more-tests/sys/dev/cxgbe/tom/t4_cpl_io.c
  user/ngie/more-tests/sys/dev/cxgbe/tom/t4_listen.c
  user/ngie/more-tests/sys/dev/cxgbe/tom/t4_tom.c
  user/ngie/more-tests/sys/dev/drm/drmP.h
  user/ngie/more-tests/sys/dev/drm2/drmP.h
  user/ngie/more-tests/sys/dev/drm2/i915/i915_drv.h
  user/ngie/more-tests/sys/dev/drm2/i915/i915_gem.c
  user/ngie/more-tests/sys/dev/drm2/i915/i915_gem_gtt.c
  user/ngie/more-tests/sys/dev/e1000/if_em.c
  user/ngie/more-tests/sys/dev/e1000/if_igb.c
  user/ngie/more-tests/sys/dev/iscsi/iscsi.c
  user/ngie/more-tests/sys/dev/ixgbe/if_ix.c
  user/ngie/more-tests/sys/dev/mii/brgphy.c
  user/ngie/more-tests/sys/dev/mii/miidevs
  user/ngie/more-tests/sys/dev/mmc/host/dwmmc.c
  user/ngie/more-tests/sys/dev/mps/mps.c
  user/ngie/more-tests/sys/dev/mps/mps_config.c
  user/ngie/more-tests/sys/dev/mps/mpsvar.h
  user/ngie/more-tests/sys/dev/nand/nfc_rb.c
  user/ngie/more-tests/sys/dev/nvme/nvme.c
  user/ngie/more-tests/sys/dev/ofw/ofw_cpu.c
  user/ngie/more-tests/sys/dev/pci/pci_pci.c
  user/ngie/more-tests/sys/dev/pms/freebsd/driver/common/lxutil.c
  user/ngie/more-tests/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
  user/ngie/more-tests/sys/dev/proto/proto_busdma.c
  user/ngie/more-tests/sys/dev/uart/uart_bus.h
  user/ngie/more-tests/sys/dev/uart/uart_core.c
  user/ngie/more-tests/sys/dev/uart/uart_tty.c
  user/ngie/more-tests/sys/dev/usb/controller/dwc_otg.c
  user/ngie/more-tests/sys/dev/usb/controller/dwc_otg.h
  user/ngie/more-tests/sys/dev/usb/controller/xhci.c
  user/ngie/more-tests/sys/dev/usb/controller/xhci_pci.c
  user/ngie/more-tests/sys/dev/usb/net/if_urndis.c
  user/ngie/more-tests/sys/dev/usb/serial/uftdi.c
  user/ngie/more-tests/sys/dev/usb/serial/uftdi_reg.h
  user/ngie/more-tests/sys/dev/usb/uftdiio.h
  user/ngie/more-tests/sys/dev/vt/colors/vt_termcolors.c
  user/ngie/more-tests/sys/dev/vt/hw/efifb/efifb.c
  user/ngie/more-tests/sys/dev/vt/hw/fb/vt_early_fb.c
  user/ngie/more-tests/sys/dev/vt/hw/fb/vt_fb.c
  user/ngie/more-tests/sys/dev/wtap/if_wtap.c
  user/ngie/more-tests/sys/dev/wtap/if_wtapvar.h
  user/ngie/more-tests/sys/dev/xen/balloon/balloon.c
  user/ngie/more-tests/sys/dev/xen/blkfront/blkfront.c
  user/ngie/more-tests/sys/dev/xen/blkfront/block.h
  user/ngie/more-tests/sys/dev/xen/control/control.c
  user/ngie/more-tests/sys/dev/xen/netback/netback.c
  user/ngie/more-tests/sys/dev/xen/netfront/netfront.c
  user/ngie/more-tests/sys/dev/xen/pcifront/pcifront.c
  user/ngie/more-tests/sys/fs/devfs/devfs_vnops.c
  user/ngie/more-tests/sys/fs/ext2fs/ext2_subr.c
  user/ngie/more-tests/sys/fs/nfsclient/nfs_clport.c
  user/ngie/more-tests/sys/fs/nfsserver/nfs_nfsdstate.c
  user/ngie/more-tests/sys/geom/eli/g_eli.c
  user/ngie/more-tests/sys/geom/eli/g_eli.h
  user/ngie/more-tests/sys/geom/eli/g_eli_ctl.c
  user/ngie/more-tests/sys/geom/eli/g_eli_integrity.c
  user/ngie/more-tests/sys/geom/eli/g_eli_privacy.c
  user/ngie/more-tests/sys/geom/geom_dev.c
  user/ngie/more-tests/sys/geom/geom_io.c
  user/ngie/more-tests/sys/geom/uncompress/g_uncompress.c
  user/ngie/more-tests/sys/geom/uzip/g_uzip.c
  user/ngie/more-tests/sys/i386/i386/genassym.c
  user/ngie/more-tests/sys/i386/i386/locore.s
  user/ngie/more-tests/sys/i386/i386/machdep.c
  user/ngie/more-tests/sys/i386/i386/mp_machdep.c
  user/ngie/more-tests/sys/i386/i386/pmap.c
  user/ngie/more-tests/sys/i386/i386/sys_machdep.c
  user/ngie/more-tests/sys/i386/i386/vm_machdep.c
  user/ngie/more-tests/sys/i386/include/atomic.h
  user/ngie/more-tests/sys/i386/include/in_cksum.h
  user/ngie/more-tests/sys/i386/include/md_var.h
  user/ngie/more-tests/sys/i386/include/param.h
  user/ngie/more-tests/sys/i386/include/pcpu.h
  user/ngie/more-tests/sys/kern/init_main.c
  user/ngie/more-tests/sys/kern/kern_descrip.c
  user/ngie/more-tests/sys/kern/kern_event.c
  user/ngie/more-tests/sys/kern/kern_exec.c
  user/ngie/more-tests/sys/kern/kern_fork.c
  user/ngie/more-tests/sys/kern/kern_kthread.c
  user/ngie/more-tests/sys/kern/kern_linker.c
  user/ngie/more-tests/sys/kern/kern_lock.c
  user/ngie/more-tests/sys/kern/kern_mutex.c
  user/ngie/more-tests/sys/kern/kern_rmlock.c
  user/ngie/more-tests/sys/kern/kern_rwlock.c
  user/ngie/more-tests/sys/kern/kern_sharedpage.c
  user/ngie/more-tests/sys/kern/kern_shutdown.c
  user/ngie/more-tests/sys/kern/kern_sx.c
  user/ngie/more-tests/sys/kern/kern_sysctl.c
  user/ngie/more-tests/sys/kern/kern_tc.c
  user/ngie/more-tests/sys/kern/kern_umtx.c
  user/ngie/more-tests/sys/kern/sched_4bsd.c
  user/ngie/more-tests/sys/kern/sched_ule.c
  user/ngie/more-tests/sys/kern/subr_param.c
  user/ngie/more-tests/sys/kern/sys_pipe.c
  user/ngie/more-tests/sys/kern/sys_process.c
  user/ngie/more-tests/sys/kern/uipc_mbuf.c
  user/ngie/more-tests/sys/kern/uipc_mbuf2.c
  user/ngie/more-tests/sys/kern/uipc_shm.c
  user/ngie/more-tests/sys/kern/uipc_socket.c
  user/ngie/more-tests/sys/kern/uipc_syscalls.c
  user/ngie/more-tests/sys/kern/vfs_bio.c
  user/ngie/more-tests/sys/kern/vfs_init.c
  user/ngie/more-tests/sys/kern/vfs_subr.c
  user/ngie/more-tests/sys/kern/vfs_vnops.c
  user/ngie/more-tests/sys/mips/conf/XLR
  user/ngie/more-tests/sys/mips/conf/XLR64
  user/ngie/more-tests/sys/mips/conf/XLRN32
  user/ngie/more-tests/sys/mips/include/float.h
  user/ngie/more-tests/sys/mips/include/in_cksum.h
  user/ngie/more-tests/sys/mips/mips/pmap.c
  user/ngie/more-tests/sys/mips/rmi/files.xlr
  user/ngie/more-tests/sys/mips/rmi/xlr_i2c.c
  user/ngie/more-tests/sys/modules/Makefile
  user/ngie/more-tests/sys/modules/cxgbe/t4_firmware/Makefile
  user/ngie/more-tests/sys/modules/cxgbe/t5_firmware/Makefile
  user/ngie/more-tests/sys/modules/if_stf/Makefile
  user/ngie/more-tests/sys/modules/zfs/Makefile
  user/ngie/more-tests/sys/net/bpf.c
  user/ngie/more-tests/sys/net/bpf.h
  user/ngie/more-tests/sys/net/bpf_buffer.c
  user/ngie/more-tests/sys/net/if.c
  user/ngie/more-tests/sys/net/if_gif.c
  user/ngie/more-tests/sys/net/if_llatbl.c
  user/ngie/more-tests/sys/net/if_llatbl.h
  user/ngie/more-tests/sys/net/if_spppsubr.c
  user/ngie/more-tests/sys/net/if_stf.c
  user/ngie/more-tests/sys/net/pfkeyv2.h
  user/ngie/more-tests/sys/net/radix.c
  user/ngie/more-tests/sys/net/radix.h
  user/ngie/more-tests/sys/net/route.c
  user/ngie/more-tests/sys/net/route.h
  user/ngie/more-tests/sys/netinet/if_ether.c
  user/ngie/more-tests/sys/netinet/igmp.c
  user/ngie/more-tests/sys/netinet/in.c
  user/ngie/more-tests/sys/netinet/in_gif.c
  user/ngie/more-tests/sys/netinet/in_mcast.c
  user/ngie/more-tests/sys/netinet/in_pcb.c
  user/ngie/more-tests/sys/netinet/in_pcb.h
  user/ngie/more-tests/sys/netinet/in_rmx.c
  user/ngie/more-tests/sys/netinet/in_var.h
  user/ngie/more-tests/sys/netinet/ip_ecn.h
  user/ngie/more-tests/sys/netinet/ip_icmp.c
  user/ngie/more-tests/sys/netinet/ip_input.c
  user/ngie/more-tests/sys/netinet/ip_output.c
  user/ngie/more-tests/sys/netinet/raw_ip.c
  user/ngie/more-tests/sys/netinet/sctp_asconf.c
  user/ngie/more-tests/sys/netinet/sctp_indata.c
  user/ngie/more-tests/sys/netinet/sctp_indata.h
  user/ngie/more-tests/sys/netinet/sctp_input.c
  user/ngie/more-tests/sys/netinet/sctp_output.c
  user/ngie/more-tests/sys/netinet/sctp_pcb.c
  user/ngie/more-tests/sys/netinet/sctp_timer.c
  user/ngie/more-tests/sys/netinet/sctputil.c
  user/ngie/more-tests/sys/netinet/tcp_input.c
  user/ngie/more-tests/sys/netinet/tcp_reass.c
  user/ngie/more-tests/sys/netinet/tcp_subr.c
  user/ngie/more-tests/sys/netinet/tcp_syncache.c
  user/ngie/more-tests/sys/netinet/tcp_timer.c
  user/ngie/more-tests/sys/netinet/tcp_timewait.c
  user/ngie/more-tests/sys/netinet/tcp_usrreq.c
  user/ngie/more-tests/sys/netinet/tcp_var.h
  user/ngie/more-tests/sys/netinet/toecore.c
  user/ngie/more-tests/sys/netinet6/in6.c
  user/ngie/more-tests/sys/netinet6/in6_gif.c
  user/ngie/more-tests/sys/netinet6/in6_ifattach.c
  user/ngie/more-tests/sys/netinet6/in6_pcb.c
  user/ngie/more-tests/sys/netinet6/in6_rmx.c
  user/ngie/more-tests/sys/netinet6/in6_src.c
  user/ngie/more-tests/sys/netinet6/in6_var.h
  user/ngie/more-tests/sys/netinet6/ip6_input.c
  user/ngie/more-tests/sys/netinet6/ip6_mroute.c
  user/ngie/more-tests/sys/netinet6/ip6_output.c
  user/ngie/more-tests/sys/netinet6/ip6_var.h
  user/ngie/more-tests/sys/netinet6/nd6.c
  user/ngie/more-tests/sys/netinet6/nd6.h
  user/ngie/more-tests/sys/netinet6/nd6_rtr.c
  user/ngie/more-tests/sys/netipsec/ipsec_output.c
  user/ngie/more-tests/sys/netipsec/key.c
  user/ngie/more-tests/sys/netipsec/key_debug.c
  user/ngie/more-tests/sys/netipsec/keydb.h
  user/ngie/more-tests/sys/netipsec/xform.h
  user/ngie/more-tests/sys/netipsec/xform_ah.c
  user/ngie/more-tests/sys/netipsec/xform_esp.c
  user/ngie/more-tests/sys/netpfil/ipfw/ip_fw2.c
  user/ngie/more-tests/sys/netpfil/pf/pf.c
  user/ngie/more-tests/sys/netpfil/pf/pf_norm.c
  user/ngie/more-tests/sys/ofed/drivers/infiniband/core/mad.c
  user/ngie/more-tests/sys/ofed/drivers/net/mlx4/en_tx.c
  user/ngie/more-tests/sys/ofed/include/linux/in.h
  user/ngie/more-tests/sys/opencrypto/cryptodev.h
  user/ngie/more-tests/sys/opencrypto/cryptosoft.c
  user/ngie/more-tests/sys/opencrypto/xform.c
  user/ngie/more-tests/sys/powerpc/aim/mmu_oea.c
  user/ngie/more-tests/sys/powerpc/aim/mmu_oea64.c
  user/ngie/more-tests/sys/powerpc/booke/booke_machdep.c
  user/ngie/more-tests/sys/powerpc/booke/pmap.c
  user/ngie/more-tests/sys/powerpc/include/float.h
  user/ngie/more-tests/sys/powerpc/include/in_cksum.h
  user/ngie/more-tests/sys/powerpc/include/param.h
  user/ngie/more-tests/sys/powerpc/include/pcpu.h
  user/ngie/more-tests/sys/powerpc/powerpc/mmu_if.m
  user/ngie/more-tests/sys/powerpc/powerpc/pmap_dispatch.c
  user/ngie/more-tests/sys/rpc/svc_vc.c
  user/ngie/more-tests/sys/sparc64/include/float.h
  user/ngie/more-tests/sys/sparc64/include/in_cksum.h
  user/ngie/more-tests/sys/sparc64/include/pcpu.h
  user/ngie/more-tests/sys/sparc64/sparc64/pmap.c
  user/ngie/more-tests/sys/sys/ata.h
  user/ngie/more-tests/sys/sys/buf.h
  user/ngie/more-tests/sys/sys/cdefs.h
  user/ngie/more-tests/sys/sys/event.h
  user/ngie/more-tests/sys/sys/filedesc.h
  user/ngie/more-tests/sys/sys/mbuf.h
  user/ngie/more-tests/sys/sys/msg.h
  user/ngie/more-tests/sys/sys/param.h
  user/ngie/more-tests/sys/sys/proc.h
  user/ngie/more-tests/sys/sys/sem.h
  user/ngie/more-tests/sys/sys/shm.h
  user/ngie/more-tests/sys/sys/syscallsubr.h
  user/ngie/more-tests/sys/sys/sysctl.h
  user/ngie/more-tests/sys/sys/sysent.h
  user/ngie/more-tests/sys/sys/umtx.h
  user/ngie/more-tests/sys/ufs/ffs/ffs_subr.c
  user/ngie/more-tests/sys/vm/pmap.h
  user/ngie/more-tests/sys/vm/uma_core.c
  user/ngie/more-tests/sys/vm/vm_fault.c
  user/ngie/more-tests/sys/vm/vm_glue.c
  user/ngie/more-tests/sys/vm/vm_map.c
  user/ngie/more-tests/sys/vm/vm_map.h
  user/ngie/more-tests/sys/vm/vm_pager.c
  user/ngie/more-tests/sys/vm/vm_reserv.c
  user/ngie/more-tests/sys/x86/include/_types.h
  user/ngie/more-tests/sys/x86/include/float.h
  user/ngie/more-tests/sys/x86/include/specialreg.h
  user/ngie/more-tests/sys/x86/x86/identcpu.c
  user/ngie/more-tests/sys/x86/x86/mp_x86.c
  user/ngie/more-tests/sys/x86/xen/pv.c
  user/ngie/more-tests/sys/x86/xen/xen_intr.c
  user/ngie/more-tests/sys/xen/interface/io/blkif.h
  user/ngie/more-tests/tests/sys/kern/ptrace_test.c
  user/ngie/more-tests/tests/sys/kern/unix_seqpacket_test.c
  user/ngie/more-tests/tests/sys/vm/Makefile
  user/ngie/more-tests/tests/sys/vm/mmap_test.c
  user/ngie/more-tests/tools/build/mk/OptionalObsoleteFiles.inc
  user/ngie/more-tests/tools/build/options/WITHOUT_BINUTILS
  user/ngie/more-tests/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
  user/ngie/more-tests/tools/bus_space/C/lang.c
  user/ngie/more-tests/tools/bus_space/C/libbus.h
  user/ngie/more-tests/tools/bus_space/Python/lang.c
  user/ngie/more-tests/tools/bus_space/busdma.c
  user/ngie/more-tests/tools/bus_space/busdma.h
  user/ngie/more-tests/usr.bin/ar/ar.1
  user/ngie/more-tests/usr.bin/ar/ar.c
  user/ngie/more-tests/usr.bin/brandelf/brandelf.1
  user/ngie/more-tests/usr.bin/calendar/calendars/calendar.freebsd
  user/ngie/more-tests/usr.bin/elfcopy/Makefile
  user/ngie/more-tests/usr.bin/find/extern.h
  user/ngie/more-tests/usr.bin/find/misc.c
  user/ngie/more-tests/usr.bin/getopt/getopt.1
  user/ngie/more-tests/usr.bin/ident/ident.c
  user/ngie/more-tests/usr.bin/ipcrm/ipcrm.c
  user/ngie/more-tests/usr.bin/mkimg/image.c
  user/ngie/more-tests/usr.bin/mkimg/image.h
  user/ngie/more-tests/usr.bin/mkimg/mkimg.1
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-ebr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-apm.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-bsd.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/vhd.c
  user/ngie/more-tests/usr.bin/patch/common.h
  user/ngie/more-tests/usr.bin/patch/inp.c
  user/ngie/more-tests/usr.bin/patch/pathnames.h
  user/ngie/more-tests/usr.bin/patch/pch.c
  user/ngie/more-tests/usr.bin/svn/lib/libapr/apr.h
  user/ngie/more-tests/usr.bin/svn/lib/libapr/apr_private.h
  user/ngie/more-tests/usr.bin/svn/lib/libapr_util/apu.h
  user/ngie/more-tests/usr.bin/svn/lib/libapr_util/apu_config.h
  user/ngie/more-tests/usr.bin/svn/svn_private_config.h
  user/ngie/more-tests/usr.bin/svn/svnversion/Makefile
  user/ngie/more-tests/usr.bin/truss/syscall.h
  user/ngie/more-tests/usr.bin/truss/syscalls.c
  user/ngie/more-tests/usr.bin/units/units.c
  user/ngie/more-tests/usr.bin/wall/ttymsg.c
  user/ngie/more-tests/usr.bin/xargs/tests/Makefile
  user/ngie/more-tests/usr.bin/xargs/tests/regress.sh
  user/ngie/more-tests/usr.bin/xargs/xargs.1
  user/ngie/more-tests/usr.bin/xargs/xargs.c
  user/ngie/more-tests/usr.bin/ypcat/ypcat.c
  user/ngie/more-tests/usr.bin/ypmatch/ypmatch.c
  user/ngie/more-tests/usr.bin/ypwhich/ypwhich.c
  user/ngie/more-tests/usr.sbin/bhyve/bhyve.8
  user/ngie/more-tests/usr.sbin/bsdinstall/scripts/auto
  user/ngie/more-tests/usr.sbin/chkgrp/chkgrp.c
  user/ngie/more-tests/usr.sbin/crunch/crunchgen/crunchgen.c
  user/ngie/more-tests/usr.sbin/ctld/login.c
  user/ngie/more-tests/usr.sbin/fstyp/geli.c
  user/ngie/more-tests/usr.sbin/pw/Makefile
  user/ngie/more-tests/usr.sbin/pw/cpdir.c
  user/ngie/more-tests/usr.sbin/pw/grupd.c
  user/ngie/more-tests/usr.sbin/pw/psdate.c
  user/ngie/more-tests/usr.sbin/pw/pw.8
  user/ngie/more-tests/usr.sbin/pw/pw.c
  user/ngie/more-tests/usr.sbin/pw/pw.h
  user/ngie/more-tests/usr.sbin/pw/pw_conf.c
  user/ngie/more-tests/usr.sbin/pw/pw_group.c
  user/ngie/more-tests/usr.sbin/pw/pw_log.c
  user/ngie/more-tests/usr.sbin/pw/pw_nis.c
  user/ngie/more-tests/usr.sbin/pw/pw_user.c
  user/ngie/more-tests/usr.sbin/pw/pwupd.c
  user/ngie/more-tests/usr.sbin/pw/pwupd.h
  user/ngie/more-tests/usr.sbin/pw/rm_r.c
  user/ngie/more-tests/usr.sbin/pw/tests/Makefile
  user/ngie/more-tests/usr.sbin/pw/tests/pw_groupdel.sh
  user/ngie/more-tests/usr.sbin/pw/tests/pw_useradd.sh
  user/ngie/more-tests/usr.sbin/pw/tests/pw_userdel.sh
  user/ngie/more-tests/usr.sbin/pw/tests/pw_usermod.sh
  user/ngie/more-tests/usr.sbin/rtsold/probe.c
  user/ngie/more-tests/usr.sbin/syslogd/syslogd.c
  user/ngie/more-tests/usr.sbin/yp_mkdb/yp_mkdb.c
  user/ngie/more-tests/usr.sbin/yppush/yppush_main.c
  user/ngie/more-tests/usr.sbin/ypserv/yp_access.c
  user/ngie/more-tests/usr.sbin/ypserv/yp_dblookup.c
  user/ngie/more-tests/usr.sbin/ypserv/yp_error.c
  user/ngie/more-tests/usr.sbin/ypserv/yp_main.c
Directory Properties:
  user/ngie/more-tests/   (props changed)
  user/ngie/more-tests/cddl/   (props changed)
  user/ngie/more-tests/cddl/contrib/opensolaris/   (props changed)
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  user/ngie/more-tests/contrib/apr/   (props changed)
  user/ngie/more-tests/contrib/binutils/   (props changed)
  user/ngie/more-tests/contrib/elftoolchain/   (props changed)
  user/ngie/more-tests/contrib/gcc/   (props changed)
  user/ngie/more-tests/contrib/libarchive/   (props changed)
  user/ngie/more-tests/contrib/libarchive/libarchive/   (props changed)
  user/ngie/more-tests/contrib/llvm/   (props changed)
  user/ngie/more-tests/contrib/llvm/tools/lldb/   (props changed)
  user/ngie/more-tests/contrib/sendmail/   (props changed)
  user/ngie/more-tests/contrib/serf/   (props changed)
  user/ngie/more-tests/contrib/sqlite3/   (props changed)
  user/ngie/more-tests/contrib/subversion/   (props changed)
  user/ngie/more-tests/crypto/openssh/   (props changed)
  user/ngie/more-tests/etc/   (props changed)
  user/ngie/more-tests/gnu/usr.bin/binutils/   (props changed)
  user/ngie/more-tests/lib/libc/   (props changed)
  user/ngie/more-tests/sbin/   (props changed)
  user/ngie/more-tests/sbin/ipfw/   (props changed)
  user/ngie/more-tests/share/   (props changed)
  user/ngie/more-tests/share/man/man4/   (props changed)
  user/ngie/more-tests/sys/   (props changed)
  user/ngie/more-tests/sys/amd64/include/xen/   (props changed)
  user/ngie/more-tests/sys/boot/   (props changed)
  user/ngie/more-tests/sys/boot/powerpc/kboot/   (props changed)
  user/ngie/more-tests/sys/boot/powerpc/ofw/   (props changed)
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/   (props changed)
  user/ngie/more-tests/sys/conf/   (props changed)
  user/ngie/more-tests/usr.bin/calendar/   (props changed)
  user/ngie/more-tests/usr.bin/mkimg/   (props changed)
  user/ngie/more-tests/usr.sbin/bhyve/   (props changed)
  user/ngie/more-tests/usr.sbin/rtsold/   (props changed)

Modified: user/ngie/more-tests/Makefile.inc1
==============================================================================
--- user/ngie/more-tests/Makefile.inc1	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/Makefile.inc1	Mon Aug 10 18:27:54 2015	(r286585)
@@ -807,7 +807,7 @@ __installcheck_UGID:
 _zoneinfo=	zic tzsetup
 .endif
 
-ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
+ITOOLS=	[ awk cap_mkdb cat chflags chmod chown cmp cp \
 	date echo egrep find grep id install ${_install-info} \
 	ln lockf make mkdir mtree mv pwd_mkdb \
 	rm sed services_mkdb sh strip sysctl test true uname wc ${_zoneinfo} \

Modified: user/ngie/more-tests/ObsoleteFiles.inc
==============================================================================
--- user/ngie/more-tests/ObsoleteFiles.inc	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/ObsoleteFiles.inc	Mon Aug 10 18:27:54 2015	(r286585)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150802: Remove netbsd's test on pw(8)
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_test
 # 20150719: Remove libarchive.pc
 OLD_FILES+=usr/libdata/pkgconfig/libarchive.pc
 # 20150705: Rename DTrace provider man pages.

Modified: user/ngie/more-tests/UPDATING
==============================================================================
--- user/ngie/more-tests/UPDATING	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/UPDATING	Mon Aug 10 18:27:54 2015	(r286585)
@@ -31,6 +31,32 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150809:
+	The default group assigned to /dev/dri entries has been changed
+	from 'wheel' to 'video' with the id of '44'. If you want to have
+	access to the dri devices please add yourself to the video group
+	with:
+
+	# pw groupmod video -m $USER
+
+20150806:
+	The menu.rc and loader.rc files will now be replaced during 
+	upgrades. Please migrate local changes to menu.rc.local and
+	loader.rc.local instead.
+
+20150805:
+	GNU Binutils versions of addr2line, c++filt, nm, readelf, size,
+	strings and strip have been removed. The src.conf(5) knob
+	WITHOUT_ELFTOOLCHAIN_TOOLS no longer provides the binutils tools.
+
+20150728:
+	As ZFS requires more kernel stack pages than is the default on some
+	architectures e.g. i386, it now warns if KSTACK_PAGES is less than
+	ZFS_MIN_KSTACK_PAGES (which is 4 at the time of writing).
+
+	Please consider using 'options KSTACK_PAGES=X' where X is greater
+	than or equal to ZFS_MIN_KSTACK_PAGES i.e. 4 in such configurations.
+
 20150706:
 	sendmail has been updated to 8.15.2.  Starting with FreeBSD 11.0
 	and sendmail 8.15, sendmail uses uncompressed IPv6 addresses by
@@ -216,7 +242,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	taken from the ELF Tool Chain project rather than GNU binutils. They
 	should be drop-in replacements, with the addition of arm64 support.
 	The WITHOUT_ELFTOOLCHAIN_TOOLS= knob may be used to obtain the
-	binutils tools, if necessary.
+	binutils tools, if necessary. See 20150805 for updated information.
 
 20150105:
 	The default Unbound configuration now enables remote control
@@ -570,6 +596,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	  # pkg install pkg; ldd /usr/local/sbin/pkg | grep bsdyml
 
 20131010:
+	The stable/10 branch has been created in subversion from head
+	revision r256279.
+
+20131010:
 	The rc.d/jail script has been updated to support jail(8)
 	configuration file.  The "jail_<jname>_*" rc.conf(5) variables
 	for per-jail configuration are automatically converted to
@@ -1112,6 +1142,13 @@ COMMON ITEMS:
 	around can lead to problems if pam has changed too much from your
 	starting point to allow continued authentication after the upgrade.
 
+	This file should be read as a log of events. When a later event changes
+	information of a prior event, the prior event should not be deleted.
+	Instead, a pointer to the entry with the new information should be
+	placed in the old entry. Readers of this file should also sanity check
+	older entries before relying on them blindly. Authors of new entries
+	should write them with this in mind.
+
 	ZFS notes
 	---------
 	When upgrading the boot ZFS pool to a new version, always follow
@@ -1282,7 +1319,7 @@ FORMAT:
 
 This file contains a list, in reverse chronological order, of major
 breakages in tracking -current.  It is not guaranteed to be a complete
-list of such breakages, and only contains entries since October 10, 2007.
+list of such breakages, and only contains entries since September 23, 2011.
 If you need to see UPDATING entries from before that date, you will need
 to fetch an UPDATING file from an older FreeBSD release.
 

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -34,7 +34,7 @@
  *
  */
 
-lockstat:kernel:mtx_lock:adaptive-acquire
+lockstat:::adaptive-acquire
 {
 	mutex_owned();
 	exit(1);

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -34,7 +34,7 @@
  *
  */
 
-lockstat:kernel:mtx_lock:adaptive-acquire
+lockstat:::adaptive-acquire
 {
 	mutex_owned((kmutex_t *)arg0, 99);
 	exit(1);

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -36,7 +36,7 @@
  */
 
 
-lockstat:kernel:mtx_lock:adaptive-acquire
+lockstat:::adaptive-acquire
 {
 	mutex_type_adaptive();
 	exit(1);

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -35,7 +35,7 @@
  */
 
 
-lockstat:kernel:mtx_lock:adaptive-acquire
+lockstat:::adaptive-acquire
 {
 	mutex_type_adaptive((kmutex_t *)arg0, 99);
 	exit(1);

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -48,7 +48,7 @@ BEGIN
 	i = 0;
 }
 
-lockstat::mtx_lock:adaptive-acquire
+lockstat:::adaptive-acquire
 {
 
 	ptr = mutex_owner((struct mtx *)arg0);

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -44,7 +44,7 @@ BEGIN
 	ret = -99;
 }
 
-mtx_lock:adaptive-acquire
+lockstat:::adaptive-acquire
 {
 	ret = mutex_type_adaptive((struct mtx *)arg0);
 	i++;

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl	Mon Aug 10 18:27:54 2015	(r286585)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # CDDL HEADER START
 #

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl	Mon Aug 10 18:27:54 2015	(r286585)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # CDDL HEADER START
 #

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh	Mon Aug 10 18:27:54 2015	(r286585)
@@ -58,12 +58,25 @@ fi
 
 dtrace=$1
 local=127.0.0.1
-tcpport=22
 DIR=/var/tmp/dtest.$$
 
+tcpport=1024
+bound=5000
+while [ $tcpport -lt $bound ]; do
+	nc -z $local $tcpport >/dev/null || break
+	tcpport=$(($tcpport + 1))
+done
+if [ $tcpport -eq $bound ]; then
+	echo "couldn't find an available TCP port"
+	exit 1
+fi
+
 mkdir $DIR
 cd $DIR
 
+# nc will exit when the connection is closed.
+nc -l $local $tcpport &
+
 cat > test.pl <<-EOPERL
 	use IO::Socket;
 	my \$s = IO::Socket::INET->new(
@@ -76,7 +89,7 @@ cat > test.pl <<-EOPERL
 	sleep(2);
 EOPERL
 
-$dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE
+$dtrace -c 'perl test.pl' -qs /dev/stdin <<EODTRACE
 BEGIN
 {
 	ipsend = tcpsend = ipreceive = tcpreceive = 0;

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh	Mon Aug 10 18:27:54 2015	(r286585)
@@ -79,7 +79,7 @@ cat > test.pl <<-EOPERL
 	sleep(2);
 EOPERL
 
-$dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE
+$dtrace -c 'perl test.pl' -qs /dev/stdin <<EODTRACE
 BEGIN
 {
 	ipsend = tcpsend = ipreceive = tcpreceive = 0;

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh	Mon Aug 10 18:27:54 2015	(r286585)
@@ -82,7 +82,7 @@ cat > test.pl <<-EOPERL
 	sleep(2);
 EOPERL
 
-$dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE
+$dtrace -c 'perl test.pl' -qs /dev/stdin <<EODTRACE
 BEGIN
 {
 	ipsend = tcpsend = ipreceive = tcpreceive = 0;

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh	Mon Aug 10 18:27:54 2015	(r286585)
@@ -87,7 +87,7 @@ cat > test.pl <<-EOPERL
 	sleep(2);
 EOPERL
 
-$dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE
+$dtrace -c 'perl test.pl' -qs /dev/stdin <<EODTRACE
 BEGIN
 {
 	ipsend = tcpsend = ipreceive = tcpreceive = 0;

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Aug 10 18:27:54 2015	(r286585)
@@ -27,11 +27,11 @@
 .\" Copyright (c) 2013, Steven Hartland <smh at FreeBSD.org>
 .\" Copyright (c) 2014 Nexenta Systems, Inc. All Rights Reserved.
 .\" Copyright (c) 2014, Xin LI <delphij at FreeBSD.org>
-.\" Copyright (c) 2014, The FreeBSD Foundation, All Rights Reserved.
+.\" Copyright (c) 2014-2015, The FreeBSD Foundation, All Rights Reserved.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 12, 2014
+.Dd July 30, 2015
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -938,8 +938,24 @@ not be used by any other dataset.
 Disabling checksums is
 .Em NOT
 a recommended practice.
-.It Sy compression Ns = Ns Cm on | off | lzjb | gzip | gzip- Ns Ar N | zle | Cm lz4
-Controls the compression algorithm used for this dataset. The
+.It Sy compression Ns = Ns Cm on | off | lzjb | gzip | gzip- Ns Ar N | Cm zle | Cm lz4
+Controls the compression algorithm used for this dataset.
+Setting compression to
+.Cm on
+indicates that the current default compression algorithm should be used.
+The default balances compression and decompression speed, with compression
+ratio and is expected to work well on a wide variety of workloads.
+Unlike all other settings for this property, on does not select a fixed
+compression type.
+As new compression algorithms are added to ZFS and enabled on a pool, the
+default compression algorithm may change.
+The current default compression algorthm is either
+.Cm lzjb
+or, if the
+.Sy lz4_compress
+feature is enabled,
+.Cm lz4 .
+The
 .Cm lzjb
 compression algorithm is optimized for performance while providing decent data
 compression. Setting compression to

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c	Mon Aug 10 18:27:54 2015	(r286585)
@@ -1348,6 +1348,7 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
 	dtrace_aggdesc_t *agg;
 	caddr_t lim = (caddr_t)buf + len, limit;
 	char format[64] = "%";
+	size_t ret;
 	int i, aggrec, curagg = -1;
 	uint64_t normal;
 
@@ -1379,7 +1380,9 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
 		int prec = pfd->pfd_prec;
 		int rval;
 
+		const char *start;
 		char *f = format + 1; /* skip initial '%' */
+		size_t fmtsz = sizeof(format) - 1;
 		const dtrace_recdesc_t *rec;
 		dt_pfprint_f *func;
 		caddr_t addr;
@@ -1536,6 +1539,7 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
 			break;
 		}
 
+		start = f;
 		if (pfd->pfd_flags & DT_PFCONV_ALT)
 			*f++ = '#';
 		if (pfd->pfd_flags & DT_PFCONV_ZPAD)
@@ -1548,6 +1552,7 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
 			*f++ = '\'';
 		if (pfd->pfd_flags & DT_PFCONV_SPACE)
 			*f++ = ' ';
+		fmtsz -= f - start;
 
 		/*
 		 * If we're printing a stack and DT_PFCONV_LEFT is set, we
@@ -1558,13 +1563,20 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
 		if (func == pfprint_stack && (pfd->pfd_flags & DT_PFCONV_LEFT))
 			width = 0;
 
-		if (width != 0)
-			f += snprintf(f, sizeof (format), "%d", ABS(width));
+		if (width != 0) {
+			ret = snprintf(f, fmtsz, "%d", ABS(width));
+			f += ret;
+			fmtsz = MAX(0, fmtsz - ret);
+		}
 
-		if (prec > 0)
-			f += snprintf(f, sizeof (format), ".%d", prec);
+		if (prec > 0) {
+			ret = snprintf(f, fmtsz, ".%d", prec);
+			f += ret;
+			fmtsz = MAX(0, fmtsz - ret);
+		}
 
-		(void) strcpy(f, pfd->pfd_fmt);
+		if (strlcpy(f, pfd->pfd_fmt, fmtsz) >= fmtsz)
+			return (dt_set_errno(dtp, EDT_COMPILER));
 		pfd->pfd_rec = rec;
 
 		if (func(dtp, fp, format, pfd, addr, size, normal) < 0)

Modified: user/ngie/more-tests/cddl/lib/libdtrace/io.d
==============================================================================
--- user/ngie/more-tests/cddl/lib/libdtrace/io.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/lib/libdtrace/io.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -25,8 +25,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
+#pragma D depends_on module kernel
 #pragma D depends_on provider io
 
 typedef struct devinfo {

Modified: user/ngie/more-tests/cddl/lib/libdtrace/ip.d
==============================================================================
--- user/ngie/more-tests/cddl/lib/libdtrace/ip.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/lib/libdtrace/ip.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -25,6 +25,7 @@
  * Copyright (c) 2013 Mark Johnston <markj at freebsd.org>
  */
 
+#pragma D depends_on module kernel
 #pragma D depends_on provider ip
 
 /*

Modified: user/ngie/more-tests/cddl/lib/libdtrace/nfs.d
==============================================================================
--- user/ngie/more-tests/cddl/lib/libdtrace/nfs.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/lib/libdtrace/nfs.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -30,6 +30,7 @@
 
 #pragma	D depends_on library ip.d
 #pragma	D depends_on library net.d
+#pragma	D depends_on module kernel
 #pragma	D depends_on module nfs
 
 typedef struct nfsv4opinfo {

Modified: user/ngie/more-tests/cddl/lib/libdtrace/nfssrv.d
==============================================================================
--- user/ngie/more-tests/cddl/lib/libdtrace/nfssrv.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/lib/libdtrace/nfssrv.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -30,7 +30,8 @@
 
 #pragma	D depends_on library ip.d
 #pragma	D depends_on library net.d
-#pragma	D depends_on module nfs.d
+#pragma	D depends_on library nfs.d
+#pragma	D depends_on module kernel
 #pragma D depends_on module nfssrv
 
 #pragma D binding "1.5" translator

Modified: user/ngie/more-tests/cddl/lib/libdtrace/psinfo.d
==============================================================================
--- user/ngie/more-tests/cddl/lib/libdtrace/psinfo.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/lib/libdtrace/psinfo.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -28,6 +28,8 @@
  * Use is subject to license terms.
  */
 
+#pragma D depends_on module kernel
+
 typedef struct psinfo {
 	int	pr_nlwp;	/* number of threads */
 	pid_t	pr_pid;		/* unique process id */

Modified: user/ngie/more-tests/cddl/lib/libdtrace/regs_x86.d
==============================================================================
--- user/ngie/more-tests/cddl/lib/libdtrace/regs_x86.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/lib/libdtrace/regs_x86.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -28,8 +28,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"@(#)regs.d.in	1.1	04/09/28 SMI"
-
 inline int R_GS = 0;
 #pragma D binding "1.0" R_GS
 inline int R_FS = 1;

Modified: user/ngie/more-tests/cddl/lib/libdtrace/sched.d
==============================================================================
--- user/ngie/more-tests/cddl/lib/libdtrace/sched.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/lib/libdtrace/sched.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#pragma D depends_on module unix
+#pragma D depends_on module kernel
 #pragma D depends_on provider sched
 
 struct cpuinfo {

Modified: user/ngie/more-tests/cddl/lib/libdtrace/siftr.d
==============================================================================
--- user/ngie/more-tests/cddl/lib/libdtrace/siftr.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/lib/libdtrace/siftr.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -21,6 +21,7 @@
  * $FreeBSD$
  */
 
+#pragma D depends_on module kernel
 #pragma D depends_on module siftr
 #pragma D depends_on provider tcp
 

Modified: user/ngie/more-tests/cddl/lib/libdtrace/tcp.d
==============================================================================
--- user/ngie/more-tests/cddl/lib/libdtrace/tcp.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/lib/libdtrace/tcp.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -26,6 +26,7 @@
  */
 
 #pragma D depends_on library ip.d
+#pragma D depends_on module kernel
 #pragma D depends_on provider tcp
 
 /*

Modified: user/ngie/more-tests/cddl/lib/libdtrace/udp.d
==============================================================================
--- user/ngie/more-tests/cddl/lib/libdtrace/udp.d	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/lib/libdtrace/udp.d	Mon Aug 10 18:27:54 2015	(r286585)
@@ -26,6 +26,7 @@
  */
 
 #pragma D depends_on library ip.d
+#pragma D depends_on module kernel
 #pragma D depends_on provider udp
 
 /*

Modified: user/ngie/more-tests/cddl/usr.sbin/dtrace/Makefile
==============================================================================
--- user/ngie/more-tests/cddl/usr.sbin/dtrace/Makefile	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/cddl/usr.sbin/dtrace/Makefile	Mon Aug 10 18:27:54 2015	(r286585)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace
 
 PROG=		dtrace
@@ -22,4 +24,8 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 
 LIBADD=	dtrace
 
+.if ${MK_DTRACE_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Modified: user/ngie/more-tests/contrib/apr/CHANGES
==============================================================================
--- user/ngie/more-tests/contrib/apr/CHANGES	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/contrib/apr/CHANGES	Mon Aug 10 18:27:54 2015	(r286585)
@@ -1,4 +1,63 @@
                                                      -*- coding: utf-8 -*-
+Changes for APR 1.5.2
+
+  *) SECURITY: CVE-2015-1829 (cve.mitre.org)
+     APR applications using APR named pipe support on Windows can be 
+     vulnerable to a pipe squatting attack from a local process; the extent
+     of the vulnerability, when present, depends on the application.
+     Initial analysis and report was provided by John Hernandez of Casaba 
+     Security via HP SSRT Security Alert.  [Yann Ylavic]
+
+  *) apr_atomic: Fix errors when building on Visual Studio 2013 while
+     maintaining the ability to build on Visual Studio 6 with Windows
+     Server 2003 R2 SDK. PR 57191. [Gregg Smith]
+
+  *) Switch to generic atomics for early/unpatched Solaris 10 not exporting
+     some atomic functions.  PR 55418.  [Yann Ylavic]
+
+  *) apr_file_mktemp() on HP-UX: Remove limitation of 26 temporary files
+     per process.  PR 57677.  [Jeff Trawick]
+
+  *) apr_escape: Correctly calculate the size of the returned string in
+     apr_escape_path and set the correct return value in case we actually
+     escape the string. [<aduryagin gmail.com>] PR 57230.
+
+  *) pollcb on Windows: Handle calls with no file/socket descriptors.
+     Follow up to PR 49882. [Jeff Trawick, Yann Ylavic]
+
+  *) apr_poll(cb): fix error paths returned values and leaks.  [Yann Ylavic]
+
+  *) apr_thread_cond_*wait() on BeOS: Fix broken logic.  PR 45800.
+     [Jochen Voss (no e-mail)]
+
+  *) apr_skiplist: Optimize the number of allocations by reusing pooled or
+     malloc()ed nodes for the lifetime of the skiplist.  [Yann Ylavic]
+
+  *) apr_skiplist: Fix possible multiple-free() on the same value in
+     apr_skiplist_remove_all().  [Yann Ylavic]
+
+  *) apr_pollset: On z/OS, threadsafe apr_pollset_poll() may return
+     "EDC8102I Operation would block" under load.
+     [Pat Odonnell <patod us.ibm.com>]
+
+  *) On z/OS, apr_sockaddr_info_get() with family == APR_UNSPEC was not 
+     returning IPv4 addresses if any IPv6 addresses were returned. 
+     [Eric Covener]
+
+  *) Windows cmake build: Fix an incompatibility with cmake 2.8.12 and
+     later.  [Jeff Trawick]
+
+  *) apr_global_mutex/apr_proc_mutex: Resolve failures with the 
+     POSIX sem implementation in environments which receive signals.
+     [Jeff Trawick]
+
+  *) apr_skiplist: Fix potential corruption of skiplists leading to 
+     results or crashes. [Takashi Sato <takashi tks st>, Eric Covener]
+     PR 56654.
+
+  *) Improve platform detection by updating config.guess and config.sub.
+     [Rainer Jung]
+
 Changes for APR 1.5.1
 
   *) apr_os_proc_mutex_get() on Unix:  Avoid segfault for cross-
@@ -37,8 +96,8 @@ Changes for APR 1.5.1
   *) Correct a regression in 1.5.0 which affected out-of-tree
      builds on Unix.  [Rainer Jung]
 
-  *) Improve platform detection for bundled expat by updating
-     config.guess and config.sub. [Rainer Jung]
+  *) Improve platform detection by updating config.guess and config.sub.
+     [Rainer Jung]
 
 Changes for APR 1.5.0
 

Modified: user/ngie/more-tests/contrib/apr/CMakeLists.txt
==============================================================================
--- user/ngie/more-tests/contrib/apr/CMakeLists.txt	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/contrib/apr/CMakeLists.txt	Mon Aug 10 18:27:54 2015	(r286585)
@@ -234,6 +234,7 @@ SET(APR_TEST_SOURCES
   test/testprocmutex.c
   test/testrand.c
   test/testshm.c
+  test/testskiplist.c
   test/testsleep.c
   test/testsock.c
   test/testsockets.c
@@ -252,7 +253,6 @@ SET(APR_TEST_SOURCES
 
 SET(install_targets)
 SET(install_bin_pdb)
-SET(install_lib_pdb)
 
 # libapr-1 is shared, apr-1 is static
 ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc)
@@ -264,7 +264,6 @@ ADD_DEPENDENCIES(libapr-1 test_char_head
 
 ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
 SET(install_targets ${install_targets} apr-1)
-SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/apr-1.pdb)
 TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS})
 SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT")
 ADD_DEPENDENCIES(apr-1 test_char_header)
@@ -272,12 +271,10 @@ ADD_DEPENDENCIES(apr-1 test_char_header)
 # libaprapp-1 and aprapp-1 are static
 ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
 SET(install_targets ${install_targets} libaprapp-1)
-SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/libaprapp-1.pdb)
 SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT")
 
 ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
 SET(install_targets ${install_targets} aprapp-1)
-SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/aprapp-1.pdb)
 SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT")
 
 IF(APR_BUILD_TESTAPR)
@@ -394,10 +391,6 @@ IF(INSTALL_PDB)
   INSTALL(FILES ${install_bin_pdb}
           DESTINATION bin
           CONFIGURATIONS RelWithDebInfo Debug)
-
-  INSTALL(FILES ${install_lib_pdb}
-          DESTINATION lib
-          CONFIGURATIONS RelWithDebInfo Debug)
 ENDIF()
 
 INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)

Modified: user/ngie/more-tests/contrib/apr/Makefile.in
==============================================================================
--- user/ngie/more-tests/contrib/apr/Makefile.in	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/contrib/apr/Makefile.in	Mon Aug 10 18:27:54 2015	(r286585)
@@ -129,11 +129,11 @@ check: $(TARGET_LIB)
 etags:
 	etags `find . -name '*.[ch]'`
 
-make_tools_dir:
+OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+tools/gen_test_char.lo: tools/gen_test_char.c
 	$(APR_MKDIR) tools
+	$(LT_COMPILE)
 
-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
-tools/gen_test_char.lo: make_tools_dir
 tools/gen_test_char at EXEEXT@: $(OBJECTS_gen_test_char)
 	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
 

Modified: user/ngie/more-tests/contrib/apr/NOTICE
==============================================================================
--- user/ngie/more-tests/contrib/apr/NOTICE	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/contrib/apr/NOTICE	Mon Aug 10 18:27:54 2015	(r286585)
@@ -1,5 +1,5 @@
 Apache Portable Runtime
-Copyright (c) 2000-2014 The Apache Software Foundation.
+Copyright (c) 2000-2015 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: user/ngie/more-tests/contrib/apr/NWGNUmakefile
==============================================================================
--- user/ngie/more-tests/contrib/apr/NWGNUmakefile	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/contrib/apr/NWGNUmakefile	Mon Aug 10 18:27:54 2015	(r286585)
@@ -50,6 +50,7 @@ include $(APR_WORK)/build/NWGNUhead.inc
 #
 XINCDIRS	+= \
 			$(APR)/include \
+			$(APR)/include/private \
 			$(APR)/include/arch/NetWare \
 			$(APR)/include/arch/unix \
 			$(APR)/memory/unix \
@@ -293,11 +294,13 @@ FILES_nlm_exports = \
 FILES_lib_objs = \
 	$(OBJDIR)/apr_atomic.o \
 	$(OBJDIR)/apr_cpystrn.o \
+	$(OBJDIR)/apr_escape.o \
 	$(OBJDIR)/apr_fnmatch.o \
 	$(OBJDIR)/apr_getpass.o \
 	$(OBJDIR)/apr_hash.o \
 	$(OBJDIR)/apr_pools.o \
 	$(OBJDIR)/apr_random.o \
+	$(OBJDIR)/apr_skiplist.o \
 	$(OBJDIR)/apr_snprintf.o \
 	$(OBJDIR)/apr_strings.o \
 	$(OBJDIR)/apr_strnatcmp.o \
@@ -407,7 +410,7 @@ endif
 vpath %.c atomic/netware:strings:tables:passwd:lib:time/unix
 vpath %.c file_io/unix:locks/netware:misc/netware:misc/unix:threadproc/netware
 vpath %.c poll/unix:shmem/unix:support/unix:random/unix
-vpath %.c dso/netware:memory/unix:mmap/unix:user/netware
+vpath %.c dso/netware:memory/unix:mmap/unix:user/netware:encoding
 
 # Use the win32 network_io if Winsock is being used
 ifndef USE_STDSOCKETS

Modified: user/ngie/more-tests/contrib/apr/apr.dsp
==============================================================================
--- user/ngie/more-tests/contrib/apr/apr.dsp	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/contrib/apr/apr.dsp	Mon Aug 10 18:27:54 2015	(r286585)
@@ -907,69 +907,6 @@ SOURCE=.\include\apr_version.h
 # Begin Source File
 
 SOURCE=.\include\apr_want.h
-
-!IF  "$(CFG)" == "apr - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\include\apr_want.h
-
-".\LibR\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\include\apr_want.h
-
-".\LibD\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
-
-# Begin Custom Build
-InputPath=.\include\apr_want.h
-
-".\9x\LibR\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug9x"
-
-# Begin Custom Build
-InputPath=.\include\apr_want.h
-
-".\9x\LibD\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "apr - x64 Release"
-
-# Begin Custom Build
-InputPath=.\include\apr_want.h
-
-".\x64\LibR\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "apr - x64 Debug"
-
-# Begin Custom Build
-InputPath=.\include\apr_want.h
-
-".\x64\LibD\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ENDIF 
-
 # End Source File
 # End Group
 # End Target

Modified: user/ngie/more-tests/contrib/apr/apr.spec
==============================================================================
--- user/ngie/more-tests/contrib/apr/apr.spec	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/contrib/apr/apr.spec	Mon Aug 10 18:27:54 2015	(r286585)
@@ -3,7 +3,7 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.5.1
+Version: 1.5.2
 Release: 1
 License: Apache Software License
 Group: System Environment/Libraries
@@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc docs/APRDesign.html docs/canonical_filenames.html
 %doc docs/incomplete_types docs/non_apr_programs
-%doc --parents html
+%doc html
 %{_bindir}/apr*config
 %{_libdir}/libapr-%{aprver}.*a
 %{_libdir}/libapr-%{aprver}.so

Modified: user/ngie/more-tests/contrib/apr/build-outputs.mk
==============================================================================
--- user/ngie/more-tests/contrib/apr/build-outputs.mk	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/contrib/apr/build-outputs.mk	Mon Aug 10 18:27:54 2015	(r286585)
@@ -251,7 +251,7 @@ file_io/win32/filestat.lo: file_io/win32
 file_io/win32/filesys.lo: file_io/win32/filesys.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
 file_io/win32/flock.lo: file_io/win32/flock.c .make.dirs 
 file_io/win32/open.lo: file_io/win32/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/win32/pipe.lo: file_io/win32/pipe.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/win32/pipe.lo: file_io/win32/pipe.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_escape.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/win32/readwrite.lo: file_io/win32/readwrite.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/win32/seek.lo: file_io/win32/seek.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 

Modified: user/ngie/more-tests/contrib/apr/configure
==============================================================================
--- user/ngie/more-tests/contrib/apr/configure	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/contrib/apr/configure	Mon Aug 10 18:27:54 2015	(r286585)
@@ -6802,10 +6802,10 @@ if test "x$apr_preload_done" != "xyes" ;
     *-apple-darwin*)
 
   if test "x$CPPFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp\""
-    CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp"
+    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK\""
+    CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK"
   else
-    apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp"
+    apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
@@ -18794,7 +18794,34 @@ if test "${enable_nonportable_atomics+se
 else
   case $host_cpu in
    i[456]86) force_generic_atomics=yes ;;
-   *) force_generic_atomics=no ;;
+   *) force_generic_atomics=no
+      case $host in
+         *solaris2.10*)
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <atomic.h>
+int
+main ()
+{
+void *ptr = NULL; atomic_cas_ptr(&ptr, NULL, NULL);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  force_generic_atomics=yes
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+            if test $force_generic_atomics = yes; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: nonportable atomic support disabled, system needs Patch-ID 118884 or 118885" >&5
+$as_echo "$as_me: nonportable atomic support disabled, system needs Patch-ID 118884 or 118885" >&6;}
+            fi
+            ;;
+      esac
+      ;;
 esac
 
 fi
@@ -22292,7 +22319,7 @@ else
 fi
 done
 
-for ac_func in getpass getpassphrase gmtime_r localtime_r mkstemp
+for ac_func in getpass getpassphrase gmtime_r localtime_r
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -22304,6 +22331,23 @@ _ACEOF
 fi
 done
 
+case $host in
+    *-hp-hpux*)
+                ;;
+    *)
+        for ac_func in mkstemp
+do :
+  ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
+if test "x$ac_cv_func_mkstemp" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MKSTEMP 1
+_ACEOF
+
+fi
+done
+
+        ;;
+esac
 
 
 
@@ -23902,7 +23946,7 @@ _ACEOF
 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
     # Enable LFS
     aprlfs=1
-    for ac_func in mmap64 sendfile64 sendfilev64 mkstemp64 readdir64_r
+    for ac_func in mmap64 sendfile64 sendfilev64 readdir64_r
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -23914,6 +23958,23 @@ _ACEOF
 fi
 done
 
+    case $host in
+        *-hp-hpux*)
+                        ;;
+        *)
+            for ac_func in mkstemp64
+do :
+  ac_fn_c_check_func "$LINENO" "mkstemp64" "ac_cv_func_mkstemp64"
+if test "x$ac_cv_func_mkstemp64" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MKSTEMP64 1
+_ACEOF
+
+fi
+done
+
+            ;;
+    esac
 elif test "${ac_cv_sizeof_off_t}" != "${ac_cv_sizeof_size_t}"; then
     # unsure of using -gt above is as portable, can can't forsee where
     # off_t can legitimately be smaller than size_t

Modified: user/ngie/more-tests/contrib/apr/configure.in
==============================================================================
--- user/ngie/more-tests/contrib/apr/configure.in	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/contrib/apr/configure.in	Mon Aug 10 18:27:54 2015	(r286585)
@@ -640,7 +640,20 @@ AC_ARG_ENABLE(nonportable-atomics,
 ],
 [case $host_cpu in
    i[[456]]86) force_generic_atomics=yes ;;
-   *) force_generic_atomics=no ;;
+   *) force_generic_atomics=no
+      case $host in
+         *solaris2.10*)
+            AC_TRY_COMPILE(
+                [#include <atomic.h>],
+                [void *ptr = NULL; atomic_cas_ptr(&ptr, NULL, NULL);],,
+                [force_generic_atomics=yes]
+            )
+            if test $force_generic_atomics = yes; then
+                AC_MSG_NOTICE([nonportable atomic support disabled, system needs Patch-ID 118884 or 118885])
+            fi
+            ;;
+      esac
+      ;;
 esac
 ])
 
@@ -1400,7 +1413,15 @@ if test "$native_mmap_emul" = "1"; then
     mmap="1"
 fi
 AC_CHECK_FUNCS(memmove, [ have_memmove="1" ], [have_memmove="0" ])
-AC_CHECK_FUNCS([getpass getpassphrase gmtime_r localtime_r mkstemp])
+AC_CHECK_FUNCS([getpass getpassphrase gmtime_r localtime_r])
+case $host in
+    *-hp-hpux*)
+        dnl mkstemp is limited to 26 temporary files (a-z); use APR replacement
+        ;;
+    *)
+        AC_CHECK_FUNCS(mkstemp)
+        ;;
+esac
 
 AC_SUBST(fork)
 AC_SUBST(have_inet_addr)
@@ -1801,7 +1822,15 @@ APR_CHECK_SIZEOF_EXTENDED([#include <sys
 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
     # Enable LFS
     aprlfs=1
-    AC_CHECK_FUNCS([mmap64 sendfile64 sendfilev64 mkstemp64 readdir64_r])
+    AC_CHECK_FUNCS([mmap64 sendfile64 sendfilev64 readdir64_r])
+    case $host in
+        *-hp-hpux*)
+            dnl mkstemp64 is limited to 26 temporary files (a-z); use APR replacement
+            ;;
+        *)
+            AC_CHECK_FUNCS(mkstemp64)
+            ;;
+    esac
 elif test "${ac_cv_sizeof_off_t}" != "${ac_cv_sizeof_size_t}"; then
     # unsure of using -gt above is as portable, can can't forsee where
     # off_t can legitimately be smaller than size_t

Modified: user/ngie/more-tests/contrib/apr/encoding/apr_escape.c
==============================================================================
--- user/ngie/more-tests/contrib/apr/encoding/apr_escape.c	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/contrib/apr/encoding/apr_escape.c	Mon Aug 10 18:27:54 2015	(r286585)
@@ -436,6 +436,8 @@ APR_DECLARE(apr_status_t) apr_escape_pat
         while ((c = *s) && slen) {
             if (TEST_CHAR(c, T_OS_ESCAPE_PATH)) {
                 d = c2x(c, '%', d);
+                size += 2;
+                found = 1;
             }
             else {
                 *d++ = c;

Modified: user/ngie/more-tests/contrib/apr/include/apr_skiplist.h
==============================================================================
--- user/ngie/more-tests/contrib/apr/include/apr_skiplist.h	Mon Aug 10 17:18:21 2015	(r286584)
+++ user/ngie/more-tests/contrib/apr/include/apr_skiplist.h	Mon Aug 10 18:27:54 2015	(r286585)
@@ -40,7 +40,9 @@ extern "C" {
 /**
  * apr_skiplist_compare is the function type that must be implemented 
  * per object type that is used in a skip list for comparisons to maintain
- * order
+ * order. A value <0 indicates placement after this node; a value of 0
+ * indicates collision with this exact node; a value >0 indicates placement
+ * before this node.
  * */
 typedef int (*apr_skiplist_compare) (void *, void *);
 
@@ -171,7 +173,8 @@ APR_DECLARE(void *) apr_skiplist_next(ap
 APR_DECLARE(void *) apr_skiplist_previous(apr_skiplist *sl, apr_skiplistnode **iter);
 
 /**
- * Insert an element into the skip list using the specified comparison function.
+ * Insert an element into the skip list using the specified comparison function
+ * if it does not already exist.
  * @param sl The skip list
  * @param data The element to insert
  * @param comp The comparison function to use for placement into the skip list
@@ -180,7 +183,8 @@ APR_DECLARE(apr_skiplistnode *) apr_skip
                                           void *data, apr_skiplist_compare comp);
 
 /**
- * Insert an element into the skip list using the existing comparison function.
+ * Insert an element into the skip list using the existing comparison function
+ * if it does not already exist (as determined by the comparison function)
  * @param sl The skip list
  * @param data The element to insert
  * @remark If no comparison function has been set for the skip list, the element
@@ -190,7 +194,7 @@ APR_DECLARE(apr_skiplistnode *) apr_skip
 
 /**
  * Remove an element from the skip list using the specified comparison function for
- * locating the element.

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


More information about the svn-src-user mailing list