svn commit: r293618 - in user/ngie/stable-10-libnv: . bin/csh bin/pax contrib/bmake contrib/bmake/mk contrib/bsnmp/snmpd contrib/openbsm contrib/openbsm/bin contrib/openbsm/bin/audit contrib/openbs...

Garrett Cooper ngie at FreeBSD.org
Sat Jan 9 23:22:35 UTC 2016 

Author: ngie
Date: Sat Jan  9 23:22:28 2016
New Revision: 293618
URL: https://svnweb.freebsd.org/changeset/base/293618

Log:
  MFstable/10 @ r293617

Added:
  user/ngie/stable-10-libnv/contrib/openbsm/.travis.yml
     - copied unchanged from r293617, stable/10/contrib/openbsm/.travis.yml
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_notify.3
     - copied unchanged from r293617, stable/10/contrib/openbsm/libbsm/au_notify.3
  user/ngie/stable-10-libnv/lib/libc/sys/futimens.c
     - copied unchanged from r293617, stable/10/lib/libc/sys/futimens.c
  user/ngie/stable-10-libnv/lib/libc/sys/utimensat.2
     - copied unchanged from r293617, stable/10/lib/libc/sys/utimensat.2
  user/ngie/stable-10-libnv/lib/libc/sys/utimensat.c
     - copied unchanged from r293617, stable/10/lib/libc/sys/utimensat.c
  user/ngie/stable-10-libnv/lib/msun/tests/cexp_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/cexp_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/conj_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/conj_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/csqrt_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/csqrt_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/fenv_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/fenv_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/fmaxmin_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/fmaxmin_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/ilogb_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/ilogb_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/invctrig_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/invctrig_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/logarithm_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/logarithm_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/lrint_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/lrint_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/nan_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/nan_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/nearbyint_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/nearbyint_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/next_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/next_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/rem_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/rem_test.c
  user/ngie/stable-10-libnv/lib/msun/tests/trig_test.c
     - copied unchanged from r293617, stable/10/lib/msun/tests/trig_test.c
  user/ngie/stable-10-libnv/sys/amd64/linux/
     - copied from r293617, stable/10/sys/amd64/linux/
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_vdso.lds.s
     - copied unchanged from r293617, stable/10/sys/amd64/linux32/linux32_vdso.lds.s
  user/ngie/stable-10-libnv/sys/boot/efi/boot1/
     - copied from r293617, stable/10/sys/boot/efi/boot1/
  user/ngie/stable-10-libnv/sys/boot/efi/loader/
     - copied from r293617, stable/10/sys/boot/efi/loader/
  user/ngie/stable-10-libnv/sys/compat/linux/linux.c
     - copied unchanged from r293617, stable/10/sys/compat/linux/linux.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux.h
     - copied unchanged from r293617, stable/10/sys/compat/linux/linux.h
  user/ngie/stable-10-libnv/sys/compat/linux/linux_common.c
     - copied unchanged from r293617, stable/10/sys/compat/linux/linux_common.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_event.c
     - copied unchanged from r293617, stable/10/sys/compat/linux/linux_event.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_event.h
     - copied unchanged from r293617, stable/10/sys/compat/linux/linux_event.h
  user/ngie/stable-10-libnv/sys/compat/linux/linux_vdso.c
     - copied unchanged from r293617, stable/10/sys/compat/linux/linux_vdso.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_vdso.h
     - copied unchanged from r293617, stable/10/sys/compat/linux/linux_vdso.h
  user/ngie/stable-10-libnv/sys/i386/linux/linux_vdso.lds.s
     - copied unchanged from r293617, stable/10/sys/i386/linux/linux_vdso.lds.s
  user/ngie/stable-10-libnv/sys/modules/linux64/
     - copied from r293617, stable/10/sys/modules/linux64/
  user/ngie/stable-10-libnv/sys/modules/linux_common/
     - copied from r293617, stable/10/sys/modules/linux_common/
  user/ngie/stable-10-libnv/sys/ofed/include/linux/srcu.h
     - copied unchanged from r293617, stable/10/sys/ofed/include/linux/srcu.h
  user/ngie/stable-10-libnv/tests/sys/kern/unix_passfd_test.c
     - copied unchanged from r293617, stable/10/tests/sys/kern/unix_passfd_test.c
  user/ngie/stable-10-libnv/tests/sys/mac/
     - copied from r293617, stable/10/tests/sys/mac/
Deleted:
  user/ngie/stable-10-libnv/sys/boot/amd64/
  user/ngie/stable-10-libnv/sys/boot/i386/efi/
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-cexp.t
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-conj.t
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-csqrt.t
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-fenv.c
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-fenv.t
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-fmaxmin.c
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-fmaxmin.t
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-ilogb.c
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-ilogb.t
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-invctrig.c
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-logarithm.c
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-logarithm.t
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-lrint.c
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-lrint.t
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-nan.c
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-nan.t
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-nearbyint.c
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-nearbyint.t
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-next.c
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-next.t
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-rem.c
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-rem.t
  user/ngie/stable-10-libnv/tools/regression/lib/msun/test-trig.t
  user/ngie/stable-10-libnv/tools/regression/sockets/unix_passfd/
