Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Aug 2013 21:46:13 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r254740 - in projects/camlock: . bin/chflags bin/ls bin/sh cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzfs_core/common ...
Message-ID:  <201308232146.r7NLkDiK009847@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Fri Aug 23 21:46:11 2013
New Revision: 254740
URL: http://svnweb.freebsd.org/changeset/base/254740

Log:
  MFC @ r254739

Added:
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-verify.8
     - copied unchanged from r254739, head/contrib/bind9/bin/dnssec/dnssec-verify.8
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-verify.c
     - copied unchanged from r254739, head/contrib/bind9/bin/dnssec/dnssec-verify.c
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-verify.docbook
     - copied unchanged from r254739, head/contrib/bind9/bin/dnssec/dnssec-verify.docbook
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-verify.html
     - copied unchanged from r254739, head/contrib/bind9/bin/dnssec/dnssec-verify.html
  projects/camlock/contrib/bind9/bin/named/bind9.ver3.xsl
     - copied unchanged from r254739, head/contrib/bind9/bin/named/bind9.ver3.xsl
  projects/camlock/contrib/bind9/bin/named/bind9.ver3.xsl.h
     - copied unchanged from r254739, head/contrib/bind9/bin/named/bind9.ver3.xsl.h
  projects/camlock/contrib/bind9/doc/arm/man.dnssec-verify.html
     - copied unchanged from r254739, head/contrib/bind9/doc/arm/man.dnssec-verify.html
  projects/camlock/contrib/bind9/lib/dns/clientinfo.c
     - copied unchanged from r254739, head/contrib/bind9/lib/dns/clientinfo.c
  projects/camlock/contrib/bind9/lib/dns/include/dns/clientinfo.h
     - copied unchanged from r254739, head/contrib/bind9/lib/dns/include/dns/clientinfo.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/update.h
     - copied unchanged from r254739, head/contrib/bind9/lib/dns/include/dns/update.h
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/naptr_35.c
     - copied unchanged from r254739, head/contrib/bind9/lib/dns/rdata/generic/naptr_35.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/naptr_35.h
     - copied unchanged from r254739, head/contrib/bind9/lib/dns/rdata/generic/naptr_35.h
  projects/camlock/contrib/bind9/lib/dns/update.c
     - copied unchanged from r254739, head/contrib/bind9/lib/dns/update.c
  projects/camlock/contrib/bind9/lib/isc/include/isc/pool.h
     - copied unchanged from r254739, head/contrib/bind9/lib/isc/include/isc/pool.h
  projects/camlock/contrib/bind9/lib/isc/include/isc/queue.h
     - copied unchanged from r254739, head/contrib/bind9/lib/isc/include/isc/queue.h
  projects/camlock/contrib/bind9/lib/isc/pool.c
     - copied unchanged from r254739, head/contrib/bind9/lib/isc/pool.c
  projects/camlock/contrib/libexecinfo/
     - copied from r254739, head/contrib/libexecinfo/
  projects/camlock/contrib/llvm/tools/lldb/
     - copied from r254739, head/contrib/llvm/tools/lldb/
  projects/camlock/lib/libc/gen/dup3.3
     - copied unchanged from r254739, head/lib/libc/gen/dup3.3
  projects/camlock/lib/libc/gen/dup3.c
     - copied unchanged from r254739, head/lib/libc/gen/dup3.c
  projects/camlock/lib/libexecinfo/
     - copied from r254739, head/lib/libexecinfo/
  projects/camlock/share/man/man4/vmx.4
     - copied unchanged from r254739, head/share/man/man4/vmx.4
  projects/camlock/sys/arm/ti/ti_sdhci.c
     - copied unchanged from r254739, head/sys/arm/ti/ti_sdhci.c
  projects/camlock/sys/compat/freebsd32/freebsd32_capability.c
     - copied unchanged from r254739, head/sys/compat/freebsd32/freebsd32_capability.c
  projects/camlock/sys/compat/freebsd32/freebsd32_misc.h
     - copied unchanged from r254739, head/sys/compat/freebsd32/freebsd32_misc.h
  projects/camlock/sys/dev/iscsi_initiator/
     - copied from r254739, head/sys/dev/iscsi_initiator/
  projects/camlock/sys/dev/uart/uart_dev_ns8250.h
     - copied unchanged from r254739, head/sys/dev/uart/uart_dev_ns8250.h
  projects/camlock/sys/dev/uart/uart_dev_ti8250.c
     - copied unchanged from r254739, head/sys/dev/uart/uart_dev_ti8250.c
  projects/camlock/sys/dev/vmware/
     - copied from r254739, head/sys/dev/vmware/
  projects/camlock/sys/modules/iscsi_initiator/
     - copied from r254739, head/sys/modules/iscsi_initiator/
  projects/camlock/sys/modules/vmware/
     - copied from r254739, head/sys/modules/vmware/
  projects/camlock/tools/regression/bin/sh/builtins/jobid1.0
     - copied unchanged from r254739, head/tools/regression/bin/sh/builtins/jobid1.0
  projects/camlock/tools/regression/bin/sh/builtins/jobid2.0
     - copied unchanged from r254739, head/tools/regression/bin/sh/builtins/jobid2.0
  projects/camlock/usr.bin/calendar/calendars/ru_RU.UTF-8/
     - copied from r254739, head/usr.bin/calendar/calendars/ru_RU.UTF-8/
  projects/camlock/usr.sbin/dnssec-verify/
     - copied from r254739, head/usr.sbin/dnssec-verify/
Deleted:
  projects/camlock/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c
  projects/camlock/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h
  projects/camlock/lib/libpam/libpam/pam_std_option.c
  projects/camlock/sys/dev/iscsi/initiator/
  projects/camlock/sys/modules/iscsi/initiator/