Modified:
  user/ngie/stable-10-libnv/Makefile.inc1
  user/ngie/stable-10-libnv/UPDATING
  user/ngie/stable-10-libnv/bin/csh/config_p.h
  user/ngie/stable-10-libnv/bin/pax/pat_rep.c
  user/ngie/stable-10-libnv/contrib/bmake/ChangeLog
  user/ngie/stable-10-libnv/contrib/bmake/Makefile
  user/ngie/stable-10-libnv/contrib/bmake/mk/ChangeLog
  user/ngie/stable-10-libnv/contrib/bmake/mk/auto.obj.mk
  user/ngie/stable-10-libnv/contrib/bmake/mk/install-mk
  user/ngie/stable-10-libnv/contrib/bmake/os.sh
  user/ngie/stable-10-libnv/contrib/bmake/suff.c
  user/ngie/stable-10-libnv/contrib/bsnmp/snmpd/main.c
  user/ngie/stable-10-libnv/contrib/bsnmp/snmpd/trap.c
  user/ngie/stable-10-libnv/contrib/openbsm/INSTALL
  user/ngie/stable-10-libnv/contrib/openbsm/LICENSE
  user/ngie/stable-10-libnv/contrib/openbsm/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/Makefile.in
  user/ngie/stable-10-libnv/contrib/openbsm/NEWS
  user/ngie/stable-10-libnv/contrib/openbsm/README
  user/ngie/stable-10-libnv/contrib/openbsm/TODO
  user/ngie/stable-10-libnv/contrib/openbsm/VERSION
  user/ngie/stable-10-libnv/contrib/openbsm/autogen.sh
  user/ngie/stable-10-libnv/contrib/openbsm/bin/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/bin/audit/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/bin/audit/audit.8
  user/ngie/stable-10-libnv/contrib/openbsm/bin/audit/audit.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/audit_triggers.defs
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/audit_warn.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd.8
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd_control.defs
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd_darwin.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd_fbsd.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.8
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/faccessat.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/fstatat.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/openat.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/parse.y
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/pjdlog.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/pjdlog.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/proto.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/proto.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/proto_common.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/proto_impl.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/proto_socketpair.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/proto_tcp.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/proto_tls.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/proto_uds.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/receiver.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/renameat.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/sandbox.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/sandbox.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/sender.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/sigtimedwait.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/strndup.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/subr.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/subr.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/synch.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/token.l
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/trail.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/trail.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/unlinkat.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditfilterd/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditfilterd/auditfilterd.8
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditfilterd/auditfilterd.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditfilterd/auditfilterd.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditreduce/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditreduce/auditreduce.1
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditreduce/auditreduce.c
  user/ngie/stable-10-libnv/contrib/openbsm/bin/auditreduce/auditreduce.h
  user/ngie/stable-10-libnv/contrib/openbsm/bin/praudit/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/bin/praudit/praudit.1
  user/ngie/stable-10-libnv/contrib/openbsm/bin/praudit/praudit.c
  user/ngie/stable-10-libnv/contrib/openbsm/bsm/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/bsm/audit_filter.h
  user/ngie/stable-10-libnv/contrib/openbsm/bsm/audit_uevents.h
  user/ngie/stable-10-libnv/contrib/openbsm/bsm/auditd_lib.h
  user/ngie/stable-10-libnv/contrib/openbsm/bsm/libbsm.h
  user/ngie/stable-10-libnv/contrib/openbsm/compat/clock_gettime.h
  user/ngie/stable-10-libnv/contrib/openbsm/compat/closefrom.h
  user/ngie/stable-10-libnv/contrib/openbsm/compat/compat.h
  user/ngie/stable-10-libnv/contrib/openbsm/compat/endian.h
  user/ngie/stable-10-libnv/contrib/openbsm/compat/endian_enc.h
  user/ngie/stable-10-libnv/contrib/openbsm/compat/flopen.h
  user/ngie/stable-10-libnv/contrib/openbsm/compat/pidfile.h
  user/ngie/stable-10-libnv/contrib/openbsm/compat/queue.h
  user/ngie/stable-10-libnv/contrib/openbsm/compat/strlcat.h
  user/ngie/stable-10-libnv/contrib/openbsm/compat/strlcpy.h
  user/ngie/stable-10-libnv/contrib/openbsm/config/config.h
  user/ngie/stable-10-libnv/contrib/openbsm/configure
  user/ngie/stable-10-libnv/contrib/openbsm/configure.ac
  user/ngie/stable-10-libnv/contrib/openbsm/etc/audit_class
  user/ngie/stable-10-libnv/contrib/openbsm/etc/audit_control
  user/ngie/stable-10-libnv/contrib/openbsm/etc/audit_event
  user/ngie/stable-10-libnv/contrib/openbsm/etc/audit_filter
  user/ngie/stable-10-libnv/contrib/openbsm/etc/audit_user
  user/ngie/stable-10-libnv/contrib/openbsm/etc/audit_warn
  user/ngie/stable-10-libnv/contrib/openbsm/libauditd/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/libauditd/auditd_lib.c
  user/ngie/stable-10-libnv/contrib/openbsm/libauditd/libauditd.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/Makefile.in
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_class.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_control.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_domain.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_errno.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_event.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_fcntl_cmd.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_free_token.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_io.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_mask.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_open.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_socket_type.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_token.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/au_user.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/audit_submit.3
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_audit.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_class.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_control.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_domain.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_errno.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_event.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_fcntl.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_flags.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_io.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_mask.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_notify.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_socket_type.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_token.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_user.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/bsm_wrappers.c
  user/ngie/stable-10-libnv/contrib/openbsm/libbsm/libbsm.3
  user/ngie/stable-10-libnv/contrib/openbsm/man/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/man/Makefile.in
  user/ngie/stable-10-libnv/contrib/openbsm/man/audit.2
  user/ngie/stable-10-libnv/contrib/openbsm/man/audit.log.5
  user/ngie/stable-10-libnv/contrib/openbsm/man/audit_class.5
  user/ngie/stable-10-libnv/contrib/openbsm/man/audit_control.5
  user/ngie/stable-10-libnv/contrib/openbsm/man/audit_event.5
  user/ngie/stable-10-libnv/contrib/openbsm/man/audit_user.5
  user/ngie/stable-10-libnv/contrib/openbsm/man/audit_warn.5
  user/ngie/stable-10-libnv/contrib/openbsm/man/auditctl.2
  user/ngie/stable-10-libnv/contrib/openbsm/man/auditon.2
  user/ngie/stable-10-libnv/contrib/openbsm/man/getaudit.2
  user/ngie/stable-10-libnv/contrib/openbsm/man/getauid.2
  user/ngie/stable-10-libnv/contrib/openbsm/man/setaudit.2
  user/ngie/stable-10-libnv/contrib/openbsm/man/setauid.2
  user/ngie/stable-10-libnv/contrib/openbsm/modules/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/modules/auditfilter_noop/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c
  user/ngie/stable-10-libnv/contrib/openbsm/sys/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/sys/bsm/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/sys/bsm/audit.h
  user/ngie/stable-10-libnv/contrib/openbsm/sys/bsm/audit_domain.h
  user/ngie/stable-10-libnv/contrib/openbsm/sys/bsm/audit_errno.h
  user/ngie/stable-10-libnv/contrib/openbsm/sys/bsm/audit_fcntl.h
  user/ngie/stable-10-libnv/contrib/openbsm/sys/bsm/audit_internal.h
  user/ngie/stable-10-libnv/contrib/openbsm/sys/bsm/audit_kevents.h
  user/ngie/stable-10-libnv/contrib/openbsm/sys/bsm/audit_record.h
  user/ngie/stable-10-libnv/contrib/openbsm/sys/bsm/audit_socket_type.h
  user/ngie/stable-10-libnv/contrib/openbsm/test/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/test/bsm/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/test/bsm/generate.c
  user/ngie/stable-10-libnv/contrib/openbsm/tools/Makefile.am
  user/ngie/stable-10-libnv/contrib/openbsm/tools/audump.c
  user/ngie/stable-10-libnv/etc/mtree/BSD.tests.dist
  user/ngie/stable-10-libnv/lib/libbsm/Makefile
  user/ngie/stable-10-libnv/lib/libc/gen/popen.c
  user/ngie/stable-10-libnv/lib/libc/include/libc_private.h
  user/ngie/stable-10-libnv/lib/libc/rpc/svc_vc.c
  user/ngie/stable-10-libnv/lib/libc/sys/Makefile.inc
  user/ngie/stable-10-libnv/lib/libc/sys/Symbol.map
  user/ngie/stable-10-libnv/lib/libpam/modules/pam_ssh/Makefile
  user/ngie/stable-10-libnv/lib/msun/tests/Makefile
  user/ngie/stable-10-libnv/libexec/rtld-elf/rtld.c
  user/ngie/stable-10-libnv/release/Makefile
  user/ngie/stable-10-libnv/sbin/devd/devd.cc
  user/ngie/stable-10-libnv/sbin/fsck_ffs/fsck.h
  user/ngie/stable-10-libnv/sbin/fsck_ffs/globs.c
  user/ngie/stable-10-libnv/sbin/natd/natd.c
  user/ngie/stable-10-libnv/sbin/newfs_nandfs/newfs_nandfs.c
  user/ngie/stable-10-libnv/sbin/rcorder/rcorder.c
  user/ngie/stable-10-libnv/sbin/reboot/reboot.8
  user/ngie/stable-10-libnv/sbin/reboot/reboot.c
  user/ngie/stable-10-libnv/sbin/route/route.c
  user/ngie/stable-10-libnv/secure/lib/libssh/Makefile
  user/ngie/stable-10-libnv/secure/libexec/sftp-server/Makefile
  user/ngie/stable-10-libnv/secure/libexec/ssh-keysign/Makefile
  user/ngie/stable-10-libnv/secure/libexec/ssh-pkcs11-helper/Makefile
  user/ngie/stable-10-libnv/secure/usr.bin/scp/Makefile
  user/ngie/stable-10-libnv/secure/usr.bin/sftp/Makefile
  user/ngie/stable-10-libnv/secure/usr.bin/ssh-add/Makefile
  user/ngie/stable-10-libnv/secure/usr.bin/ssh-agent/Makefile
  user/ngie/stable-10-libnv/secure/usr.bin/ssh-keygen/Makefile
  user/ngie/stable-10-libnv/secure/usr.bin/ssh-keyscan/Makefile
  user/ngie/stable-10-libnv/secure/usr.bin/ssh/Makefile
  user/ngie/stable-10-libnv/secure/usr.sbin/sshd/Makefile
  user/ngie/stable-10-libnv/share/man/man4/mps.4
  user/ngie/stable-10-libnv/share/man/man4/rights.4
  user/ngie/stable-10-libnv/share/vt/keymaps/gr.101.acc.kbd
  user/ngie/stable-10-libnv/share/vt/keymaps/gr.elot.acc.kbd
  user/ngie/stable-10-libnv/share/vt/keymaps/hu.101.kbd
  user/ngie/stable-10-libnv/share/vt/keymaps/hu.102.kbd
  user/ngie/stable-10-libnv/share/vt/keymaps/lt.kbd
  user/ngie/stable-10-libnv/share/vt/keymaps/pt.acc.kbd
  user/ngie/stable-10-libnv/share/vt/keymaps/pt.kbd
  user/ngie/stable-10-libnv/share/vt/keymaps/ua.kbd
  user/ngie/stable-10-libnv/share/vt/keymaps/ua.shift.alt.kbd
  user/ngie/stable-10-libnv/sys/amd64/amd64/elf_machdep.c
  user/ngie/stable-10-libnv/sys/amd64/amd64/machdep.c
  user/ngie/stable-10-libnv/sys/amd64/ia32/ia32_signal.c
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux.h
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_dummy.c
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_genassym.c
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_locore.s
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_machdep.c
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_proto.h
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_syscall.h
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_syscalls.c
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_sysent.c
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_systrace_args.c
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_sysvec.c
  user/ngie/stable-10-libnv/sys/amd64/linux32/syscalls.master
  user/ngie/stable-10-libnv/sys/arm/arm/elf_machdep.c
  user/ngie/stable-10-libnv/sys/arm/arm/machdep.c
  user/ngie/stable-10-libnv/sys/boot/Makefile
  user/ngie/stable-10-libnv/sys/boot/Makefile.amd64
  user/ngie/stable-10-libnv/sys/boot/efi/Makefile
  user/ngie/stable-10-libnv/sys/boot/efi/Makefile.inc
  user/ngie/stable-10-libnv/sys/boot/efi/libefi/Makefile
  user/ngie/stable-10-libnv/sys/boot/forth/loader.conf
  user/ngie/stable-10-libnv/sys/boot/forth/loader.rc
  user/ngie/stable-10-libnv/sys/boot/forth/menu.rc
  user/ngie/stable-10-libnv/sys/boot/forth/support.4th
  user/ngie/stable-10-libnv/sys/boot/i386/loader/Makefile
  user/ngie/stable-10-libnv/sys/boot/pc98/loader/Makefile
  user/ngie/stable-10-libnv/sys/boot/powerpc/ofw/Makefile
  user/ngie/stable-10-libnv/sys/boot/powerpc/ps3/Makefile
  user/ngie/stable-10-libnv/sys/boot/sparc64/loader/Makefile
  user/ngie/stable-10-libnv/sys/bsm/audit.h
  user/ngie/stable-10-libnv/sys/bsm/audit_domain.h
  user/ngie/stable-10-libnv/sys/bsm/audit_errno.h
  user/ngie/stable-10-libnv/sys/bsm/audit_fcntl.h
  user/ngie/stable-10-libnv/sys/bsm/audit_internal.h
  user/ngie/stable-10-libnv/sys/bsm/audit_kevents.h
  user/ngie/stable-10-libnv/sys/bsm/audit_record.h
  user/ngie/stable-10-libnv/sys/bsm/audit_socket_type.h
  user/ngie/stable-10-libnv/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  user/ngie/stable-10-libnv/sys/compat/freebsd32/freebsd32_misc.c
  user/ngie/stable-10-libnv/sys/compat/freebsd32/freebsd32_proto.h
  user/ngie/stable-10-libnv/sys/compat/freebsd32/freebsd32_syscall.h
  user/ngie/stable-10-libnv/sys/compat/freebsd32/freebsd32_syscalls.c
  user/ngie/stable-10-libnv/sys/compat/freebsd32/freebsd32_sysent.c
  user/ngie/stable-10-libnv/sys/compat/freebsd32/freebsd32_systrace_args.c
  user/ngie/stable-10-libnv/sys/compat/freebsd32/syscalls.master
  user/ngie/stable-10-libnv/sys/compat/ia32/ia32_sysvec.c
  user/ngie/stable-10-libnv/sys/compat/linprocfs/linprocfs.c
  user/ngie/stable-10-libnv/sys/compat/linsysfs/linsysfs.c
  user/ngie/stable-10-libnv/sys/compat/linux/check_error.d
  user/ngie/stable-10-libnv/sys/compat/linux/check_internal_locks.d
  user/ngie/stable-10-libnv/sys/compat/linux/linux_emul.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_emul.h
  user/ngie/stable-10-libnv/sys/compat/linux/linux_file.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_file.h
  user/ngie/stable-10-libnv/sys/compat/linux/linux_fork.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_futex.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_futex.h
  user/ngie/stable-10-libnv/sys/compat/linux/linux_getcwd.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_ioctl.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_ioctl.h
  user/ngie/stable-10-libnv/sys/compat/linux/linux_ipc.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_ipc.h
  user/ngie/stable-10-libnv/sys/compat/linux/linux_mib.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_mib.h
  user/ngie/stable-10-libnv/sys/compat/linux/linux_misc.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_misc.h
  user/ngie/stable-10-libnv/sys/compat/linux/linux_signal.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_signal.h
  user/ngie/stable-10-libnv/sys/compat/linux/linux_socket.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_socket.h
  user/ngie/stable-10-libnv/sys/compat/linux/linux_stats.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_sysctl.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_time.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_timer.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_timer.h
  user/ngie/stable-10-libnv/sys/compat/linux/linux_uid16.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_util.c
  user/ngie/stable-10-libnv/sys/compat/linux/linux_util.h
  user/ngie/stable-10-libnv/sys/compat/linux/stats_timing.d
  user/ngie/stable-10-libnv/sys/compat/svr4/svr4_misc.c
  user/ngie/stable-10-libnv/sys/compat/svr4/svr4_sysvec.c
  user/ngie/stable-10-libnv/sys/conf/files.amd64
  user/ngie/stable-10-libnv/sys/conf/files.i386
  user/ngie/stable-10-libnv/sys/conf/files.pc98
  user/ngie/stable-10-libnv/sys/conf/newvers.sh
  user/ngie/stable-10-libnv/sys/dev/mlx5/device.h
  user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/en.h
  user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
  user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
  user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
  user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c
  user/ngie/stable-10-libnv/sys/dev/usb/controller/uhci.h
  user/ngie/stable-10-libnv/sys/dev/usb/serial/uftdi.c
  user/ngie/stable-10-libnv/sys/fs/devfs/devfs_vnops.c
  user/ngie/stable-10-libnv/sys/fs/ext2fs/ext2fs.h
  user/ngie/stable-10-libnv/sys/fs/nullfs/null_vnops.c
  user/ngie/stable-10-libnv/sys/fs/procfs/procfs_status.c
  user/ngie/stable-10-libnv/sys/fs/pseudofs/pseudofs.c
  user/ngie/stable-10-libnv/sys/i386/i386/elf_machdep.c
  user/ngie/stable-10-libnv/sys/i386/i386/machdep.c
  user/ngie/stable-10-libnv/sys/i386/ibcs2/ibcs2_sysvec.c
  user/ngie/stable-10-libnv/sys/i386/linux/linux.h
  user/ngie/stable-10-libnv/sys/i386/linux/linux_dummy.c
  user/ngie/stable-10-libnv/sys/i386/linux/linux_genassym.c
  user/ngie/stable-10-libnv/sys/i386/linux/linux_locore.s
  user/ngie/stable-10-libnv/sys/i386/linux/linux_machdep.c
  user/ngie/stable-10-libnv/sys/i386/linux/linux_proto.h
  user/ngie/stable-10-libnv/sys/i386/linux/linux_ptrace.c
  user/ngie/stable-10-libnv/sys/i386/linux/linux_syscall.h
  user/ngie/stable-10-libnv/sys/i386/linux/linux_syscalls.c
  user/ngie/stable-10-libnv/sys/i386/linux/linux_sysent.c
  user/ngie/stable-10-libnv/sys/i386/linux/linux_systrace_args.c
  user/ngie/stable-10-libnv/sys/i386/linux/linux_sysvec.c
  user/ngie/stable-10-libnv/sys/i386/linux/syscalls.master
  user/ngie/stable-10-libnv/sys/kern/capabilities.conf
  user/ngie/stable-10-libnv/sys/kern/imgact_aout.c
  user/ngie/stable-10-libnv/sys/kern/imgact_elf.c
  user/ngie/stable-10-libnv/sys/kern/init_main.c
  user/ngie/stable-10-libnv/sys/kern/init_sysent.c
  user/ngie/stable-10-libnv/sys/kern/kern_clock.c
  user/ngie/stable-10-libnv/sys/kern/kern_event.c
  user/ngie/stable-10-libnv/sys/kern/kern_exit.c
  user/ngie/stable-10-libnv/sys/kern/kern_proc.c
  user/ngie/stable-10-libnv/sys/kern/kern_racct.c
  user/ngie/stable-10-libnv/sys/kern/kern_resource.c
  user/ngie/stable-10-libnv/sys/kern/kern_thr.c
  user/ngie/stable-10-libnv/sys/kern/kern_thread.c
  user/ngie/stable-10-libnv/sys/kern/kern_time.c
  user/ngie/stable-10-libnv/sys/kern/p1003_1b.c
  user/ngie/stable-10-libnv/sys/kern/subr_prof.c
  user/ngie/stable-10-libnv/sys/kern/syscalls.c
  user/ngie/stable-10-libnv/sys/kern/syscalls.master
  user/ngie/stable-10-libnv/sys/kern/systrace_args.c
  user/ngie/stable-10-libnv/sys/kern/vfs_syscalls.c
  user/ngie/stable-10-libnv/sys/kgssapi/gss_impl.c
  user/ngie/stable-10-libnv/sys/mips/mips/elf_machdep.c
  user/ngie/stable-10-libnv/sys/mips/mips/freebsd32_machdep.c
  user/ngie/stable-10-libnv/sys/mips/mips/pm_machdep.c
  user/ngie/stable-10-libnv/sys/modules/Makefile
  user/ngie/stable-10-libnv/sys/modules/linprocfs/Makefile
  user/ngie/stable-10-libnv/sys/modules/linsysfs/Makefile
  user/ngie/stable-10-libnv/sys/modules/linux/Makefile
  user/ngie/stable-10-libnv/sys/modules/pseudofs/Makefile
  user/ngie/stable-10-libnv/sys/net/if_gif.c
  user/ngie/stable-10-libnv/sys/net/if_gre.c
  user/ngie/stable-10-libnv/sys/netinet/tcp_syncache.c
  user/ngie/stable-10-libnv/sys/netinet6/in6.c
  user/ngie/stable-10-libnv/sys/ofed/include/linux/compiler.h
  user/ngie/stable-10-libnv/sys/ofed/include/linux/file.h
  user/ngie/stable-10-libnv/sys/ofed/include/linux/kobject.h
  user/ngie/stable-10-libnv/sys/ofed/include/linux/linux_compat.c
  user/ngie/stable-10-libnv/sys/ofed/include/linux/types.h
  user/ngie/stable-10-libnv/sys/ofed/include/linux/workqueue.h
  user/ngie/stable-10-libnv/sys/powerpc/powerpc/elf32_machdep.c
  user/ngie/stable-10-libnv/sys/powerpc/powerpc/elf64_machdep.c
  user/ngie/stable-10-libnv/sys/powerpc/powerpc/exec_machdep.c
  user/ngie/stable-10-libnv/sys/security/audit/bsm_domain.c
  user/ngie/stable-10-libnv/sys/security/audit/bsm_errno.c
  user/ngie/stable-10-libnv/sys/security/audit/bsm_fcntl.c
  user/ngie/stable-10-libnv/sys/security/audit/bsm_socket_type.c
  user/ngie/stable-10-libnv/sys/security/audit/bsm_token.c
  user/ngie/stable-10-libnv/sys/sparc64/sparc64/elf_machdep.c
  user/ngie/stable-10-libnv/sys/sparc64/sparc64/machdep.c
  user/ngie/stable-10-libnv/sys/sys/capsicum.h
  user/ngie/stable-10-libnv/sys/sys/file.h
  user/ngie/stable-10-libnv/sys/sys/param.h
  user/ngie/stable-10-libnv/sys/sys/proc.h
  user/ngie/stable-10-libnv/sys/sys/stat.h
  user/ngie/stable-10-libnv/sys/sys/syscall.h
  user/ngie/stable-10-libnv/sys/sys/syscall.mk
  user/ngie/stable-10-libnv/sys/sys/syscallsubr.h
  user/ngie/stable-10-libnv/sys/sys/sysent.h
  user/ngie/stable-10-libnv/sys/sys/sysproto.h
  user/ngie/stable-10-libnv/sys/x86/include/specialreg.h
  user/ngie/stable-10-libnv/sys/x86/x86/identcpu.c
  user/ngie/stable-10-libnv/sys/xen/xenbus/xenbusb.c
  user/ngie/stable-10-libnv/tests/sys/Makefile
  user/ngie/stable-10-libnv/tests/sys/aio/aio_kqueue_test.c
  user/ngie/stable-10-libnv/tests/sys/aio/lio_kqueue_test.c
  user/ngie/stable-10-libnv/tests/sys/kern/Makefile
  user/ngie/stable-10-libnv/tests/sys/kern/pipe/pipe_overcommit1_test.c
  user/ngie/stable-10-libnv/tests/sys/kern/ptrace_test.c
  user/ngie/stable-10-libnv/tests/sys/kern/unix_seqpacket_test.c
  user/ngie/stable-10-libnv/tools/regression/lib/msun/Makefile
  user/ngie/stable-10-libnv/tools/regression/mac/mac_bsdextended/test_matches.sh
  user/ngie/stable-10-libnv/tools/regression/mac/mac_bsdextended/test_ugidfw.c
  user/ngie/stable-10-libnv/usr.bin/bmake/Makefile
  user/ngie/stable-10-libnv/usr.bin/calendar/parsedata.c
  user/ngie/stable-10-libnv/usr.bin/colldef/parse.y
  user/ngie/stable-10-libnv/usr.bin/dtc/dtb.hh
  user/ngie/stable-10-libnv/usr.bin/indent/indent.1
  user/ngie/stable-10-libnv/usr.bin/kdump/kdump.c
  user/ngie/stable-10-libnv/usr.bin/locale/locale.c
  user/ngie/stable-10-libnv/usr.bin/mkimg/mkimg.1
  user/ngie/stable-10-libnv/usr.bin/mt/mt.c
  user/ngie/stable-10-libnv/usr.bin/netstat/flowtable.c
  user/ngie/stable-10-libnv/usr.bin/netstat/if.c
  user/ngie/stable-10-libnv/usr.bin/netstat/inet.c
  user/ngie/stable-10-libnv/usr.bin/netstat/inet6.c
  user/ngie/stable-10-libnv/usr.bin/netstat/ipsec.c
  user/ngie/stable-10-libnv/usr.bin/netstat/main.c
  user/ngie/stable-10-libnv/usr.bin/netstat/mbuf.c
  user/ngie/stable-10-libnv/usr.bin/netstat/mroute.c
  user/ngie/stable-10-libnv/usr.bin/netstat/mroute6.c
  user/ngie/stable-10-libnv/usr.bin/netstat/netstat.h
  user/ngie/stable-10-libnv/usr.bin/netstat/sctp.c
  user/ngie/stable-10-libnv/usr.bin/patch/pch.c
  user/ngie/stable-10-libnv/usr.bin/pr/egetopt.c
  user/ngie/stable-10-libnv/usr.bin/sed/compile.c
  user/ngie/stable-10-libnv/usr.bin/sockstat/sockstat.c
  user/ngie/stable-10-libnv/usr.bin/vgrind/regexp.c
  user/ngie/stable-10-libnv/usr.sbin/bhyve/bhyverun.c
  user/ngie/stable-10-libnv/usr.sbin/bhyve/pci_emul.c
  user/ngie/stable-10-libnv/usr.sbin/bsdconfig/bsdconfig
  user/ngie/stable-10-libnv/usr.sbin/bsdconfig/console/INDEX
  user/ngie/stable-10-libnv/usr.sbin/bsdconfig/share/sysrc.subr
  user/ngie/stable-10-libnv/usr.sbin/camdd/camdd.c
  user/ngie/stable-10-libnv/usr.sbin/config/config.h
  user/ngie/stable-10-libnv/usr.sbin/ctld/ctld.c
  user/ngie/stable-10-libnv/usr.sbin/fwcontrol/fwmpegts.c
  user/ngie/stable-10-libnv/usr.sbin/gssd/gssd.c
  user/ngie/stable-10-libnv/usr.sbin/jail/command.c
  user/ngie/stable-10-libnv/usr.sbin/jail/jailp.h
  user/ngie/stable-10-libnv/usr.sbin/jail/jailparse.y
  user/ngie/stable-10-libnv/usr.sbin/jls/jls.c
  user/ngie/stable-10-libnv/usr.sbin/kbdcontrol/kbdmap.5
  user/ngie/stable-10-libnv/usr.sbin/kbdmap/kbdmap.c
  user/ngie/stable-10-libnv/usr.sbin/mailwrapper/mailwrapper.8
  user/ngie/stable-10-libnv/usr.sbin/mailwrapper/mailwrapper.c
  user/ngie/stable-10-libnv/usr.sbin/makefs/cd9660.c
  user/ngie/stable-10-libnv/usr.sbin/mfiutil/mfiutil.8
  user/ngie/stable-10-libnv/usr.sbin/nandsim/nandsim.8
  user/ngie/stable-10-libnv/usr.sbin/nandsim/nandsim.c
  user/ngie/stable-10-libnv/usr.sbin/nandsim/nandsim_cfgparse.c
  user/ngie/stable-10-libnv/usr.sbin/ndp/ndp.c
  user/ngie/stable-10-libnv/usr.sbin/newsyslog/newsyslog.c
  user/ngie/stable-10-libnv/usr.sbin/pmcstudy/eval_expr.c
  user/ngie/stable-10-libnv/usr.sbin/ppp/ip.c
  user/ngie/stable-10-libnv/usr.sbin/ppp/ppp.8
  user/ngie/stable-10-libnv/usr.sbin/rtsold/rtsold.h
  user/ngie/stable-10-libnv/usr.sbin/syslogd/syslogd.8
  user/ngie/stable-10-libnv/usr.sbin/syslogd/syslogd.c
  user/ngie/stable-10-libnv/usr.sbin/uefisign/magic.h
  user/ngie/stable-10-libnv/usr.sbin/uefisign/pe.c
  user/ngie/stable-10-libnv/usr.sbin/ypbind/ypbind.c
  user/ngie/stable-10-libnv/usr.sbin/ypserv/ypinit.sh