Modified:
  projects/camlock/Makefile
  projects/camlock/UPDATING
  projects/camlock/bin/chflags/chflags.1
  projects/camlock/bin/ls/ls.1
  projects/camlock/bin/sh/eval.c
  projects/camlock/bin/sh/jobs.c
  projects/camlock/bin/sh/main.c
  projects/camlock/bin/sh/parser.c
  projects/camlock/bin/sh/parser.h
  projects/camlock/bin/sh/redir.c
  projects/camlock/bin/sh/redir.h
  projects/camlock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
  projects/camlock/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  projects/camlock/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
  projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  projects/camlock/contrib/bind9/CHANGES
  projects/camlock/contrib/bind9/COPYRIGHT
  projects/camlock/contrib/bind9/HISTORY
  projects/camlock/contrib/bind9/Makefile.in
  projects/camlock/contrib/bind9/README
  projects/camlock/contrib/bind9/bin/Makefile.in
  projects/camlock/contrib/bind9/bin/check/check-tool.c
  projects/camlock/contrib/bind9/bin/check/check-tool.h
  projects/camlock/contrib/bind9/bin/check/named-checkconf.c
  projects/camlock/contrib/bind9/bin/check/named-checkzone.8
  projects/camlock/contrib/bind9/bin/check/named-checkzone.c
  projects/camlock/contrib/bind9/bin/check/named-checkzone.docbook
  projects/camlock/contrib/bind9/bin/check/named-checkzone.html
  projects/camlock/contrib/bind9/bin/confgen/ddns-confgen.c
  projects/camlock/contrib/bind9/bin/confgen/rndc-confgen.c
  projects/camlock/contrib/bind9/bin/dig/Makefile.in
  projects/camlock/contrib/bind9/bin/dig/dig.1
  projects/camlock/contrib/bind9/bin/dig/dig.c
  projects/camlock/contrib/bind9/bin/dig/dig.docbook
  projects/camlock/contrib/bind9/bin/dig/dig.html
  projects/camlock/contrib/bind9/bin/dig/dighost.c
  projects/camlock/contrib/bind9/bin/dig/host.c
  projects/camlock/contrib/bind9/bin/dig/include/dig/dig.h
  projects/camlock/contrib/bind9/bin/dig/nslookup.c
  projects/camlock/contrib/bind9/bin/dnssec/Makefile.in
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-keygen.8
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-keygen.c
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-keygen.docbook
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-keygen.html
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-revoke.c
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-revoke.docbook
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-settime.8
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-settime.c
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-settime.docbook
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-settime.html
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-signzone.8
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-signzone.c
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-signzone.docbook
  projects/camlock/contrib/bind9/bin/dnssec/dnssec-signzone.html
  projects/camlock/contrib/bind9/bin/dnssec/dnssectool.c
  projects/camlock/contrib/bind9/bin/dnssec/dnssectool.h
  projects/camlock/contrib/bind9/bin/named/Makefile.in
  projects/camlock/contrib/bind9/bin/named/builtin.c
  projects/camlock/contrib/bind9/bin/named/client.c
  projects/camlock/contrib/bind9/bin/named/config.c
  projects/camlock/contrib/bind9/bin/named/control.c
  projects/camlock/contrib/bind9/bin/named/controlconf.c
  projects/camlock/contrib/bind9/bin/named/include/dlz/dlz_dlopen_driver.h
  projects/camlock/contrib/bind9/bin/named/include/named/client.h
  projects/camlock/contrib/bind9/bin/named/include/named/control.h
  projects/camlock/contrib/bind9/bin/named/include/named/globals.h
  projects/camlock/contrib/bind9/bin/named/include/named/interfacemgr.h
  projects/camlock/contrib/bind9/bin/named/include/named/server.h
  projects/camlock/contrib/bind9/bin/named/include/named/zoneconf.h
  projects/camlock/contrib/bind9/bin/named/interfacemgr.c
  projects/camlock/contrib/bind9/bin/named/logconf.c
  projects/camlock/contrib/bind9/bin/named/main.c
  projects/camlock/contrib/bind9/bin/named/named.8
  projects/camlock/contrib/bind9/bin/named/named.conf.5
  projects/camlock/contrib/bind9/bin/named/named.conf.docbook
  projects/camlock/contrib/bind9/bin/named/named.conf.html
  projects/camlock/contrib/bind9/bin/named/named.docbook
  projects/camlock/contrib/bind9/bin/named/named.html
  projects/camlock/contrib/bind9/bin/named/query.c
  projects/camlock/contrib/bind9/bin/named/server.c
  projects/camlock/contrib/bind9/bin/named/statschannel.c
  projects/camlock/contrib/bind9/bin/named/unix/Makefile.in
  projects/camlock/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c
  projects/camlock/contrib/bind9/bin/named/unix/os.c
  projects/camlock/contrib/bind9/bin/named/update.c
  projects/camlock/contrib/bind9/bin/named/xfrout.c
  projects/camlock/contrib/bind9/bin/named/zoneconf.c
  projects/camlock/contrib/bind9/bin/nsupdate/Makefile.in
  projects/camlock/contrib/bind9/bin/nsupdate/nsupdate.1
  projects/camlock/contrib/bind9/bin/nsupdate/nsupdate.c
  projects/camlock/contrib/bind9/bin/nsupdate/nsupdate.docbook
  projects/camlock/contrib/bind9/bin/nsupdate/nsupdate.html
  projects/camlock/contrib/bind9/bin/rndc/rndc.c
  projects/camlock/contrib/bind9/bin/tools/genrandom.8
  projects/camlock/contrib/bind9/bin/tools/genrandom.docbook
  projects/camlock/contrib/bind9/bin/tools/genrandom.html
  projects/camlock/contrib/bind9/bin/tools/nsec3hash.c
  projects/camlock/contrib/bind9/config.h.in
  projects/camlock/contrib/bind9/config.threads.in
  projects/camlock/contrib/bind9/configure.in
  projects/camlock/contrib/bind9/doc/arm/Bv9ARM-book.xml
  projects/camlock/contrib/bind9/doc/arm/Bv9ARM.ch01.html
  projects/camlock/contrib/bind9/doc/arm/Bv9ARM.ch03.html
  projects/camlock/contrib/bind9/doc/arm/Bv9ARM.ch04.html
  projects/camlock/contrib/bind9/doc/arm/Bv9ARM.ch05.html
  projects/camlock/contrib/bind9/doc/arm/Bv9ARM.ch06.html
  projects/camlock/contrib/bind9/doc/arm/Bv9ARM.ch07.html
  projects/camlock/contrib/bind9/doc/arm/Bv9ARM.ch08.html
  projects/camlock/contrib/bind9/doc/arm/Bv9ARM.ch09.html
  projects/camlock/contrib/bind9/doc/arm/Bv9ARM.ch10.html
  projects/camlock/contrib/bind9/doc/arm/Bv9ARM.html
  projects/camlock/contrib/bind9/doc/arm/Bv9ARM.pdf
  projects/camlock/contrib/bind9/doc/arm/dnssec.xml
  projects/camlock/contrib/bind9/doc/arm/man.arpaname.html
  projects/camlock/contrib/bind9/doc/arm/man.ddns-confgen.html
  projects/camlock/contrib/bind9/doc/arm/man.dig.html
  projects/camlock/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
  projects/camlock/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
  projects/camlock/contrib/bind9/doc/arm/man.dnssec-keygen.html
  projects/camlock/contrib/bind9/doc/arm/man.dnssec-revoke.html
  projects/camlock/contrib/bind9/doc/arm/man.dnssec-settime.html
  projects/camlock/contrib/bind9/doc/arm/man.dnssec-signzone.html
  projects/camlock/contrib/bind9/doc/arm/man.genrandom.html
  projects/camlock/contrib/bind9/doc/arm/man.host.html
  projects/camlock/contrib/bind9/doc/arm/man.isc-hmac-fixup.html
  projects/camlock/contrib/bind9/doc/arm/man.named-checkconf.html
  projects/camlock/contrib/bind9/doc/arm/man.named-checkzone.html
  projects/camlock/contrib/bind9/doc/arm/man.named-journalprint.html
  projects/camlock/contrib/bind9/doc/arm/man.named.html
  projects/camlock/contrib/bind9/doc/arm/man.nsec3hash.html
  projects/camlock/contrib/bind9/doc/arm/man.nsupdate.html
  projects/camlock/contrib/bind9/doc/arm/man.rndc-confgen.html
  projects/camlock/contrib/bind9/doc/arm/man.rndc.conf.html
  projects/camlock/contrib/bind9/doc/arm/man.rndc.html
  projects/camlock/contrib/bind9/doc/arm/pkcs11.xml
  projects/camlock/contrib/bind9/doc/misc/options
  projects/camlock/contrib/bind9/lib/bind9/api
  projects/camlock/contrib/bind9/lib/bind9/check.c
  projects/camlock/contrib/bind9/lib/dns/Makefile.in
  projects/camlock/contrib/bind9/lib/dns/acache.c
  projects/camlock/contrib/bind9/lib/dns/acl.c
  projects/camlock/contrib/bind9/lib/dns/adb.c
  projects/camlock/contrib/bind9/lib/dns/api
  projects/camlock/contrib/bind9/lib/dns/byaddr.c
  projects/camlock/contrib/bind9/lib/dns/cache.c
  projects/camlock/contrib/bind9/lib/dns/callbacks.c
  projects/camlock/contrib/bind9/lib/dns/client.c
  projects/camlock/contrib/bind9/lib/dns/db.c
  projects/camlock/contrib/bind9/lib/dns/dbtable.c
  projects/camlock/contrib/bind9/lib/dns/diff.c
  projects/camlock/contrib/bind9/lib/dns/dispatch.c
  projects/camlock/contrib/bind9/lib/dns/dns64.c
  projects/camlock/contrib/bind9/lib/dns/dnssec.c
  projects/camlock/contrib/bind9/lib/dns/dst_api.c
  projects/camlock/contrib/bind9/lib/dns/dst_internal.h
  projects/camlock/contrib/bind9/lib/dns/dst_openssl.h
  projects/camlock/contrib/bind9/lib/dns/dst_parse.c
  projects/camlock/contrib/bind9/lib/dns/ecdb.c
  projects/camlock/contrib/bind9/lib/dns/gssapi_link.c
  projects/camlock/contrib/bind9/lib/dns/gssapictx.c
  projects/camlock/contrib/bind9/lib/dns/hmac_link.c
  projects/camlock/contrib/bind9/lib/dns/include/dns/Makefile.in
  projects/camlock/contrib/bind9/lib/dns/include/dns/acache.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/acl.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/adb.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/cache.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/callbacks.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/db.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/dispatch.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/dlz_dlopen.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/dnssec.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/events.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/journal.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/log.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/master.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/masterdump.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/nsec.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/nsec3.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/private.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/rdata.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/rdataset.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/resolver.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/result.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/rpz.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/rriterator.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/sdb.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/sdlz.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/time.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/types.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/view.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/zone.h
  projects/camlock/contrib/bind9/lib/dns/include/dns/zt.h
  projects/camlock/contrib/bind9/lib/dns/include/dst/dst.h
  projects/camlock/contrib/bind9/lib/dns/iptable.c
  projects/camlock/contrib/bind9/lib/dns/journal.c
  projects/camlock/contrib/bind9/lib/dns/key.c
  projects/camlock/contrib/bind9/lib/dns/keytable.c
  projects/camlock/contrib/bind9/lib/dns/log.c
  projects/camlock/contrib/bind9/lib/dns/lookup.c
  projects/camlock/contrib/bind9/lib/dns/master.c
  projects/camlock/contrib/bind9/lib/dns/masterdump.c
  projects/camlock/contrib/bind9/lib/dns/message.c
  projects/camlock/contrib/bind9/lib/dns/nsec.c
  projects/camlock/contrib/bind9/lib/dns/nsec3.c
  projects/camlock/contrib/bind9/lib/dns/openssldh_link.c
  projects/camlock/contrib/bind9/lib/dns/openssldsa_link.c
  projects/camlock/contrib/bind9/lib/dns/opensslecdsa_link.c
  projects/camlock/contrib/bind9/lib/dns/opensslgost_link.c
  projects/camlock/contrib/bind9/lib/dns/opensslrsa_link.c
  projects/camlock/contrib/bind9/lib/dns/private.c
  projects/camlock/contrib/bind9/lib/dns/rbt.c
  projects/camlock/contrib/bind9/lib/dns/rbtdb.c
  projects/camlock/contrib/bind9/lib/dns/rdata.c
  projects/camlock/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/cert_37.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/ds_43.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/key_25.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/opt_41.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/sig_24.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/soa_6.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/tkey_249.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/uri_256.c
  projects/camlock/contrib/bind9/lib/dns/rdata/generic/uri_256.h
  projects/camlock/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c
  projects/camlock/contrib/bind9/lib/dns/resolver.c
  projects/camlock/contrib/bind9/lib/dns/sdb.c
  projects/camlock/contrib/bind9/lib/dns/sdlz.c
  projects/camlock/contrib/bind9/lib/dns/validator.c
  projects/camlock/contrib/bind9/lib/dns/view.c
  projects/camlock/contrib/bind9/lib/dns/xfrin.c
  projects/camlock/contrib/bind9/lib/dns/zone.c
  projects/camlock/contrib/bind9/lib/dns/zt.c
  projects/camlock/contrib/bind9/lib/irs/api
  projects/camlock/contrib/bind9/lib/isc/Makefile.in
  projects/camlock/contrib/bind9/lib/isc/api
  projects/camlock/contrib/bind9/lib/isc/include/isc/heap.h
  projects/camlock/contrib/bind9/lib/isc/include/isc/list.h
  projects/camlock/contrib/bind9/lib/isc/include/isc/mem.h
  projects/camlock/contrib/bind9/lib/isc/include/isc/namespace.h
  projects/camlock/contrib/bind9/lib/isc/include/isc/radix.h
  projects/camlock/contrib/bind9/lib/isc/include/isc/socket.h
  projects/camlock/contrib/bind9/lib/isc/include/isc/task.h
  projects/camlock/contrib/bind9/lib/isc/include/isc/taskpool.h
  projects/camlock/contrib/bind9/lib/isc/log.c
  projects/camlock/contrib/bind9/lib/isc/radix.c
  projects/camlock/contrib/bind9/lib/isc/socket_api.c
  projects/camlock/contrib/bind9/lib/isc/task.c
  projects/camlock/contrib/bind9/lib/isc/task_api.c
  projects/camlock/contrib/bind9/lib/isc/task_p.h
  projects/camlock/contrib/bind9/lib/isc/taskpool.c
  projects/camlock/contrib/bind9/lib/isc/unix/socket.c
  projects/camlock/contrib/bind9/lib/isccc/api
  projects/camlock/contrib/bind9/lib/isccfg/api
  projects/camlock/contrib/bind9/lib/isccfg/namedconf.c
  projects/camlock/contrib/bind9/lib/lwres/api
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_config.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_config.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_config.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_context.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_context.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_context.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_gabn.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_gabn.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_gabn.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_gethostent.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_gethostent.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_getipnode.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_getipnode.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_gnba.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_gnba.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_gnba.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_hstrerror.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_inetntop.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_inetntop.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_noop.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_noop.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_noop.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_packet.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_packet.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_packet.html
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_resutil.3
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_resutil.docbook
  projects/camlock/contrib/bind9/lib/lwres/man/lwres_resutil.html
  projects/camlock/contrib/bind9/lib/lwres/print_p.h
  projects/camlock/contrib/bind9/lib/lwres/strtoul.c
  projects/camlock/contrib/bind9/lib/lwres/unix/Makefile.in
  projects/camlock/contrib/bind9/lib/lwres/unix/include/Makefile.in
  projects/camlock/contrib/bind9/lib/lwres/unix/include/lwres/Makefile.in
  projects/camlock/contrib/bind9/lib/lwres/unix/include/lwres/net.h
  projects/camlock/contrib/bind9/lib/lwres/version.c
  projects/camlock/contrib/bind9/make/Makefile.in
  projects/camlock/contrib/bind9/make/includes.in
  projects/camlock/contrib/bind9/make/rules.in
  projects/camlock/contrib/bind9/mkinstalldirs
  projects/camlock/contrib/bind9/version
  projects/camlock/contrib/binutils/gas/config/tc-arm.c
  projects/camlock/contrib/bmake/job.c
  projects/camlock/contrib/bmake/make.1
  projects/camlock/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
  projects/camlock/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp
  projects/camlock/etc/rc.d/bsnmpd
  projects/camlock/include/dirent.h
  projects/camlock/include/unistd.h
  projects/camlock/lib/bind/config.h
  projects/camlock/lib/bind/dns/Makefile
  projects/camlock/lib/bind/dns/code.h
  projects/camlock/lib/bind/dns/dns/rdatastruct.h
  projects/camlock/lib/bind/isc/Makefile
  projects/camlock/lib/libc/amd64/sys/setlogin.S
  projects/camlock/lib/libc/gen/Makefile.inc
  projects/camlock/lib/libc/gen/Symbol.map
  projects/camlock/lib/libc/gen/closedir.c
  projects/camlock/lib/libc/gen/directory.3
  projects/camlock/lib/libc/gen/getlogin.c
  projects/camlock/lib/libc/gen/strtofflags.c
  projects/camlock/lib/libc/i386/sys/setlogin.S
  projects/camlock/lib/libc/include/libc_private.h
  projects/camlock/lib/libc/net/ether_addr.c
  projects/camlock/lib/libc/net/eui64.c
  projects/camlock/lib/libc/net/getaddrinfo.c
  projects/camlock/lib/libc/net/gethostbyht.c
  projects/camlock/lib/libc/net/gethostbyname.3
  projects/camlock/lib/libc/net/getnetbyht.c
  projects/camlock/lib/libc/net/getprotoent.c
  projects/camlock/lib/libc/net/getservent.c
  projects/camlock/lib/libc/net/hesiod.c
  projects/camlock/lib/libc/net/nsdispatch.c
  projects/camlock/lib/libc/net/rcmd.c
  projects/camlock/lib/libc/posix1e/mac.c
  projects/camlock/lib/libc/resolv/res_init.c
  projects/camlock/lib/libc/resolv/res_query.c
  projects/camlock/lib/libc/stdlib/strtonum.3
  projects/camlock/lib/libc/sys/cap_ioctls_limit.2
  projects/camlock/lib/libc/sys/chflags.2
  projects/camlock/lib/libc/sys/dup.2
  projects/camlock/lib/libc/sys/mmap.2
  projects/camlock/lib/libc/sys/pselect.2
  projects/camlock/lib/libc/sys/sigsuspend.2
  projects/camlock/lib/libfetch/http.c
  projects/camlock/lib/libthread_db/arch/arm/libpthread_md.c
  projects/camlock/lib/libutil/expand_number.c
  projects/camlock/sbin/fsck_ffs/fsutil.c
  projects/camlock/sbin/iscontrol/auth_subr.c
  projects/camlock/sbin/iscontrol/config.c
  projects/camlock/sbin/iscontrol/fsm.c
  projects/camlock/sbin/iscontrol/iscontrol.c
  projects/camlock/sbin/iscontrol/login.c
  projects/camlock/sbin/iscontrol/misc.c
  projects/camlock/sbin/iscontrol/pdu.c
  projects/camlock/share/doc/bind9/Makefile
  projects/camlock/share/man/man4/Makefile
  projects/camlock/share/man/man4/udav.4
  projects/camlock/share/man/man9/SDT.9
  projects/camlock/share/man/man9/atomic.9
  projects/camlock/share/man/man9/sleep.9
  projects/camlock/share/man/man9/timeout.9
  projects/camlock/share/man/man9/vm_page_grab.9
  projects/camlock/share/mk/bsd.own.mk
  projects/camlock/sys/amd64/amd64/minidump_machdep.c
  projects/camlock/sys/amd64/amd64/pmap.c
  projects/camlock/sys/amd64/conf/GENERIC
  projects/camlock/sys/amd64/conf/NOTES
  projects/camlock/sys/amd64/include/asm.h
  projects/camlock/sys/amd64/include/atomic.h
  projects/camlock/sys/amd64/include/pmap.h
  projects/camlock/sys/amd64/include/vmparam.h
  projects/camlock/sys/amd64/vmm/intel/vtd.c
  projects/camlock/sys/arm/arm/genassym.c
  projects/camlock/sys/arm/arm/machdep.c
  projects/camlock/sys/arm/arm/mp_machdep.c
  projects/camlock/sys/arm/arm/pmap-v6.c
  projects/camlock/sys/arm/arm/pmap.c
  projects/camlock/sys/arm/arm/swtch.S
  projects/camlock/sys/arm/arm/undefined.c
  projects/camlock/sys/arm/arm/vfp.c
  projects/camlock/sys/arm/conf/ARMADAXP
  projects/camlock/sys/arm/conf/ARNDALE
  projects/camlock/sys/arm/conf/BEAGLEBONE
  projects/camlock/sys/arm/conf/CUBIEBOARD
  projects/camlock/sys/arm/conf/CUBIEBOARD2
  projects/camlock/sys/arm/conf/EFIKA_MX
  projects/camlock/sys/arm/conf/PANDABOARD
  projects/camlock/sys/arm/conf/RPI-B
  projects/camlock/sys/arm/conf/VERSATILEPB
  projects/camlock/sys/arm/conf/ZEDBOARD
  projects/camlock/sys/arm/include/fp.h
  projects/camlock/sys/arm/include/pcb.h
  projects/camlock/sys/arm/include/pcpu.h
  projects/camlock/sys/arm/include/pmap.h
  projects/camlock/sys/arm/samsung/exynos/exynos5_machdep.c
  projects/camlock/sys/arm/ti/am335x/am335x_prcm.c
  projects/camlock/sys/arm/ti/am335x/files.am335x
  projects/camlock/sys/arm/ti/files.ti
  projects/camlock/sys/arm/ti/ti_prcm.h
  projects/camlock/sys/boot/fdt/dts/am335x.dtsi
  projects/camlock/sys/boot/i386/libi386/biosacpi.c
  projects/camlock/sys/cam/scsi/scsi_all.h
  projects/camlock/sys/cam/scsi/scsi_sa.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  projects/camlock/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S
  projects/camlock/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
  projects/camlock/sys/cddl/dev/fbt/fbt.c
  projects/camlock/sys/cddl/dev/sdt/sdt.c
  projects/camlock/sys/compat/freebsd32/freebsd32_misc.c
  projects/camlock/sys/compat/freebsd32/freebsd32_proto.h
  projects/camlock/sys/compat/freebsd32/freebsd32_syscall.h
  projects/camlock/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/camlock/sys/compat/freebsd32/freebsd32_sysent.c
  projects/camlock/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/camlock/sys/compat/freebsd32/syscalls.master
  projects/camlock/sys/compat/linux/linux_dtrace.h
  projects/camlock/sys/conf/NOTES
  projects/camlock/sys/conf/files
  projects/camlock/sys/conf/files.amd64
  projects/camlock/sys/conf/files.arm
  projects/camlock/sys/conf/files.i386
  projects/camlock/sys/conf/options
  projects/camlock/sys/conf/options.amd64
  projects/camlock/sys/conf/options.arm
  projects/camlock/sys/conf/options.i386
  projects/camlock/sys/contrib/rdma/krping/krping.c
  projects/camlock/sys/contrib/rdma/krping/krping.h
  projects/camlock/sys/contrib/rdma/krping/krping_dev.c
  projects/camlock/sys/dev/agp/agp.c
  projects/camlock/sys/dev/agp/agp_i810.c
  projects/camlock/sys/dev/ath/if_ath_tx.c
  projects/camlock/sys/dev/bce/if_bce.c
  projects/camlock/sys/dev/bxe/if_bxe.c
  projects/camlock/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
  projects/camlock/sys/dev/cxgbe/t4_main.c
  projects/camlock/sys/dev/cxgbe/t4_sge.c
  projects/camlock/sys/dev/drm2/i915/i915_gem.c
  projects/camlock/sys/dev/drm2/ttm/ttm_tt.c
  projects/camlock/sys/dev/hwpmc/hwpmc_core.c
  projects/camlock/sys/dev/hwpmc/pmc_events.h
  projects/camlock/sys/dev/md/md.c
  projects/camlock/sys/dev/mge/if_mge.c
  projects/camlock/sys/dev/mmc/mmc.c
  projects/camlock/sys/dev/mmc/mmcsd.c
  projects/camlock/sys/dev/mps/mps_sas.c
  projects/camlock/sys/dev/nvme/nvme_ns.c
  projects/camlock/sys/dev/sdhci/sdhci.c
  projects/camlock/sys/dev/sdhci/sdhci.h
  projects/camlock/sys/dev/streams/streams.c
  projects/camlock/sys/dev/ti/if_ti.c
  projects/camlock/sys/dev/uart/uart.h
  projects/camlock/sys/dev/uart/uart_bus_fdt.c
  projects/camlock/sys/dev/uart/uart_core.c
  projects/camlock/sys/dev/uart/uart_cpu_fdt.c
  projects/camlock/sys/dev/uart/uart_dev_ns8250.c
  projects/camlock/sys/dev/usb/controller/ehci_pci.c
  projects/camlock/sys/dev/usb/controller/ohci_pci.c
  projects/camlock/sys/dev/usb/input/ukbd.c
  projects/camlock/sys/dev/usb/net/if_udav.c
  projects/camlock/sys/fs/devfs/devfs_vnops.c
  projects/camlock/sys/fs/msdosfs/msdosfs_denode.c
  projects/camlock/sys/fs/msdosfs/msdosfs_vnops.c
  projects/camlock/sys/fs/smbfs/smbfs_node.c
  projects/camlock/sys/fs/smbfs/smbfs_vnops.c
  projects/camlock/sys/fs/tmpfs/tmpfs_vnops.c
  projects/camlock/sys/geom/geom_dev.c
  projects/camlock/sys/i386/conf/GENERIC
  projects/camlock/sys/i386/conf/NOTES
  projects/camlock/sys/i386/i386/genassym.c
  projects/camlock/sys/i386/i386/initcpu.c
  projects/camlock/sys/i386/i386/machdep.c
  projects/camlock/sys/i386/i386/pmap.c
  projects/camlock/sys/i386/include/asm.h
  projects/camlock/sys/i386/include/atomic.h
  projects/camlock/sys/i386/include/pmap.h
  projects/camlock/sys/i386/xen/locore.s
  projects/camlock/sys/i386/xen/pmap.c
  projects/camlock/sys/ia64/conf/GENERIC
  projects/camlock/sys/ia64/ia64/pmap.c
  projects/camlock/sys/kern/kern_exec.c
  projects/camlock/sys/kern/kern_kthread.c
  projects/camlock/sys/kern/kern_linker.c
  projects/camlock/sys/kern/kern_physio.c
  projects/camlock/sys/kern/kern_sharedpage.c
  projects/camlock/sys/kern/subr_vmem.c
  projects/camlock/sys/kern/sys_capability.c
  projects/camlock/sys/kern/sys_procdesc.c
  projects/camlock/sys/kern/uipc_mbuf.c
  projects/camlock/sys/kern/uipc_mqueue.c
  projects/camlock/sys/kern/uipc_shm.c
  projects/camlock/sys/kern/uipc_socket.c
  projects/camlock/sys/kern/uipc_syscalls.c
  projects/camlock/sys/kern/vfs_aio.c
  projects/camlock/sys/kern/vfs_bio.c
  projects/camlock/sys/kern/vfs_cluster.c
  projects/camlock/sys/kern/vfs_subr.c
  projects/camlock/sys/kern/vfs_syscalls.c
  projects/camlock/sys/kern/vfs_vnops.c
  projects/camlock/sys/mips/atheros/if_arge.c
  projects/camlock/sys/mips/conf/DIR-825.hints
  projects/camlock/sys/mips/mips/pmap.c
  projects/camlock/sys/modules/Makefile
  projects/camlock/sys/modules/dtrace/Makefile
  projects/camlock/sys/modules/rdma/Makefile
  projects/camlock/sys/modules/vmm/Makefile
  projects/camlock/sys/net/if_ethersubr.c
  projects/camlock/sys/net/rtsock.c
  projects/camlock/sys/net80211/ieee80211_freebsd.h
  projects/camlock/sys/net80211/ieee80211_hostap.c
  projects/camlock/sys/net80211/ieee80211_input.c
  projects/camlock/sys/net80211/ieee80211_output.c
  projects/camlock/sys/net80211/ieee80211_tdma.c
  projects/camlock/sys/netinet/if_ether.c
  projects/camlock/sys/netinet/igmp.c
  projects/camlock/sys/netinet/in_mcast.c
  projects/camlock/sys/netinet/ip_fastfwd.c
  projects/camlock/sys/netinet/ip_input.c
  projects/camlock/sys/netinet/ip_output.c
  projects/camlock/sys/netinet/ip_var.h
  projects/camlock/sys/netinet/sctp_os_bsd.h
  projects/camlock/sys/netinet/sctp_structs.h
  projects/camlock/sys/netinet/sctp_uio.h
  projects/camlock/sys/netinet6/in6_mcast.c
  projects/camlock/sys/netinet6/ip6_mroute.c
  projects/camlock/sys/netinet6/ip6_var.h
  projects/camlock/sys/netinet6/mld6.c
  projects/camlock/sys/netinet6/nd6.c
  projects/camlock/sys/netinet6/send.c
  projects/camlock/sys/netpfil/pf/pf.c
  projects/camlock/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  projects/camlock/sys/ofed/include/linux/net.h
  projects/camlock/sys/pc98/conf/GENERIC
  projects/camlock/sys/pc98/pc98/machdep.c
  projects/camlock/sys/powerpc/aim/mmu_oea.c
  projects/camlock/sys/powerpc/aim/mmu_oea64.c
  projects/camlock/sys/powerpc/booke/pmap.c
  projects/camlock/sys/powerpc/conf/GENERIC
  projects/camlock/sys/powerpc/conf/GENERIC64
  projects/camlock/sys/powerpc/powermac/kiic.c
  projects/camlock/sys/security/mac/mac_framework.h
  projects/camlock/sys/security/mac/mac_policy.h
  projects/camlock/sys/security/mac/mac_posix_shm.c
  projects/camlock/sys/security/mac_biba/mac_biba.c
  projects/camlock/sys/security/mac_mls/mac_mls.c
  projects/camlock/sys/security/mac_stub/mac_stub.c
  projects/camlock/sys/security/mac_test/mac_test.c
  projects/camlock/sys/sparc64/conf/GENERIC
  projects/camlock/sys/sparc64/sparc64/pmap.c
  projects/camlock/sys/sys/buf.h
  projects/camlock/sys/sys/callout.h
  projects/camlock/sys/sys/conf.h
  projects/camlock/sys/sys/file.h
  projects/camlock/sys/sys/filedesc.h
  projects/camlock/sys/sys/mbuf.h
  projects/camlock/sys/sys/mman.h
  projects/camlock/sys/sys/param.h
  projects/camlock/sys/sys/sdt.h
  projects/camlock/sys/sys/stat.h
  projects/camlock/sys/sys/stdatomic.h
  projects/camlock/sys/sys/syscallsubr.h
  projects/camlock/sys/sys/uio.h
  projects/camlock/sys/ufs/ufs/ufs_vnops.c
  projects/camlock/sys/vm/swap_pager.c
  projects/camlock/sys/vm/vm_glue.c
  projects/camlock/sys/vm/vm_init.c
  projects/camlock/sys/vm/vm_kern.c
  projects/camlock/sys/vm/vm_map.c
  projects/camlock/sys/vm/vm_map.h
  projects/camlock/sys/vm/vm_mmap.c
  projects/camlock/sys/vm/vm_object.c
  projects/camlock/sys/vm/vm_page.c
  projects/camlock/sys/vm/vm_page.h
  projects/camlock/sys/vm/vm_pageout.c
  projects/camlock/sys/vm/vm_radix.c
  projects/camlock/sys/vm/vm_radix.h
  projects/camlock/tools/regression/file/dup/dup.c
  projects/camlock/tools/test/posixshm/shm_test.c
  projects/camlock/tools/tools/ifinfo/ifinfo.c
  projects/camlock/usr.bin/Makefile
  projects/camlock/usr.bin/calendar/Makefile
  projects/camlock/usr.bin/dtc/dtc.1
  projects/camlock/usr.bin/dtc/dtc.cc
  projects/camlock/usr.bin/dtc/fdt.cc
  projects/camlock/usr.bin/dtc/fdt.hh
  projects/camlock/usr.bin/kdump/mksubr
  projects/camlock/usr.bin/netstat/inet6.c
  projects/camlock/usr.bin/nslookup/Makefile
  projects/camlock/usr.bin/nsupdate/Makefile
  projects/camlock/usr.bin/procstat/procstat_files.c
  projects/camlock/usr.bin/truss/syscalls.c
  projects/camlock/usr.sbin/Makefile
  projects/camlock/usr.sbin/bhyve/pci_emul.c
  projects/camlock/usr.sbin/makefs/makefs.8
  projects/camlock/usr.sbin/makefs/makefs.c
  projects/camlock/usr.sbin/pkg_install/add/main.c
  projects/camlock/usr.sbin/rtadvd/config.c
  projects/camlock/usr.sbin/rtsold/dump.c
  projects/camlock/usr.sbin/rtsold/if.c
  projects/camlock/usr.sbin/rtsold/probe.c
  projects/camlock/usr.sbin/rtsold/rtsock.c
  projects/camlock/usr.sbin/rtsold/rtsol.c
  projects/camlock/usr.sbin/rtsold/rtsold.c
  projects/camlock/usr.sbin/rtsold/rtsold.h
  projects/camlock/usr.sbin/rwhod/rwhod.c