Directory Properties:
  user/ngie/stable-10-libnv/   (props changed)
  user/ngie/stable-10-libnv/sys/gnu/dts/   (props changed)

Modified: user/ngie/stable-10-libnv/Makefile.inc1
==============================================================================
--- user/ngie/stable-10-libnv/Makefile.inc1	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/Makefile.inc1	Sat Jan  9 23:22:28 2016	(r293618)
@@ -116,6 +116,7 @@ CLEANDIR=	cleandir
 .endif
 
 LOCAL_TOOL_DIRS?=
+PACKAGEDIR?=	${DESTDIR}/${DISTDIR}
 
 BUILDENV_SHELL?=/bin/sh
 
@@ -915,11 +916,11 @@ packageworld:
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvf - --exclude usr/lib/debug \
 	    @${DESTDIR}/${DISTDIR}/${dist}.meta | \
-	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz
+	    ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz
 .else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvf - --exclude usr/lib/debug . | \
-	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz
+	    ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz
 .endif
 .endfor
 
@@ -928,11 +929,11 @@ packageworld:
 .  if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \
-	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.debug.txz
+	    ${XZ_CMD} > ${PACKAGEDIR}/${dist}.debug.txz
 .  else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvLf - usr/lib/debug | \
-	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-debug.txz
+	    ${XZ_CMD} > ${PACKAGEDIR}/${dist}-debug.txz
 .  endif
 . endfor
 .endif