Directory Properties:
  projects/camlock/   (props changed)
  projects/camlock/cddl/   (props changed)
  projects/camlock/cddl/contrib/opensolaris/   (props changed)
  projects/camlock/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/camlock/contrib/bind9/   (props changed)
  projects/camlock/contrib/binutils/   (props changed)
  projects/camlock/contrib/bmake/   (props changed)
  projects/camlock/contrib/llvm/   (props changed)
  projects/camlock/contrib/llvm/tools/clang/   (props changed)
  projects/camlock/lib/libc/   (props changed)
  projects/camlock/lib/libutil/   (props changed)
  projects/camlock/sbin/   (props changed)
  projects/camlock/share/man/man4/   (props changed)
  projects/camlock/sys/   (props changed)
  projects/camlock/sys/amd64/vmm/   (props changed)
  projects/camlock/sys/boot/   (props changed)
  projects/camlock/sys/cddl/contrib/opensolaris/   (props changed)
  projects/camlock/sys/conf/   (props changed)
  projects/camlock/sys/modules/vmm/   (props changed)
  projects/camlock/usr.bin/calendar/   (props changed)
  projects/camlock/usr.bin/procstat/   (props changed)
  projects/camlock/usr.sbin/bhyve/   (props changed)
  projects/camlock/usr.sbin/rtadvd/   (props changed)
  projects/camlock/usr.sbin/rtsold/   (props changed)