@@ -1011,10 +1012,15 @@ KERNCONFDIR?=	${KRNLCONFDIR}
 
 BUILDKERNELS=
 INSTALLKERNEL=
+NO_INSTALLEXTRAKERNELS=yes
+.if defined(NO_INSTALLKERNEL)
+# All of the BUILDKERNELS loops start at index 1.
+BUILDKERNELS+= dummy
+.endif
 .for _kernel in ${KERNCONF}
 .if exists(${KERNCONFDIR}/${_kernel})
 BUILDKERNELS+=	${_kernel}
-.if empty(INSTALLKERNEL)
+.if empty(INSTALLKERNEL) && !defined(NO_INSTALLKERNEL)
 INSTALLKERNEL= ${_kernel}
 .endif
 .endif
@@ -1028,12 +1034,12 @@ ${WMAKE_TGTS:N_worldtmp:Nbuild32} ${.ALL
 # Builds all kernels defined by BUILDKERNELS.
 #
 buildkernel: .MAKE .PHONY
-.if empty(BUILDKERNELS)
+.if empty(BUILDKERNELS:Ndummy)
 	@echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \
 	false
 .endif
 	@echo
-.for _kernel in ${BUILDKERNELS}
+.for _kernel in ${BUILDKERNELS:Ndummy}
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
@@ -1092,6 +1098,7 @@ buildkernel: .MAKE .PHONY
 #
 installkernel installkernel.debug \
 reinstallkernel reinstallkernel.debug: _installcheck_kernel
+.if !defined(NO_INSTALLKERNEL)
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false
@@ -1102,8 +1109,20 @@ reinstallkernel reinstallkernel.debug: _
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${CROSSENV} PATH=${TMPPATH} \
 	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
+.endif
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
+.for _kernel in ${BUILDKERNELS:[2..-1]}
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Installing kernel ${_kernel}"
+	@echo "--------------------------------------------------------------"
+	cd ${KRNLOBJDIR}/${_kernel}; \
+	    ${CROSSENV} PATH=${TMPPATH} \
+	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME}.${_kernel} ${.TARGET:S/kernel//}
+.endfor
+.endif
 
 distributekernel distributekernel.debug:
+.if !defined(NO_INSTALLKERNEL)
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false
@@ -1121,7 +1140,9 @@ distributekernel distributekernel.debug:
 	sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.meta
 .endif
-.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+.endif
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
+.for _kernel in ${BUILDKERNELS:[2..-1]}
 .if defined(NO_ROOT)
 	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
 .endif
@@ -1137,27 +1158,36 @@ distributekernel distributekernel.debug:
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 .endif
 .endfor
+.endif
 
 packagekernel:
 .if defined(NO_ROOT)
+.if !defined(NO_INSTALLKERNEL)
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \
-	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz
-.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
+.endif
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
+.for _kernel in ${BUILDKERNELS:[2..-1]}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
-	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz
+	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
 .endfor
+.endif
 .else
+.if !defined(NO_INSTALLKERNEL)
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvf - . | \
-	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz
-.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
+.endif
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
+.for _kernel in ${BUILDKERNELS:[2..-1]}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - . | \
-	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz
+	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
 .endfor
 .endif
+.endif
 
 #
 # doxygen

Modified: user/ngie/stable-10-libnv/UPDATING
==============================================================================
--- user/ngie/stable-10-libnv/UPDATING	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/UPDATING	Sat Jan  9 23:22:28 2016	(r293618)
@@ -26,6 +26,11 @@ older version of current is a bit fragil
 	Kernel modules isp_2400_multi and isp_2500_multi were removed and
 	should be replaced with isp_2400 and isp_2500 modules respectively.
 
+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.
+
 20151026:
 	NTP has been upgraded to 4.2.8p4.
 

Modified: user/ngie/stable-10-libnv/bin/csh/config_p.h
==============================================================================
--- user/ngie/stable-10-libnv/bin/csh/config_p.h	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/bin/csh/config_p.h	Sat Jan  9 23:22:28 2016	(r293618)
@@ -9,7 +9,7 @@
 
 #ifndef _h_config
 #define _h_config
-/****************** System dependant compilation flags ****************/
+/****************** System dependent compilation flags ****************/
 /*
  * POSIX	This system supports IEEE Std 1003.1-1988 (POSIX).
  */

Modified: user/ngie/stable-10-libnv/bin/pax/pat_rep.c
==============================================================================
--- user/ngie/stable-10-libnv/bin/pax/pat_rep.c	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/bin/pax/pat_rep.c	Sat Jan  9 23:22:28 2016	(r293618)
@@ -878,7 +878,7 @@ rep_name(char *name, int *nlen, int prnt
 	 * (the user already saw that substitution go by)
 	 */
 	pt = rephead;
-	(void)strcpy(buf1, name);
+	(void)strlcpy(buf1, name, sizeof(buf1));
 	inpt = buf1;
 	outpt = nname;
 	endpt = outpt + PAXPATHLEN;

Modified: user/ngie/stable-10-libnv/contrib/bmake/ChangeLog
==============================================================================
--- user/ngie/stable-10-libnv/contrib/bmake/ChangeLog	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/bmake/ChangeLog	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,3 +1,9 @@
+2015-12-20  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20151220
+	  Merge with NetBSD make, pick up
+	  o suff.c: re-initialize suffNull when clearing suffixes.
+
 2015-12-01  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* Makefile (MAKE_VERSION): 20151201

Modified: user/ngie/stable-10-libnv/contrib/bmake/Makefile
==============================================================================
--- user/ngie/stable-10-libnv/contrib/bmake/Makefile	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/bmake/Makefile	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.48 2015/12/02 00:36:42 sjg Exp $
+#	$Id: Makefile,v 1.49 2015/12/20 22:54:40 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20151201
+MAKE_VERSION= 20151220
 
 PROG=	bmake
 

Modified: user/ngie/stable-10-libnv/contrib/bmake/mk/ChangeLog
==============================================================================
--- user/ngie/stable-10-libnv/contrib/bmake/mk/ChangeLog	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/bmake/mk/ChangeLog	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,3 +1,9 @@
+2015-12-12  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* install-mk (MK_VERSION): 20151212
+	* auto.obj.mk: do not require MAKEOBJDIRPREFIX to exist.
+	  only apply :tA to __objdir when comparing to .OBJDIR
+
 2015-11-14  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* install-mk (MK_VERSION): 20151111

Modified: user/ngie/stable-10-libnv/contrib/bmake/mk/auto.obj.mk
==============================================================================
--- user/ngie/stable-10-libnv/contrib/bmake/mk/auto.obj.mk	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/bmake/mk/auto.obj.mk	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,4 +1,4 @@
-# $Id: auto.obj.mk,v 1.11 2015/06/16 06:28:21 sjg Exp $
+# $Id: auto.obj.mk,v 1.12 2015/12/16 01:57:06 sjg Exp $
 #
 #	@(#) Copyright (c) 2004, Simon J. Gerraty
 #
@@ -40,12 +40,12 @@ MKOBJDIRS= auto
 .if !defined(NOOBJ) && !defined(NO_OBJ) && ${MKOBJDIRS:Uno} == auto
 # Use __objdir here so it is easier to tweak without impacting
 # the logic.
-.if !empty(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX})
+.if !empty(MAKEOBJDIRPREFIX)
 __objdir?= ${MAKEOBJDIRPREFIX}${.CURDIR}
 .endif
 __objdir?= ${MAKEOBJDIR:Uobj}
-__objdir:= ${__objdir:tA}
-.if ${.OBJDIR} != ${__objdir}
+__objdir:= ${__objdir}
+.if ${.OBJDIR:tA} != ${__objdir:tA}
 # We need to chdir, make the directory if needed
 .if !exists(${__objdir}/) && \
 	(${.TARGETS} == "" || ${.TARGETS:Nclean*:N*clean:Ndestroy*} != "")
@@ -53,11 +53,10 @@ __objdir:= ${__objdir:tA}
 __objdir_made != echo ${__objdir}/; umask ${OBJDIR_UMASK:U002}; \
         ${ECHO_TRACE} "[Creating objdir ${__objdir}...]" >&2; \
         ${Mkdirs}; Mkdirs ${__objdir}
-__objdir:= ${__objdir:tA}
 .endif
 # This causes make to use the specified directory as .OBJDIR
 .OBJDIR: ${__objdir}
-.if ${.OBJDIR} != ${__objdir} && ${__objdir_made:Uno:M${__objdir}/*} != ""
+.if ${.OBJDIR:tA} != ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir}/*} != ""
 .error could not use ${__objdir}: .OBJDIR=${.OBJDIR}
 .endif
 .endif

Modified: user/ngie/stable-10-libnv/contrib/bmake/mk/install-mk
==============================================================================
--- user/ngie/stable-10-libnv/contrib/bmake/mk/install-mk	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/bmake/mk/install-mk	Sat Jan  9 23:22:28 2016	(r293618)
@@ -55,7 +55,7 @@
 #       Simon J. Gerraty <sjg at crufty.net>
 
 # RCSid:
-#	$Id: install-mk,v 1.117 2015/11/14 18:09:57 sjg Exp $
+#	$Id: install-mk,v 1.118 2015/12/16 01:57:06 sjg Exp $
 #
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -70,7 +70,7 @@
 #	sjg at crufty.net
 #
 
-MK_VERSION=20151111
+MK_VERSION=20151212
 OWNER=
 GROUP=
 MODE=444

Modified: user/ngie/stable-10-libnv/contrib/bmake/os.sh
==============================================================================
--- user/ngie/stable-10-libnv/contrib/bmake/os.sh	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/bmake/os.sh	Sat Jan  9 23:22:28 2016	(r293618)
@@ -17,7 +17,7 @@
 #	Simon J. Gerraty <sjg at crufty.net>
 
 # RCSid:
-#	$Id: os.sh,v 1.49 2015/10/25 00:05:40 sjg Exp $
+#	$Id: os.sh,v 1.50 2015/12/17 17:06:29 sjg Exp $
 #
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -56,10 +56,10 @@ Which() {
 	case "$1" in
 	/*)	test $t $1 && echo $1;;
 	*)
-        	# some shells cannot correctly handle `IFS`
-        	# in conjunction with the for loop.
-        	_dirs=`IFS=:; echo ${2:-$PATH}`
-        	for d in $_dirs
+		# some shells cannot correctly handle `IFS`
+		# in conjunction with the for loop.
+		_dirs=`IFS=:; echo ${2:-$PATH}`
+		for d in $_dirs
 		do
 			test $t $d/$1 && { echo $d/$1; break; }
 		done
@@ -70,11 +70,11 @@ Which() {
 # tr is insanely non-portable wrt char classes, so we need to
 # spell out the alphabet. sed y/// would work too.
 toUpper() {
-        ${TR:-tr} abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
+	${TR:-tr} abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
 }
 
 toLower() {
-        ${TR:-tr} ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
+	${TR:-tr} ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
 }
 
 K=
@@ -91,7 +91,7 @@ SunOS)
 	export CHOWN
 	
 	# Great! Solaris keeps moving arch(1)
-        # should just bite the bullet and use uname -p
+	# should just bite the bullet and use uname -p
 	arch=`Which arch /usr/bin:/usr/ucb`
 	
 	MAILER=/usr/ucb/Mail
@@ -105,8 +105,8 @@ SunOS)
 		MACHINE=$MACHINE_ARCH
 		;;
 	4*)
-                MACHINE_ARCH=`arch`
-                ;;
+		MACHINE_ARCH=`arch`
+		;;
 	5*)
 		K=-k
 		LOCAL_FS=ufs
@@ -116,8 +116,8 @@ SunOS)
 		# overwriting an existing file!!!!! We want one that works!
 		test -x /usr/xpg4/bin/ln && LN=${LN:-/usr/xpg4/bin/ln}
 		# wonderful, 5.8's tr again require's []'s
-                # but /usr/xpg4/bin/tr causes problems if LC_COLLATE is set!
-                # use toUpper/toLower instead.
+		# but /usr/xpg4/bin/tr causes problems if LC_COLLATE is set!
+		# use toUpper/toLower instead.
 		;;
 	esac
 	case "$OS/$MACHINE_ARCH" in
@@ -142,9 +142,9 @@ SunOS)
 		SHARE_ARCH=$OS/$HOST
 		;;
 	OpenBSD)
-	        arch=`Which arch /usr/bin:/usr/ucb:$PATH`
-                MACHINE_ARCH=`$arch -s`
-                ;;
+		arch=`Which arch /usr/bin:/usr/ucb:$PATH`
+		MACHINE_ARCH=`$arch -s`
+		;;
 	esac
 	NAWK=awk
 	export NAWK
@@ -218,17 +218,25 @@ export HOST_TARGET
 
 case `echo -n .` in -n*) N=; C="\c";; *) N=-n; C=;; esac
 
-export HOSTNAME HOST        
+Echo() {
+	case "$1" in
+	-n) _n=$N _c=$C; shift;;
+	*) _n= _c=;;
+	esac
+	echo $_n "$@" $_c
+}
+
+export HOSTNAME HOST	    
 export OS MACHINE MACHINE_ARCH OSREL OSMAJOR LOCAL_FS TMP_DIRS MAILER N C K PS_AXC
 export LN SHARE_ARCH TR
 
 case /$0 in
 */os.sh)
-        for v in $*
+	for v in $*
 	do
-                eval vv=\$$v
-                echo "$v='$vv'"
+		eval vv=\$$v
+		echo "$v='$vv'"
 	done
-        ;;
+	;;
 esac
 

Modified: user/ngie/stable-10-libnv/contrib/bmake/suff.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/bmake/suff.c	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/bmake/suff.c	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,4 +1,4 @@
-/*	$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $	*/
+/*	$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $");
+__RCSID("$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -553,7 +553,20 @@ Suff_ClearSuffixes(void)
 #endif
     sufflist = Lst_Init(FALSE);
     sNum = 0;
-    suffNull = emptySuff;
+    if (suffNull)
+	SuffFree(suffNull);
+    emptySuff = suffNull = bmake_malloc(sizeof(Suff));
+
+    suffNull->name =   	    bmake_strdup("");
+    suffNull->nameLen =     0;
+    suffNull->searchPath =  Lst_Init(FALSE);
+    Dir_Concat(suffNull->searchPath, dirSearchPath);
+    suffNull->children =    Lst_Init(FALSE);
+    suffNull->parents =	    Lst_Init(FALSE);
+    suffNull->ref =	    Lst_Init(FALSE);
+    suffNull->sNum =   	    sNum++;
+    suffNull->flags =  	    SUFF_NULL;
+    suffNull->refCount =    1;
 }
 
 /*-
@@ -2524,32 +2537,18 @@ Suff_SetNull(char *name)
 void
 Suff_Init(void)
 {
-    sufflist = Lst_Init(FALSE);
 #ifdef CLEANUP
     suffClean = Lst_Init(FALSE);
 #endif
     srclist = Lst_Init(FALSE);
     transforms = Lst_Init(FALSE);
 
-    sNum = 0;
     /*
      * Create null suffix for single-suffix rules (POSIX). The thing doesn't
      * actually go on the suffix list or everyone will think that's its
      * suffix.
      */
-    emptySuff = suffNull = bmake_malloc(sizeof(Suff));
-
-    suffNull->name =   	    bmake_strdup("");
-    suffNull->nameLen =     0;
-    suffNull->searchPath =  Lst_Init(FALSE);
-    Dir_Concat(suffNull->searchPath, dirSearchPath);
-    suffNull->children =    Lst_Init(FALSE);
-    suffNull->parents =	    Lst_Init(FALSE);
-    suffNull->ref =	    Lst_Init(FALSE);
-    suffNull->sNum =   	    sNum++;
-    suffNull->flags =  	    SUFF_NULL;
-    suffNull->refCount =    1;
-
+    Suff_ClearSuffixes();
 }
 
 