Modified: projects/camlock/Makefile
==============================================================================
--- projects/camlock/Makefile	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/Makefile	Fri Aug 23 21:46:11 2013	(r254740)
@@ -242,6 +242,7 @@ cleanworld:
 # skip this for -n to avoid changing previous behavior of 
 # 'make -n buildworld' etc.
 ${TGTS}: .MAKE
+tinderbox toolchains kernel-toolchains: .MAKE
 .endif
 
 ${TGTS}:
@@ -348,19 +349,21 @@ make bmake: .PHONY
 	@echo ">>> Building an up-to-date make(1)"
 	@echo "--------------------------------------------------------------"
 	${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \
-		${MMAKE} obj && \
-		${MMAKE} depend && \
-		${MMAKE} all && \
+		${MMAKE} obj DESTDIR= && \
+		${MMAKE} depend DESTDIR= && \
+		${MMAKE} all DESTDIR= && \
 		${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= PROGNAME=${MYMAKE:T}
 
+tinderbox toolchains kernel-toolchains: upgrade_checks
+
 tinderbox:
-	@cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe
+	@cd ${.CURDIR} && ${SUB_MAKE} DOING_TINDERBOX=YES universe
 
 toolchains:
-	@cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=toolchain universe
+	@cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=toolchain universe
 
 kernel-toolchains:
-	@cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=kernel-toolchain universe
+	@cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe
 
 #
 # universe
@@ -419,7 +422,7 @@ universe_${target}_prologue: universe_pr
 .if !defined(MAKE_JUST_KERNELS)
 .for target_arch in ${TARGET_ARCHES_${target}}
 universe_${target}: universe_${target}_${target_arch}
-universe_${target}_${target_arch}: universe_${target}_prologue
+universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
 	@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`"
 	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
 	    ${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
@@ -440,7 +443,7 @@ universe_${target}_kernels: universe_${t
 .endfor
 .endif
 universe_${target}: universe_${target}_kernels
-universe_${target}_kernels: universe_${target}_prologue
+universe_${target}_kernels: universe_${target}_prologue .MAKE
 .if exists(${KERNSRCDIR}/${target}/conf/NOTES)
 	@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
 	    ${SUB_MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
@@ -468,7 +471,7 @@ TARGET_ARCH_${kernel}!=	cd ${KERNSRCDIR}
 .error "Target architecture for ${TARGET}/conf/${kernel} unknown.  config(8) likely too old."
 .endif
 universe_kernconfs: universe_kernconf_${TARGET}_${kernel}
-universe_kernconf_${TARGET}_${kernel}:
+universe_kernconf_${TARGET}_${kernel}: .MAKE
 	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
 	    ${SUB_MAKE} ${JFLAG} buildkernel \
 	    TARGET=${TARGET} \

Modified: projects/camlock/UPDATING
==============================================================================
--- projects/camlock/UPDATING	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/UPDATING	Fri Aug 23 21:46:11 2013	(r254740)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130821:
+	The PADLOCK_RNG and RDRAND_RNG kernel options are now devices.
+	Thus "device padlock_rng" and "device rdrand_rng" should be
+	used instead of "options PADLOCK_RNG" & "options RDRAND_RNG".
+
 20130813:
 	WITH_ICONV has been split into two feature sets.  WITH_ICONV now
 	enables just the iconv* functionality and is now on by default.
@@ -340,9 +345,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 20120913:
 	The random(4) support for the VIA hardware random number
 	generator (`PADLOCK') is no longer enabled unconditionally.
-	Add the PADLOCK_RNG option in the custom kernel config if
+	Add the padlock_rng device in the custom kernel config if
 	needed.  The GENERIC kernels on i386 and amd64 do include the
-	option, so the change only affects the custom kernel
+	device, so the change only affects the custom kernel
 	configurations.
 
 20120908:

Modified: projects/camlock/bin/chflags/chflags.1
==============================================================================
--- projects/camlock/bin/chflags/chflags.1	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/bin/chflags/chflags.1	Fri Aug 23 21:46:11 2013	(r254740)
@@ -32,7 +32,7 @@
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
 .\" $FreeBSD$
 .\"
-.Dd March 3, 2006
+.Dd April 8, 2013
 .Dt CHFLAGS 1
 .Os
 .Sh NAME
@@ -101,20 +101,36 @@ The following keywords are currently def
 .Bl -tag -offset indent -width ".Cm opaque"
 .It Cm arch , archived
 set the archived flag (super-user only)
-.It Cm opaque
-set the opaque flag (owner or super-user only)
 .It Cm nodump
 set the nodump flag (owner or super-user only)
+.It Cm opaque
+set the opaque flag (owner or super-user only)
 .It Cm sappnd , sappend
 set the system append-only flag (super-user only)
 .It Cm schg , schange , simmutable
 set the system immutable flag (super-user only)
+.It Cm snapshot
+set the snapshot flag (filesystems do not allow changing this flag)
 .It Cm sunlnk , sunlink
 set the system undeletable flag (super-user only)
 .It Cm uappnd , uappend
 set the user append-only flag (owner or super-user only)
+.It Cm uarch , uarchive
+set the archive flag (owner or super-user only)
 .It Cm uchg , uchange , uimmutable
 set the user immutable flag (owner or super-user only)
+.It Cm uhidden , hidden
+set the hidden file attribute (owner or super-user only)
+.It Cm uoffline , offline
+set the offline file attribute (owner or super-user only)
+.It Cm urdonly , rdonly , readonly
+set the DOS, Windows and CIFS readonly flag (owner or super-user only)
+.It Cm usparse , sparse
+set the sparse file attribute (owner or super-user only)
+.It Cm usystem , system
+set the DOS, Windows and CIFS system flag (owner or super-user only)
+.It Cm ureparse , reparse
+set the Windows reparse point file attribute (owner or super-user only)
 .It Cm uunlnk , uunlink
 set the user undeletable flag (owner or super-user only)
 .El

Modified: projects/camlock/bin/ls/ls.1
==============================================================================
--- projects/camlock/bin/ls/ls.1	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/bin/ls/ls.1	Fri Aug 23 21:46:11 2013	(r254740)
@@ -232,6 +232,9 @@ output.
 Include the file flags in a long
 .Pq Fl l
 output.
+See
+.Xr chflags 1
+for a list of file flags and their meanings.
 .It Fl p
 Write a slash
 .Pq Ql /

Modified: projects/camlock/bin/sh/eval.c
==============================================================================
--- projects/camlock/bin/sh/eval.c	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/bin/sh/eval.c	Fri Aug 23 21:46:11 2013	(r254740)
@@ -109,7 +109,6 @@ reseteval(void)
 {
 	evalskip = 0;
 	loopnest = 0;
-	funcnest = 0;
 }
 
 

Modified: projects/camlock/bin/sh/jobs.c
==============================================================================
--- projects/camlock/bin/sh/jobs.c	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/bin/sh/jobs.c	Fri Aug 23 21:46:11 2013	(r254740)
@@ -183,13 +183,14 @@ out:				out2fmt_flush("sh: can't access 
 
 #if JOBS
 int
-fgcmd(int argc __unused, char **argv)
+fgcmd(int argc __unused, char **argv __unused)
 {
 	struct job *jp;
 	pid_t pgrp;
 	int status;
 
-	jp = getjob(argv[1]);
+	nextopt("");
+	jp = getjob(*argptr);
 	if (jp->jobctl == 0)
 		error("job not created under job control");
 	printjobcmd(jp);
@@ -210,8 +211,9 @@ bgcmd(int argc, char **argv)
 {
 	struct job *jp;
 
+	nextopt("");
 	do {
-		jp = getjob(*++argv);
+		jp = getjob(*argptr);
 		if (jp->jobctl == 0)
 			error("job not created under job control");
 		if (jp->state == JOBDONE)
@@ -220,7 +222,7 @@ bgcmd(int argc, char **argv)
 		jp->foreground = 0;
 		out1fmt("[%td] ", jp - jobtab + 1);
 		printjobcmd(jp);
-	} while (--argc > 1);
+	} while (*argptr != NULL && *++argptr != NULL);
 	return 0;
 }
 
@@ -542,12 +544,13 @@ waitcmdloop(struct job *job)
 
 
 int
-jobidcmd(int argc __unused, char **argv)
+jobidcmd(int argc __unused, char **argv __unused)
 {
 	struct job *jp;
 	int i;
 
-	jp = getjob(argv[1]);
+	nextopt("");
+	jp = getjob(*argptr);
 	for (i = 0 ; i < jp->nprocs ; ) {
 		out1fmt("%d", (int)jp->ps[i].pid);
 		out1c(++i < jp->nprocs? ' ' : '\n');

Modified: projects/camlock/bin/sh/main.c
==============================================================================
--- projects/camlock/bin/sh/main.c	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/bin/sh/main.c	Fri Aug 23 21:46:11 2013	(r254740)
@@ -185,8 +185,6 @@ reset(void)
 {
 	reseteval();
 	resetinput();
-	resetparser();
-	resetredir();
 }
 
 /*

Modified: projects/camlock/bin/sh/parser.c
==============================================================================
--- projects/camlock/bin/sh/parser.c	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/bin/sh/parser.c	Fri Aug 23 21:46:11 2013	(r254740)
@@ -210,6 +210,7 @@ parsecmd(int interact)
 	heredoclist = NULL;
 
 	tokpushback = 0;
+	checkkwd = 0;
 	doprompt = interact;
 	if (doprompt)
 		setprompt(1);
@@ -1822,14 +1823,6 @@ parsearith: {
 } /* end of readtoken */
 
 
-void
-resetparser(void)
-{
-	tokpushback = 0;
-	checkkwd = 0;
-}
-
-
 /*
  * Returns true if the text contains nothing to expand (no dollar signs
  * or backquotes).

Modified: projects/camlock/bin/sh/parser.h
==============================================================================
--- projects/camlock/bin/sh/parser.h	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/bin/sh/parser.h	Fri Aug 23 21:46:11 2013	(r254740)
@@ -79,7 +79,6 @@ extern const char *const parsekwd[];
 
 union node *parsecmd(int);
 void fixredir(union node *, const char *, int);
-void resetparser(void);
 int goodname(const char *);
 int isassignment(const char *);
 char *getprompt(void *);

Modified: projects/camlock/bin/sh/redir.c
==============================================================================
--- projects/camlock/bin/sh/redir.c	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/bin/sh/redir.c	Fri Aug 23 21:46:11 2013	(r254740)
@@ -319,18 +319,6 @@ popredir(void)
 	INTON;
 }
 
-/*
- * Undo all redirections.  Called on error or interrupt.
- */
-
-void
-resetredir(void)
-{
-	while (redirlist)
-		popredir();
-}
-
-
 /* Return true if fd 0 has already been redirected at least once.  */
 int
 fd0_redirected_p(void)

Modified: projects/camlock/bin/sh/redir.h
==============================================================================
--- projects/camlock/bin/sh/redir.h	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/bin/sh/redir.h	Fri Aug 23 21:46:11 2013	(r254740)
@@ -40,7 +40,6 @@
 union node;
 void redirect(union node *, int);
 void popredir(void);
-void resetredir(void);
 int fd0_redirected_p(void);
 void clearredir(void);
 

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Aug 23 21:46:11 2013	(r254740)
@@ -1295,12 +1295,13 @@ print_status_config(zpool_handle_t *zhp,
     int namewidth, int depth, boolean_t isspare)
 {
 	nvlist_t **child;
-	uint_t c, children;
+	uint_t c, vsc, children;
 	pool_scan_stat_t *ps = NULL;
 	vdev_stat_t *vs;
 	char rbuf[6], wbuf[6], cbuf[6];
 	char *vname;
 	uint64_t notpresent;
+	uint64_t ashift;
 	spare_cbdata_t cb;
 	const char *state;
 
@@ -1309,7 +1310,7 @@ print_status_config(zpool_handle_t *zhp,
 		children = 0;
 
 	verify(nvlist_lookup_uint64_array(nv, ZPOOL_CONFIG_VDEV_STATS,
-	    (uint64_t **)&vs, &c) == 0);
+	    (uint64_t **)&vs, &vsc) == 0);
 
 	state = zpool_state_to_name(vs->vs_state, vs->vs_aux);
 	if (isspare) {
@@ -1363,6 +1364,10 @@ print_status_config(zpool_handle_t *zhp,
 			(void) printf(gettext("unsupported feature(s)"));
 			break;
 
+		case VDEV_AUX_ASHIFT_TOO_BIG:
+			(void) printf(gettext("unsupported minimum blocksize"));
+			break;
+
 		case VDEV_AUX_SPARED:
 			verify(nvlist_lookup_uint64(nv, ZPOOL_CONFIG_GUID,
 			    &cb.cb_guid) == 0);
@@ -1405,6 +1410,12 @@ print_status_config(zpool_handle_t *zhp,
 			(void) printf(gettext("corrupted data"));
 			break;
 		}
+	} else if (children == 0 && !isspare &&
+	    VDEV_STAT_VALID(vs_physical_ashift, vsc) &&
+	    vs->vs_configured_ashift < vs->vs_physical_ashift) {
+		(void) printf(
+		    gettext("  block size: %dB configured, %dB native"),
+		    1 << vs->vs_configured_ashift, 1 << vs->vs_physical_ashift);
 	}
 
 	(void) nvlist_lookup_uint64_array(nv, ZPOOL_CONFIG_SCAN_STATS,
@@ -4268,6 +4279,15 @@ status_callback(zpool_handle_t *zhp, voi
 		    "'zpool clear'.\n"));
 		break;
 
+	case ZPOOL_STATUS_NON_NATIVE_ASHIFT:
+		(void) printf(gettext("status: One or more devices are "
+		    "configured to use a non-native block size.\n"
+		    "\tExpect reduced performance.\n"));
+		(void) printf(gettext("action: Replace affected devices with "
+		    "devices that support the\n\tconfigured block size, or "
+		    "migrate data to a properly configured\n\tpool.\n"));
+		break;
+
 	default:
 		/*
 		 * The remaining errors can't actually be generated, yet.

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Fri Aug 23 21:46:11 2013	(r254740)
@@ -326,6 +326,7 @@ typedef enum {
 	ZPOOL_STATUS_RESILVERING,	/* device being resilvered */
 	ZPOOL_STATUS_OFFLINE_DEV,	/* device online */
 	ZPOOL_STATUS_REMOVED_DEV,	/* removed device */
+	ZPOOL_STATUS_NON_NATIVE_ASHIFT,	/* (e.g. 512e dev with ashift of 9) */
 
 	/*
 	 * Finally, the following indicates a healthy pool.

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Fri Aug 23 21:46:11 2013	(r254740)
@@ -3572,7 +3572,6 @@ zfs_rollback(zfs_handle_t *zhp, zfs_hand
 {
 	rollback_data_t cb = { 0 };
 	int err;
-	zfs_cmd_t zc = { 0 };
 	boolean_t restore_resv = 0;
 	uint64_t old_volsize, new_volsize;
 	zfs_prop_t resv_prop;
@@ -3604,22 +3603,15 @@ zfs_rollback(zfs_handle_t *zhp, zfs_hand
 		    (old_volsize == zfs_prop_get_int(zhp, resv_prop));
 	}
 
-	(void) strlcpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name));
-
-	if (ZFS_IS_VOLUME(zhp))
-		zc.zc_objset_type = DMU_OST_ZVOL;
-	else
-		zc.zc_objset_type = DMU_OST_ZFS;
-
 	/*
 	 * We rely on zfs_iter_children() to verify that there are no
 	 * newer snapshots for the given dataset.  Therefore, we can
 	 * simply pass the name on to the ioctl() call.  There is still
 	 * an unlikely race condition where the user has taken a
 	 * snapshot since we verified that this was the most recent.
-	 *
 	 */
-	if ((err = zfs_ioctl(zhp->zfs_hdl, ZFS_IOC_ROLLBACK, &zc)) != 0) {
+	err = lzc_rollback(zhp->zfs_name, NULL, 0);
+	if (err != 0) {
 		(void) zfs_standard_error_fmt(zhp->zfs_hdl, errno,
 		    dgettext(TEXT_DOMAIN, "cannot rollback '%s'"),
 		    zhp->zfs_name);

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c	Fri Aug 23 21:46:11 2013	(r254740)
@@ -73,57 +73,66 @@ static char *zfs_msgid_table[] = {
 
 /* ARGSUSED */
 static int
-vdev_missing(uint64_t state, uint64_t aux, uint64_t errs)
+vdev_missing(vdev_stat_t *vs, uint_t vsc)
 {
-	return (state == VDEV_STATE_CANT_OPEN &&
-	    aux == VDEV_AUX_OPEN_FAILED);
+	return (vs->vs_state == VDEV_STATE_CANT_OPEN &&
+	    vs->vs_aux == VDEV_AUX_OPEN_FAILED);
 }
 
 /* ARGSUSED */
 static int
-vdev_faulted(uint64_t state, uint64_t aux, uint64_t errs)
+vdev_faulted(vdev_stat_t *vs, uint_t vsc)
 {
-	return (state == VDEV_STATE_FAULTED);
+	return (vs->vs_state == VDEV_STATE_FAULTED);
 }
 
 /* ARGSUSED */
 static int
-vdev_errors(uint64_t state, uint64_t aux, uint64_t errs)
+vdev_errors(vdev_stat_t *vs, uint_t vsc)
 {
-	return (state == VDEV_STATE_DEGRADED || errs != 0);
+	return (vs->vs_state == VDEV_STATE_DEGRADED ||
+	    vs->vs_read_errors != 0 || vs->vs_write_errors != 0 ||
+	    vs->vs_checksum_errors != 0);
 }
 
 /* ARGSUSED */
 static int
-vdev_broken(uint64_t state, uint64_t aux, uint64_t errs)
+vdev_broken(vdev_stat_t *vs, uint_t vsc)
 {
-	return (state == VDEV_STATE_CANT_OPEN);
+	return (vs->vs_state == VDEV_STATE_CANT_OPEN);
 }
 
 /* ARGSUSED */
 static int
-vdev_offlined(uint64_t state, uint64_t aux, uint64_t errs)
+vdev_offlined(vdev_stat_t *vs, uint_t vsc)
 {
-	return (state == VDEV_STATE_OFFLINE);
+	return (vs->vs_state == VDEV_STATE_OFFLINE);
 }
 
 /* ARGSUSED */
 static int
-vdev_removed(uint64_t state, uint64_t aux, uint64_t errs)
+vdev_removed(vdev_stat_t *vs, uint_t vsc)
 {
-	return (state == VDEV_STATE_REMOVED);
+	return (vs->vs_state == VDEV_STATE_REMOVED);
+}
+
+static int
+vdev_non_native_ashift(vdev_stat_t *vs, uint_t vsc)
+{
+	return (VDEV_STAT_VALID(vs_physical_ashift, vsc) &&
+	    vs->vs_configured_ashift < vs->vs_physical_ashift);
 }
 
 /*
  * Detect if any leaf devices that have seen errors or could not be opened.
  */
 static boolean_t
-find_vdev_problem(nvlist_t *vdev, int (*func)(uint64_t, uint64_t, uint64_t))
+find_vdev_problem(nvlist_t *vdev, int (*func)(vdev_stat_t *, uint_t),
+    boolean_t ignore_replacing)
 {
 	nvlist_t **child;
 	vdev_stat_t *vs;
-	uint_t c, children;
-	char *type;
+	uint_t c, vsc, children;
 
 	/*
 	 * Ignore problems within a 'replacing' vdev, since we're presumably in
@@ -131,23 +140,25 @@ find_vdev_problem(nvlist_t *vdev, int (*
 	 * out again.  We'll pick up the fact that a resilver is happening
 	 * later.
 	 */
-	verify(nvlist_lookup_string(vdev, ZPOOL_CONFIG_TYPE, &type) == 0);
-	if (strcmp(type, VDEV_TYPE_REPLACING) == 0)
-		return (B_FALSE);
+	if (ignore_replacing == B_TRUE) {
+		char *type;
+
+		verify(nvlist_lookup_string(vdev, ZPOOL_CONFIG_TYPE,
+		    &type) == 0);
+		if (strcmp(type, VDEV_TYPE_REPLACING) == 0)
+			return (B_FALSE);
+	}
 
 	if (nvlist_lookup_nvlist_array(vdev, ZPOOL_CONFIG_CHILDREN, &child,
 	    &children) == 0) {
 		for (c = 0; c < children; c++)
-			if (find_vdev_problem(child[c], func))
+			if (find_vdev_problem(child[c], func, ignore_replacing))
 				return (B_TRUE);
 	} else {
 		verify(nvlist_lookup_uint64_array(vdev, ZPOOL_CONFIG_VDEV_STATS,
-		    (uint64_t **)&vs, &c) == 0);
+		    (uint64_t **)&vs, &vsc) == 0);
 
-		if (func(vs->vs_state, vs->vs_aux,
-		    vs->vs_read_errors +
-		    vs->vs_write_errors +
-		    vs->vs_checksum_errors))
+		if (func(vs, vsc) != 0)
 			return (B_TRUE);
 	}
 
@@ -157,7 +168,7 @@ find_vdev_problem(nvlist_t *vdev, int (*
 	if (nvlist_lookup_nvlist_array(vdev, ZPOOL_CONFIG_L2CACHE, &child,
 	    &children) == 0) {
 		for (c = 0; c < children; c++)
-			if (find_vdev_problem(child[c], func))
+			if (find_vdev_problem(child[c], func, ignore_replacing))
 				return (B_TRUE);
 	}
 
@@ -270,15 +281,15 @@ check_status(nvlist_t *config, boolean_t
 	 * Bad devices in non-replicated config.
 	 */
 	if (vs->vs_state == VDEV_STATE_CANT_OPEN &&
-	    find_vdev_problem(nvroot, vdev_faulted))
+	    find_vdev_problem(nvroot, vdev_faulted, B_TRUE))
 		return (ZPOOL_STATUS_FAULTED_DEV_NR);
 
 	if (vs->vs_state == VDEV_STATE_CANT_OPEN &&
-	    find_vdev_problem(nvroot, vdev_missing))
+	    find_vdev_problem(nvroot, vdev_missing, B_TRUE))
 		return (ZPOOL_STATUS_MISSING_DEV_NR);
 
 	if (vs->vs_state == VDEV_STATE_CANT_OPEN &&
-	    find_vdev_problem(nvroot, vdev_broken))
+	    find_vdev_problem(nvroot, vdev_broken, B_TRUE))
 		return (ZPOOL_STATUS_CORRUPT_LABEL_NR);
 
 	/*
@@ -300,32 +311,38 @@ check_status(nvlist_t *config, boolean_t
 	/*
 	 * Missing devices in a replicated config.
 	 */
-	if (find_vdev_problem(nvroot, vdev_faulted))
+	if (find_vdev_problem(nvroot, vdev_faulted, B_TRUE))
 		return (ZPOOL_STATUS_FAULTED_DEV_R);
-	if (find_vdev_problem(nvroot, vdev_missing))
+	if (find_vdev_problem(nvroot, vdev_missing, B_TRUE))
 		return (ZPOOL_STATUS_MISSING_DEV_R);
-	if (find_vdev_problem(nvroot, vdev_broken))
+	if (find_vdev_problem(nvroot, vdev_broken, B_TRUE))
 		return (ZPOOL_STATUS_CORRUPT_LABEL_R);
 
 	/*
 	 * Devices with errors
 	 */
-	if (!isimport && find_vdev_problem(nvroot, vdev_errors))
+	if (!isimport && find_vdev_problem(nvroot, vdev_errors, B_TRUE))
 		return (ZPOOL_STATUS_FAILING_DEV);
 
 	/*
 	 * Offlined devices
 	 */
-	if (find_vdev_problem(nvroot, vdev_offlined))
+	if (find_vdev_problem(nvroot, vdev_offlined, B_TRUE))
 		return (ZPOOL_STATUS_OFFLINE_DEV);
 
 	/*
 	 * Removed device
 	 */
-	if (find_vdev_problem(nvroot, vdev_removed))
+	if (find_vdev_problem(nvroot, vdev_removed, B_TRUE))
 		return (ZPOOL_STATUS_REMOVED_DEV);
 
 	/*
+	 * Suboptimal, but usable, ashift configuration.
+	 */
+	if (find_vdev_problem(nvroot, vdev_non_native_ashift, B_FALSE))
+		return (ZPOOL_STATUS_NON_NATIVE_ASHIFT);
+
+	/*
 	 * Outdated, but usable, version
 	 */
 	if (SPA_VERSION_IS_SUPPORTED(version) && version != SPA_VERSION)

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Fri Aug 23 21:46:11 2013	(r254740)
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
@@ -628,3 +628,27 @@ out:
 	free((void*)(uintptr_t)zc.zc_nvlist_dst);
 	return (error);
 }
+
+/*
+ * Roll back this filesystem or volume to its most recent snapshot.
+ * If snapnamebuf is not NULL, it will be filled in with the name
+ * of the most recent snapshot.
+ *
+ * Return 0 on success or an errno on failure.
+ */
+int
+lzc_rollback(const char *fsname, char *snapnamebuf, int snapnamelen)
+{
+	nvlist_t *args;
+	nvlist_t *result;
+	int err;
+
+	args = fnvlist_alloc();
+	err = lzc_ioctl(ZFS_IOC_ROLLBACK, fsname, args, &result);
+	nvlist_free(args);
+	if (err == 0 && snapnamebuf != NULL) {
+		const char *snapname = fnvlist_lookup_string(result, "target");
+		(void) strlcpy(snapnamebuf, snapname, snapnamelen);
+	}
+	return (err);
+}

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h	Fri Aug 23 21:46:11 2013	(r254740)
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Martin Matuska <mm@FreeBSD.org>. All rights reserved.
  */
 
@@ -59,6 +59,7 @@ int lzc_send_space(const char *snapname,
 
 boolean_t lzc_exists(const char *dataset);
 
+int lzc_rollback(const char *fsname, char *snapnamebuf, int snapnamelen);
 
 #ifdef	__cplusplus
 }

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Fri Aug 23 21:46:11 2013	(r254740)
@@ -591,6 +591,12 @@ dprintf_setup(int *argc, char **argv)
 		dprintf_print_all = 1;
 }
 
+int
+sysctl_handle_64(SYSCTL_HANDLER_ARGS)
+{
+	return (0);
+}
+
 /*
  * =========================================================================
  * debug printfs

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Fri Aug 23 21:46:11 2013	(r254740)
@@ -659,11 +659,55 @@ typedef	uint32_t	idmap_rid_t;
 
 #define	SX_SYSINIT(name, lock, desc)
 
+#define SYSCTL_HANDLER_ARGS struct sysctl_oid *oidp, void *arg1,	\
+	intptr_t arg2, struct sysctl_req *req
+
+/*
+ * This describes the access space for a sysctl request.  This is needed
+ * so that we can use the interface from the kernel or from user-space.
+ */
+struct sysctl_req {
+	struct thread	*td;		/* used for access checking */
+	int		lock;		/* wiring state */
+	void		*oldptr;
+	size_t		oldlen;
+	size_t		oldidx;
+	int		(*oldfunc)(struct sysctl_req *, const void *, size_t);
+	void		*newptr;
+	size_t		newlen;
+	size_t		newidx;
+	int		(*newfunc)(struct sysctl_req *, void *, size_t);
+	size_t		validlen;
+	int		flags;
+};
+
+SLIST_HEAD(sysctl_oid_list, sysctl_oid);
+
+/*
+ * This describes one "oid" in the MIB tree.  Potentially more nodes can
+ * be hidden behind it, expanded by the handler.
+ */
+struct sysctl_oid {
+	struct sysctl_oid_list *oid_parent;
+	SLIST_ENTRY(sysctl_oid) oid_link;
+	int		oid_number;
+	u_int		oid_kind;
+	void		*oid_arg1;
+	intptr_t	oid_arg2;
+	const char	*oid_name;
+	int 		(*oid_handler)(SYSCTL_HANDLER_ARGS);
+	const char	*oid_fmt;
+	int		oid_refcnt;
+	u_int		oid_running;
+	const char	*oid_descr;
+};
+
 #define	SYSCTL_DECL(...)
 #define	SYSCTL_NODE(...)
 #define	SYSCTL_INT(...)
 #define	SYSCTL_UINT(...)
 #define	SYSCTL_ULONG(...)
+#define	SYSCTL_PROC(...)
 #define	SYSCTL_QUAD(...)
 #define	SYSCTL_UQUAD(...)
 #ifdef TUNABLE_INT
@@ -675,6 +719,8 @@ typedef	uint32_t	idmap_rid_t;
 #define	TUNABLE_ULONG(...)
 #define	TUNABLE_QUAD(...)
 
+int sysctl_handle_64(SYSCTL_HANDLER_ARGS);
+
 /* Errors */
 
 #ifndef	ERESTART

Modified: projects/camlock/contrib/bind9/CHANGES
==============================================================================
--- projects/camlock/contrib/bind9/CHANGES	Fri Aug 23 20:56:17 2013	(r254739)
+++ projects/camlock/contrib/bind9/CHANGES	Fri Aug 23 21:46:11 2013	(r254740)
@@ -1,15 +1,15 @@
-	--- 9.8.5-P2 released ---
+	--- 9.9.3-P2 released ---
 
 3621.	[security]	Incorrect bounds checking on private type 'keydata'
 			can lead to a remotely triggerable REQUIRE failure
 			(CVE-2013-4854). [RT #34238]
 
-	--- 9.8.5-P1 released ---
+	--- 9.9.3-P1 released ---
 
 3584.	[security]	Caching data from an incompletely signed zone could
 			trigger an assertion failure in resolver.c [RT #33690]
 
-	--- 9.8.5 released ---
+	--- 9.9.3 released ---
 
 3568.	[cleanup]	Add a product description line to the version file,
 			to be reported by named -v/-V. [RT #33366]
@@ -21,7 +21,7 @@
 3561.	[bug]		dig: issue a warning if an EDNS query returns FORMERR
 			or NOTIMP.  Adjust usage message. [RT #33363]
 
-	--- 9.8.5rc1 released ---
+	--- 9.9.3rc2 released ---
 
 3560.	[bug]		isc-config.sh did not honor includedir and libdir
 			when set via configure. [RT #33345]
@@ -31,6 +31,8 @@
 
 3558.	[bug]		IXFR of a DLZ stored zone was broken. [RT #33331]
 
+3557.	[bug]		Reloading redirect zones was broken. [RT #33292]
+
 3556.	[maint]		Added AAAA for D.ROOT-SERVERS.NET.
 
 3555.	[bug]		Address theoretical race conditions in acache.c
@@ -51,9 +53,7 @@
 3547.	[bug]		Some malformed unknown rdata records were not properly
 			detected and rejected. [RT #33129]
 
-3056.	[func]		Added support for URI resource record. [RT #23386]
-
-	--- 9.8.5rc1 released ---
+	--- 9.9.3rc1 released ---
 
 3546.	[func]		Add EUI48 and EUI64 types. [RT #33082]
 
@@ -64,8 +64,6 @@
 3543.	[bug]		Update socket structure before attaching to socket
 			manager after accept. [RT #33084]
 
-3542.	[bug]		masterformat system test was broken. [RT #33086]
-
 3541.	[bug]		Parts of libdns were not properly initialized when
 			built in libexport mode. [RT #33028]
 
@@ -94,6 +92,17 @@
 
 3530.	[contrib]	Better RTT tracking in queryperf. [RT #30128]
 
+3528.	[func]		New "dnssec-coverage" command scans the timing
+			metadata for a set of DNSSEC keys and reports if a
+			lapse in signing coverage has been scheduled
+			inadvertently. (Note: This tool depends on python;
+			it will not be built or installed on systems that
+			do not have a python interpreter.) [RT #28098]
+
+3527.	[compat]	Add a URI to allow applications to explicitly
+			request a particular XML schema from the statistics
+			channel, returning 404 if not supported. [RT #32481]
+
 3526.	[cleanup]	Set up dependencies for unit tests correctly during
 			build. [RT #32803]
 
@@ -102,7 +111,7 @@
 3520.	[bug]		'mctx' was not being referenced counted in some places
 			where it should have been.  [RT #32794]
 
-	--- 9.8.5b2 released ---
+	--- 9.9.3b2 released ---
 
 3517.	[bug]		Reorder destruction to avoid shutdown race. [RT #32777]
 
@@ -114,6 +123,8 @@
 			to 1024 bits for hmac-sha384 and hmac-sha512.
 			[RT #32753]
 
+3511.	[doc]		Improve documentation of redirect zones. [RT #32756]
+
 3509.	[cleanup]	Added a product line to version file to allow for
 			easy naming of different products (BIND
 			vs BIND ESV, for example). [RT #32755]
@@ -121,8 +132,24 @@
 3508.	[contrib]	queryperf was incorrectly rejecting the -T option.
 			[RT #32338]
 
+3507.	[bug]		Statistics channel XSL (when built with
+			--enable-newstats) had a glitch when attempting
+			to chart query data before any queries had been
+			received. [RT #32620]
+
+3505.	[bug]		When setting "max-cache-size" and "max-acache-size",
+			larger values than 4 gigabytes could not be set
+			explicitly, though larger sizes were available
+			when setting cache size to 0. This has been
+			corrected; the full range is now available.
+			[RT #32358]
+
 3503.	[doc]		Clarify size_spec syntax. [RT #32449]
 
+3501.	[func]		zone-statistics now takes three options: full,
+			terse, and none. "yes" and "no" are retained as
+			synonyms for full and terse, respectively. [RT #29165]
+
 3500.	[security]	Support NAPTR regular expression validation on
 			all platforms without using libregex, which
 			can be vulnerable to memory exhaustion attack
@@ -141,6 +168,15 @@
 			NSIP and NSDNAME checking. --enable-rpz-nsip and
 			--enable-rpz-nsdname are now the default. [RT #32251]
 
+3493.	[contrib]	Added BDBHPT dynamically-lodable DLZ module,
+			contributed by Mark Goldfinch. [RT #32549]
+
+3492.	[bug]		Fixed a regression in zone loading performance
+			due to lock contention. [RT #30399]
+
+3491.	[bug]		Slave zones using inline-signing must specify a
+			file name. [RT #31946]
+
 3489.	[bug]		--enable-developer now turns on ISC_LIST_CHECKINIT.
 			When cloning a rdataset do not copy the link contents.
 			[RT #32651]
@@ -156,8 +192,14 @@
 
 3485.	[cleanup]	Only compile openssl_gostlink.c if we support GOST.
 
+3483.	[bug]		Corrected XSL code in use with --enable-newstats.
+			[RT #32587]
+
 3481.	[cleanup]	Removed use of const const in atf.
 
+3480.	[bug]		Silence logging noise when setting up zone
+			statistics. [RT #32525]
+
 3479.	[bug]		Address potential memory leaks in gssapi support
 			code. [RT #32405]
 
@@ -167,10 +209,18 @@
 3474.	[bug]		nsupdate could assert when the local and remote
 			address families didn't match. [RT #22897]
 
+3473.	[bug]		dnssec-signzone/verify could incorrectly report
+			an error condition due to an empty node above an
+			opt-out delegation lacking an NSEC3. [RT #32072]
+
+3471.	[bug]		The number of UDP dispatches now defaults to
+			the number of CPUs even if -n has been set to
+			a higher value. [RT #30964]
+
 3470.	[bug]		Slave zones could fail to dump when successfully
 			refreshing after an initial failure. [RT #31276]
 
-	--- 9.8.5b1 released ---
+	--- 9.9.3b1 released ---
 
 3468.	[security]	RPZ rules to generate A records (but not AAAA records)
 			could trigger an assertion failure when used in
@@ -179,6 +229,9 @@
 3467.	[bug]		Added checks in dnssec-keygen and dnssec-settime
 			to check for delete date < inactive date. [RT #31719]
 
+3466.	[contrib]	Corrected the DNS_CLIENTINFOMETHODS_VERSION check
+			in DLZ example driver. [RT #32275]
+
 3465.	[bug]		Handle isolated reserved ports. [RT #31778]
 
 3464.	[maint]		Updates to PKCS#11 openssl patches, supporting
@@ -192,6 +245,8 @@
 3461.	[bug]		Negative responses could incorrectly have AD=1
 			set. [RT #32237]
 
+3460.	[bug]		Only link against readline where needed. [RT #29810]
+
 3458.	[bug]		Return FORMERR when presented with a overly long
 			domain named in a request. [RT #29682]
 
@@ -203,6 +258,9 @@
 
 3454.	[port]		sparc64: improve atomic support. [RT #25182]
 
+3453.	[bug]		'rndc addzone' of a zone with 'inline-signing yes;'
+			failed. [RT #31960]
+
 3452.	[bug]		Accept duplicate singleton records. [RT #32329]
 
 3451.	[port]		Increase per thread stack size from 64K to 1M.
@@ -266,9 +324,19 @@
 3427.	[bug]		dig +trace incorrectly displayed name server
 			addresses instead of names. [RT #31641]
 
+3426.	[bug]		dnssec-checkds: Clearer output when records are not
+			found. [RT #31968]
+
 3425.	[bug]		"acacheentry" reference counting was broken resulting
 			in use after free. [RT #31908]
 
+3424.	[func]		dnssec-dsfromkey now emits the hash without spaces.
+			[RT #31951]
+
+3423.	[bug]		"rndc signing -nsec3param" didn't accept the full
+			range of possible values.  Address portability issues.
+			[RT #31938]
+
 3422.	[bug]		Added a clear error message for when the SOA does not
 			match the referral. [RT #31281]
 
@@ -279,9 +347,22 @@
 
 3419.	[bug]		Memory leak on validation cancel. [RT #31869]
 
+3417.	[func]		Optional new XML schema (version 3.0) for the
+			statistics channel adds query type statistics at the
+			zone level, and flattens the XML tree and uses
+			compressed format to optimize parsing. Includes new XSL
+			that permits charting via the Google Charts API on
+			browsers that support javascript in XSL.  To enable,
+			build with "configure --enable-newstats". [RT #30023]
+
+3416.	[bug]		Named could die on shutdown if running with 128 UDP
+			dispatches per interface. [RT #31743]
+
 3415.	[bug]		named could die with a REQUIRE failure if a validation
 			was canceled. [RT #31804]
 
+3414.	[bug]		Address locking issues found by Coverity. [RT #31626]
+
 3412.	[bug]		Copy timeval structure from control message data.
 			[RT #31548]
 
@@ -295,6 +376,11 @@
 			(DNS-based Authentication of Named Entities).
 			[RT #30513]
 
+3408.	[bug]		Some DNSSEC-related options (update-check-ksk,
+			dnssec-loadkeys-interval, dnssec-dnskey-kskonly)
+			are now legal in slave zones as long as
+			inline-signing is in use. [RT #31078]
+
 3406.	[bug]		mem.c: Fix compilation errors when building with
 			ISC_MEM_TRACKLINES or ISC_MEMPOOL_NAMES disabled.
 			Also, ISC_MEM_DEBUG is no longer optional. [RT #31559]
@@ -316,6 +402,13 @@
 			in the "srcid" file in the build tree and normally set
 			to the most recent git hash.  [RT #31494]
 
+3399.	[port]		netbsd: rename 'bool' parameter to avoid namespace
+			clash.  [RT #31515]

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308232146.r7NLkDiK009847>