Modified: user/ngie/stable-10-libnv/contrib/bsnmp/snmpd/main.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/bsnmp/snmpd/main.c	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/bsnmp/snmpd/main.c	Sat Jan  9 23:22:28 2016	(r293618)
@@ -119,26 +119,30 @@ static struct lmodules modules_start = T
 struct community_list community_list = TAILQ_HEAD_INITIALIZER(community_list);
 
 /* list of all known USM users */
-struct usm_userlist usm_userlist = SLIST_HEAD_INITIALIZER(usm_userlist);
+static struct usm_userlist usm_userlist = SLIST_HEAD_INITIALIZER(usm_userlist);
 
 /* A list of all VACM users configured, including v1, v2c and v3 */
-struct vacm_userlist vacm_userlist = SLIST_HEAD_INITIALIZER(vacm_userlist);
+static struct vacm_userlist vacm_userlist =
+    SLIST_HEAD_INITIALIZER(vacm_userlist);
 
 /* A list of all VACM groups */
-struct vacm_grouplist vacm_grouplist = SLIST_HEAD_INITIALIZER(vacm_grouplist);
+static struct vacm_grouplist vacm_grouplist =
+    SLIST_HEAD_INITIALIZER(vacm_grouplist);
 
 static struct vacm_group vacm_default_group = {
 	.groupname = "",
 };
 
 /* The list of configured access entries */
-struct vacm_accesslist vacm_accesslist = TAILQ_HEAD_INITIALIZER(vacm_accesslist);
+static struct vacm_accesslist vacm_accesslist =
+    TAILQ_HEAD_INITIALIZER(vacm_accesslist);
 
 /* The list of configured views */
-struct vacm_viewlist vacm_viewlist = SLIST_HEAD_INITIALIZER(vacm_viewlist);
+static struct vacm_viewlist vacm_viewlist =
+    SLIST_HEAD_INITIALIZER(vacm_viewlist);
 
 /* The list of configured contexts */
-struct vacm_contextlist vacm_contextlist =
+static struct vacm_contextlist vacm_contextlist =
     SLIST_HEAD_INITIALIZER(vacm_contextlist);
 
 /* list of all installed object resources */

Modified: user/ngie/stable-10-libnv/contrib/bsnmp/snmpd/trap.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/bsnmp/snmpd/trap.c	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/bsnmp/snmpd/trap.c	Sat Jan  9 23:22:28 2016	(r293618)
@@ -60,15 +60,15 @@
 struct trapsink_list trapsink_list = TAILQ_HEAD_INITIALIZER(trapsink_list);
 
 /* List of target addresses */
-struct target_addresslist target_addresslist =
+static struct target_addresslist target_addresslist =
     SLIST_HEAD_INITIALIZER(target_addresslist);
 
 /* List of target parameters */
-struct target_paramlist target_paramlist =
+static struct target_paramlist target_paramlist =
     SLIST_HEAD_INITIALIZER(target_paramlist);
 
 /* List of notification targets */
-struct target_notifylist target_notifylist =
+static struct target_notifylist target_notifylist =
     SLIST_HEAD_INITIALIZER(target_notifylist);
 
 static const struct asn_oid oid_begemotTrapSinkTable =

Copied: user/ngie/stable-10-libnv/contrib/openbsm/.travis.yml (from r293617, stable/10/contrib/openbsm/.travis.yml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/stable-10-libnv/contrib/openbsm/.travis.yml	Sat Jan  9 23:22:28 2016	(r293618, copy of r293617, stable/10/contrib/openbsm/.travis.yml)
@@ -0,0 +1,18 @@
+language: c
+
+compiler:
+  - clang
+  - gcc
+
+os:
+  - linux
+  - osx
+
+before_install:
+  - if [ $TRAVIS_OS_NAME == "linux" ]; then
+      sudo apt-get -qq update;
+      sudo apt-get -qq install byacc flex;
+    elif [ $TRAVIS_OS_NAME == "osx" ]; then
+      brew update;
+      brew install byacc flex;
+    fi

Modified: user/ngie/stable-10-libnv/contrib/openbsm/INSTALL
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/INSTALL	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/INSTALL	Sat Jan  9 23:22:28 2016	(r293618)
@@ -3,7 +3,7 @@ OpenBSM Build and Installation Instructi
 OpenBSM is currently built using autoconf and automake, which should allow
 for building on a range of operating systems, including FreeBSD, Mac OS X,
 and Linux.  Some components are built only if appropriate kernel audit
-suppport is found.  Typical builds will be performed using:
+support is found.  Typical builds will be performed using:
 
     ./configure
     make
@@ -31,7 +31,7 @@ not configurable.
 You may wish to specify that the OpenBSM components not be installed in the
 base system, rather in a specific directory.  This may be done using the
 --prefix argument to configure.  If installing to a specific directory,
-remember to update your library path so that running tools from that
+remember to update your library path so that when running tools from that
 directory the correct libbsm is used:
 
     ./configure --prefix=/home/rwatson/openbsm

Modified: user/ngie/stable-10-libnv/contrib/openbsm/LICENSE
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/LICENSE	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/LICENSE	Sat Jan  9 23:22:28 2016	(r293618)
@@ -34,5 +34,3 @@ as a whole:
 The TrustedBSD Project would appreciate the contribution of fixes and
 enhancements under an identical license in order to avoid potentially
 confusing license proliferation.
-
-$P4: //depot/projects/trustedbsd/openbsm/LICENSE#6 $

Modified: user/ngie/stable-10-libnv/contrib/openbsm/Makefile.am
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/Makefile.am	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/Makefile.am	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#5 $
-##
-
 SUBDIRS =		\
 	bsm
 

Modified: user/ngie/stable-10-libnv/contrib/openbsm/Makefile.in
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/Makefile.in	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/Makefile.in	Sat Jan  9 23:22:28 2016	(r293618)
@@ -59,9 +59,9 @@ DIST_COMMON = README $(am__configure_dep
 	$(top_srcdir)/config/config.sub \
 	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
 	$(top_srcdir)/config/missing $(top_srcdir)/configure INSTALL \
-	NEWS TODO config/config.guess config/config.sub config/depcomp \
-	config/install-sh config/ltmain.sh config/missing \
-	config/ylwrap
+	NEWS TODO config/compile config/config.guess config/config.sub \
+	config/depcomp config/install-sh config/ltmain.sh \
+	config/missing config/ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

Modified: user/ngie/stable-10-libnv/contrib/openbsm/NEWS
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/NEWS	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/NEWS	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,5 +1,16 @@
 OpenBSM Version History
 
+OpenBSM 1.2 alpha 4
+
+- Fix praudit to emit correct XML.
+- Fix auditdistd bugs related to IPv6 support, locking, and a kqueue-related
+  descriptor leak.
+- Add audit event definitions for Capsicum-related syscalls, as well as
+  AUE_BINDAT and AUE_CONNECTAT.
+- Manpage symlinks for all libbsm functions are installed again after the
+  move to autotools in OpenBSM 1.0 Alpha 5.
+- A variety of minor documentation cleanups.
+
 OpenBSM 1.2 alpha 3
 
 - Various minor tweaks to the auditdistd build to make it fit the FreeBSD
@@ -494,5 +505,3 @@ OpenBSM 1.0 alpha 1
 - auditd(8), audit(8) added to the OpenBSM distribution.  auditd extended
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
-
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#55 $

Modified: user/ngie/stable-10-libnv/contrib/openbsm/README
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/README	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/README	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,4 +1,4 @@
-OpenBSM 1.2a2
+OpenBSM
 
   Introduction
 
@@ -10,7 +10,7 @@ of several organizations.
 OpenBSM includes several command line tools, including auditreduce(8) and
 praudit(8) for reducing and printing audit trails, as well as the libbsm(3)
 library to manage configuration files, generate audit records, and parse and
-print audit trils.
+print audit trails.
 
 Coupled with a kernel audit implementation, OpenBSM can be used to maintain
 system audit streams, and is a foundation for a full audit-enabled system.
@@ -64,5 +64,3 @@ Information on OpenBSM may be found on t
 Information on TrustedBSD may be found on the TrustedBSD home page:
 
     http://www.TrustedBSD.org/
-
-$P4: //depot/projects/trustedbsd/openbsm/README#41 $

Modified: user/ngie/stable-10-libnv/contrib/openbsm/TODO
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/TODO	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/TODO	Sat Jan  9 23:22:28 2016	(r293618)
@@ -7,8 +7,6 @@ OpenBSM TODO
 - Document contents of libbsm "public" data structures in libbsm man pages.
 - The audit.log.5 man page is incomplete, as it does not describe all
   token types.
-- With the move to autoconf/automake, man page symlinks are no longer
-  installed.  This needs to be fixed.
 - It might be desirable to be able to provide EOPNOTSUPP system call stubs
   on systems that don't have the necessary audit system calls; that would
   allow the full libbsm and tool set to build, just not run.
@@ -23,5 +21,3 @@ OpenBSM TODO
   not available on the local OS platform.
 - Support for client certificates in auditdistd, to include certificate chain
   validation.
-
-$P4: //depot/projects/trustedbsd/openbsm/TODO#14 $

Modified: user/ngie/stable-10-libnv/contrib/openbsm/VERSION
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/VERSION	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/VERSION	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1 +1 @@
-OPENBSM_1_2_alpha3
+OPENBSM_1_2_alpha4

Modified: user/ngie/stable-10-libnv/contrib/openbsm/autogen.sh
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/autogen.sh	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/autogen.sh	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,7 +1,4 @@
 #!/bin/sh
-#
-# $P4: //depot/projects/trustedbsd/openbsm/autogen.sh#2 $
-#
 
 libtoolize --copy --force
 aclocal

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/Makefile.am
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/Makefile.am	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/Makefile.am	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#4 $
-##
-
 SUBDIRS =		\
 	auditdistd	\
 	auditfilterd	\

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/audit/Makefile.am
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/audit/Makefile.am	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/audit/Makefile.am	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#7 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/audit/audit.8
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/audit/audit.8	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/audit/audit.8	Sat Jan  9 23:22:28 2016	(r293618)
@@ -25,9 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#16 $
-.\"
-.Dd January 29, 2009
+.Dd July 25, 2015
 .Dt AUDIT 8
 .Os
 .Sh NAME
@@ -88,7 +86,7 @@ Audit policy file used to configure the 
 .Xr audit 4 ,
 .Xr audit_control 5 ,
 .Xr auditd 8 ,
-.Xr launchd 8
+.Xr launchd 8 (Mac OS X)
 .Sh HISTORY
 The OpenBSM implementation was created by McAfee Research, the security
 division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004.

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/audit/audit.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/audit/audit.c	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/audit/audit.c	Sat Jan  9 23:22:28 2016	(r293618)
@@ -25,8 +25,6 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#15 $
  */
 /*
  * Program to trigger the audit daemon with a message that is either:

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/Makefile.am
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/Makefile.am	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/Makefile.am	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#6 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/audit_triggers.defs
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/audit_triggers.defs	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/audit_triggers.defs	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,5 +1 @@
-/*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_triggers.defs#1 $
- */
-
 #include <mach/audit_triggers.defs>

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/audit_warn.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/audit_warn.c	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/audit_warn.c	Sat Jan  9 23:22:28 2016	(r293618)
@@ -25,8 +25,6 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#11 $
  */
 
 #include <sys/types.h>

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd.8
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd.8	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd.8	Sat Jan  9 23:22:28 2016	(r293618)
@@ -25,9 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#19 $
-.\"
-.Dd December 11, 2008
+.Dd July 25, 2015
 .Dt AUDITD 8
 .Os
 .Sh NAME
@@ -123,7 +121,7 @@ and are no longer available as arguments
 .Xr audit_warn 5 ,
 .Xr audit 8 ,
 .Xr auditdistd 8 ,
-.Xr launchd 8
+.Xr launchd 8 (Mac OS X)
 .Sh HISTORY
 The OpenBSM implementation was created by McAfee Research, the security
 division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004.

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd.c	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd.c	Sat Jan  9 23:22:28 2016	(r293618)
@@ -25,8 +25,6 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#50 $
  */
 
 #include <sys/types.h>

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd.h
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd.h	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd.h	Sat Jan  9 23:22:28 2016	(r293618)
@@ -25,8 +25,6 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#13 $
  */
 
 #ifndef _AUDITD_H_

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd_control.defs
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd_control.defs	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd_control.defs	Sat Jan  9 23:22:28 2016	(r293618)
@@ -25,8 +25,6 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_control.defs#2 $
  */
 
 /*

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd_darwin.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd_darwin.c	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd_darwin.c	Sat Jan  9 23:22:28 2016	(r293618)
@@ -25,8 +25,6 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#5 $
  */
 
 #include <sys/types.h>

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd_fbsd.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd_fbsd.c	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditd/auditd_fbsd.c	Sat Jan  9 23:22:28 2016	(r293618)
@@ -25,8 +25,6 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#4 $
  */
 
 #include <sys/types.h>

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/Makefile.am
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/Makefile.am	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/Makefile.am	Sat Jan  9 23:22:28 2016	(r293618)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/Makefile.am#1 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.8
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.8	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.8	Sat Jan  9 23:22:28 2016	(r293618)
@@ -41,7 +41,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-daemon is responsible for distributing audit trail files over TCP/IP network in
+daemon is responsible for distributing audit trail files over a TCP/IP network in
 a secure and reliable way.
 .Pp
 The
@@ -49,7 +49,7 @@ The
 daemon can be started with the following command line arguments:
 .Bl -tag -width ".Fl P Ar pidfile"
 .It Fl c Ar config
-Specify alternative location of the configuration file.
+Specify an alternative location of the configuration file.
 The default location is
 .Pa /etc/security/auditdistd.conf .
 Note: the configuration file may contain passwords.
@@ -74,7 +74,7 @@ usage message.
 Start in a launchd-friendly mode, ie. do not use
 .Xr daemon 3 .
 .It Fl P Ar pidfile
-Specify alternative location of a file where main process PID will be
+Specify an alternative location of a file where main process PID will be
 stored.
 The default location is
 .Pa /var/run/auditdistd.pid .

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.c	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.c	Sat Jan  9 23:22:28 2016	(r293618)
@@ -25,8 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#3 $
  */
 
 #include <config/config.h>

Modified: user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.conf.5	Sat Jan  9 23:13:43 2016	(r293617)
+++ user/ngie/stable-10-libnv/contrib/openbsm/bin/auditdistd/auditdistd.conf.5	Sat Jan  9 23:22:28 2016	(r293618)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 22, 2011
+.Dd July 1, 2015
 .Dt AUDITDISTD.CONF 5
 .Os
 .Sh NAME
@@ -37,19 +37,21 @@
 daemon.
 .Sh DESCRIPTION
 Note: the configuration file may contain passwords.
-Care should be taken to configure proper permissions on this file
-.Li ( eg. 0600 ) .
+Care should be taken to configure proper permissions for this file
+.Li ( e.g., 0600 ) .
 .Pp
-Every line starting with # is treated as comment and ignored.
+Every line starting with
+.Li #
+gets treated as a comment and is ignored.
 .Sh CONFIGURATION FILE SYNTAX
-General syntax of the
+The general syntax of the
 .Nm
-file is following:
-.Bd -literal -offset
+file is as follows:
+.Bd -literal
 ## Global section.
 
 # Our name.
-# The default is first part of the hostname.
+# The default is the first part of the hostname.
 name "<name>"
 
 # Connection timeout.
@@ -71,11 +73,11 @@ sender {
 	# The default is /var/audit/dist.
 	directory "<dir>"
 .\"
-.\"	# Checksum algorithm for data send over the wire.
+.\"	# Checksum algorithm for data sent over the wire.
 .\"	# The default is none.
 .\"	checksum "<algorithm>"
 .\"
-.\"	# Compression algorithm for data send over the wire.
+.\"	# Compression algorithm for data sent over the wire.
 .\"	# The default is none.
 .\"	compression "<algorithm>"
 
@@ -86,7 +88,7 @@ sender {
 		# Optional.
 		source "<addr>"
 
-		# Address of auditdistd receiver.
+		# Address of the auditdistd receiver.
 		# No default. Obligatory.
 		remote "<addr>"
 
@@ -95,7 +97,7 @@ sender {
 		directory "<dir>"
 
 		# Fingerprint of the receiver's public key when using TLS
-		# for connection.
+		# for connections.
 		# Example fingerprint:
 		# SHA256=8F:0A:FC:8A:3D:09:80:AF:D9:AA:38:CC:8A:86:53:E6:8F:B6:1C:55:30:14:D7:F9:AA:8B:3E:73:CD:F5:76:2B
 		fingerprint "<algorithm=hash>"
@@ -103,37 +105,37 @@ sender {
 		# Password used to authenticate in front of the receiver.
 		password "<password>"
 .\"
-.\"		# Checksum algorithm for data send over the wire.
+.\"		# Checksum algorithm for data sent over the wire.
 .\"		# The default is none.
 .\"		checksum "<algorithm>"
 .\"
-.\"		# Compression algorithm for data send over the wire.
+.\"		# Compression algorithm for data sent over the wire.
 .\"		# The default is none.
 .\"		compression "<algorithm>"
 	}
 
-	# Currently local audit trail files can be send only to one remote
+	# Currently local audit trail files can be sent only to one remote
 	# auditdistd receiver, but this can change in the future.
 }
 
 receiver {
 	## Receiver section.
 
-	# Address to listen on. Multiple listen addresses might be specified.
+	# Address to listen on. Multiple listen addresses may be specified.
 	# The defaults are "tcp4://0.0.0.0:7878" and "tcp6://[::]:7878".
 	listen "<addr>"

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

More information about the svn-src-user mailing list