From owner-svn-src-vendor@FreeBSD.ORG  Wed Apr  8 17:52:59 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4FF99A36;
 Wed,  8 Apr 2015 17:52:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 35743F34;
 Wed,  8 Apr 2015 17:52:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t38HqxaA047085;
 Wed, 8 Apr 2015 17:52:59 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t38Hqt2o047060;
 Wed, 8 Apr 2015 17:52:55 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201504081752.t38Hqt2o047060@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 8 Apr 2015 17:52:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r281268 - in vendor/bind9/dist: . bin/check bin/dig
 bin/dig/include/dig bin/dnssec bin/named bin/named/include/named bin/nsupdate
 bin/rndc doc/arm lib/bind9 lib/dns lib/dns/include/dns ...
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Apr 2015 17:52:59 -0000

Author: delphij
Date: Wed Apr  8 17:52:54 2015
New Revision: 281268
URL: https://svnweb.freebsd.org/changeset/base/281268

Log:
  Vendor import of BIND 9.9.7

Added:
  vendor/bind9/dist/doc/arm/Bv9ARM.ch11.html   (contents, props changed)
  vendor/bind9/dist/doc/arm/Bv9ARM.ch12.html   (contents, props changed)
  vendor/bind9/dist/doc/arm/Bv9ARM.ch13.html   (contents, props changed)
  vendor/bind9/dist/doc/arm/notes-wrapper.xml   (contents, props changed)
  vendor/bind9/dist/doc/arm/notes.html   (contents, props changed)
  vendor/bind9/dist/doc/arm/notes.pdf   (contents, props changed)
  vendor/bind9/dist/doc/arm/notes.xml   (contents, props changed)
  vendor/bind9/dist/lib/dns/rdata/generic/openpgpkey_61.c   (contents, props changed)
  vendor/bind9/dist/lib/dns/rdata/generic/openpgpkey_61.h   (contents, props changed)
Modified:
  vendor/bind9/dist/CHANGES
  vendor/bind9/dist/COPYRIGHT
  vendor/bind9/dist/FAQ.xml
  vendor/bind9/dist/README
  vendor/bind9/dist/bin/check/named-checkconf.c
  vendor/bind9/dist/bin/dig/dig.1
  vendor/bind9/dist/bin/dig/dig.docbook
  vendor/bind9/dist/bin/dig/dig.html
  vendor/bind9/dist/bin/dig/dighost.c
  vendor/bind9/dist/bin/dig/host.c
  vendor/bind9/dist/bin/dig/include/dig/dig.h
  vendor/bind9/dist/bin/dig/nslookup.c
  vendor/bind9/dist/bin/dnssec/dnssec-dsfromkey.c
  vendor/bind9/dist/bin/dnssec/dnssec-importkey.c
  vendor/bind9/dist/bin/dnssec/dnssec-keyfromlabel.c
  vendor/bind9/dist/bin/dnssec/dnssec-keygen.8
  vendor/bind9/dist/bin/dnssec/dnssec-keygen.c
  vendor/bind9/dist/bin/dnssec/dnssec-keygen.docbook
  vendor/bind9/dist/bin/dnssec/dnssec-keygen.html
  vendor/bind9/dist/bin/dnssec/dnssec-settime.8
  vendor/bind9/dist/bin/dnssec/dnssec-settime.c
  vendor/bind9/dist/bin/dnssec/dnssec-settime.docbook
  vendor/bind9/dist/bin/dnssec/dnssec-settime.html
  vendor/bind9/dist/bin/dnssec/dnssec-signzone.c
  vendor/bind9/dist/bin/dnssec/dnssec-verify.c
  vendor/bind9/dist/bin/dnssec/dnssectool.c
  vendor/bind9/dist/bin/dnssec/dnssectool.h
  vendor/bind9/dist/bin/named/client.c
  vendor/bind9/dist/bin/named/config.c
  vendor/bind9/dist/bin/named/include/named/globals.h
  vendor/bind9/dist/bin/named/interfacemgr.c
  vendor/bind9/dist/bin/named/main.c
  vendor/bind9/dist/bin/named/named.html
  vendor/bind9/dist/bin/named/query.c
  vendor/bind9/dist/bin/named/server.c
  vendor/bind9/dist/bin/named/update.c
  vendor/bind9/dist/bin/named/zoneconf.c
  vendor/bind9/dist/bin/nsupdate/nsupdate.c
  vendor/bind9/dist/bin/rndc/rndc.c
  vendor/bind9/dist/config.h.in
  vendor/bind9/dist/configure.in
  vendor/bind9/dist/doc/arm/Bv9ARM-book.xml
  vendor/bind9/dist/doc/arm/Bv9ARM.ch01.html
  vendor/bind9/dist/doc/arm/Bv9ARM.ch02.html
  vendor/bind9/dist/doc/arm/Bv9ARM.ch03.html
  vendor/bind9/dist/doc/arm/Bv9ARM.ch04.html
  vendor/bind9/dist/doc/arm/Bv9ARM.ch05.html
  vendor/bind9/dist/doc/arm/Bv9ARM.ch06.html
  vendor/bind9/dist/doc/arm/Bv9ARM.ch07.html
  vendor/bind9/dist/doc/arm/Bv9ARM.ch08.html
  vendor/bind9/dist/doc/arm/Bv9ARM.ch09.html
  vendor/bind9/dist/doc/arm/Bv9ARM.ch10.html
  vendor/bind9/dist/doc/arm/Bv9ARM.html
  vendor/bind9/dist/doc/arm/Bv9ARM.pdf
  vendor/bind9/dist/doc/arm/Makefile.in
  vendor/bind9/dist/doc/arm/dnssec.xml
  vendor/bind9/dist/doc/arm/man.arpaname.html
  vendor/bind9/dist/doc/arm/man.ddns-confgen.html
  vendor/bind9/dist/doc/arm/man.dig.html
  vendor/bind9/dist/doc/arm/man.dnssec-checkds.html
  vendor/bind9/dist/doc/arm/man.dnssec-coverage.html
  vendor/bind9/dist/doc/arm/man.dnssec-dsfromkey.html
  vendor/bind9/dist/doc/arm/man.dnssec-keyfromlabel.html
  vendor/bind9/dist/doc/arm/man.dnssec-keygen.html
  vendor/bind9/dist/doc/arm/man.dnssec-revoke.html
  vendor/bind9/dist/doc/arm/man.dnssec-settime.html
  vendor/bind9/dist/doc/arm/man.dnssec-signzone.html
  vendor/bind9/dist/doc/arm/man.dnssec-verify.html
  vendor/bind9/dist/doc/arm/man.genrandom.html
  vendor/bind9/dist/doc/arm/man.host.html
  vendor/bind9/dist/doc/arm/man.isc-hmac-fixup.html
  vendor/bind9/dist/doc/arm/man.named-checkconf.html
  vendor/bind9/dist/doc/arm/man.named-checkzone.html
  vendor/bind9/dist/doc/arm/man.named-journalprint.html
  vendor/bind9/dist/doc/arm/man.named.html
  vendor/bind9/dist/doc/arm/man.nsec3hash.html
  vendor/bind9/dist/doc/arm/man.nsupdate.html
  vendor/bind9/dist/doc/arm/man.rndc-confgen.html
  vendor/bind9/dist/doc/arm/man.rndc.conf.html
  vendor/bind9/dist/doc/arm/man.rndc.html
  vendor/bind9/dist/lib/bind9/api
  vendor/bind9/dist/lib/bind9/check.c
  vendor/bind9/dist/lib/bind9/getaddresses.c
  vendor/bind9/dist/lib/dns/adb.c
  vendor/bind9/dist/lib/dns/api
  vendor/bind9/dist/lib/dns/diff.c
  vendor/bind9/dist/lib/dns/dispatch.c
  vendor/bind9/dist/lib/dns/gen.c
  vendor/bind9/dist/lib/dns/include/dns/dispatch.h
  vendor/bind9/dist/lib/dns/include/dns/log.h
  vendor/bind9/dist/lib/dns/include/dns/rbt.h
  vendor/bind9/dist/lib/dns/include/dns/request.h
  vendor/bind9/dist/lib/dns/journal.c
  vendor/bind9/dist/lib/dns/keytable.c
  vendor/bind9/dist/lib/dns/log.c
  vendor/bind9/dist/lib/dns/master.c
  vendor/bind9/dist/lib/dns/masterdump.c
  vendor/bind9/dist/lib/dns/message.c
  vendor/bind9/dist/lib/dns/name.c
  vendor/bind9/dist/lib/dns/nsec3.c
  vendor/bind9/dist/lib/dns/openssldh_link.c
  vendor/bind9/dist/lib/dns/opensslecdsa_link.c
  vendor/bind9/dist/lib/dns/opensslgost_link.c
  vendor/bind9/dist/lib/dns/private.c
  vendor/bind9/dist/lib/dns/rbt.c
  vendor/bind9/dist/lib/dns/rbtdb.c
  vendor/bind9/dist/lib/dns/rdata.c
  vendor/bind9/dist/lib/dns/rdata/generic/cdnskey_60.c
  vendor/bind9/dist/lib/dns/rdata/generic/cds_59.c
  vendor/bind9/dist/lib/dns/rdata/generic/keydata_65533.c
  vendor/bind9/dist/lib/dns/rdata/generic/nsec3_50.c
  vendor/bind9/dist/lib/dns/rdata/generic/opt_41.c
  vendor/bind9/dist/lib/dns/rdata/generic/rrsig_46.c
  vendor/bind9/dist/lib/dns/rdata/generic/sig_24.c
  vendor/bind9/dist/lib/dns/rdata/generic/spf_99.h
  vendor/bind9/dist/lib/dns/rdata/generic/txt_16.c
  vendor/bind9/dist/lib/dns/rdataset.c
  vendor/bind9/dist/lib/dns/request.c
  vendor/bind9/dist/lib/dns/resolver.c
  vendor/bind9/dist/lib/dns/rootns.c
  vendor/bind9/dist/lib/dns/spnego_asn1.c
  vendor/bind9/dist/lib/dns/tkey.c
  vendor/bind9/dist/lib/dns/tsig.c
  vendor/bind9/dist/lib/dns/validator.c
  vendor/bind9/dist/lib/dns/zone.c
  vendor/bind9/dist/lib/dns/zt.c
  vendor/bind9/dist/lib/export/isc/Makefile.in
  vendor/bind9/dist/lib/export/isc/unix/Makefile.in
  vendor/bind9/dist/lib/export/samples/nsprobe.c
  vendor/bind9/dist/lib/export/samples/sample-request.c
  vendor/bind9/dist/lib/export/samples/sample-update.c
  vendor/bind9/dist/lib/irs/getnameinfo.c
  vendor/bind9/dist/lib/isc/api
  vendor/bind9/dist/lib/isc/hash.c
  vendor/bind9/dist/lib/isc/hmacmd5.c
  vendor/bind9/dist/lib/isc/hmacsha.c
  vendor/bind9/dist/lib/isc/httpd.c
  vendor/bind9/dist/lib/isc/include/isc/platform.h.in
  vendor/bind9/dist/lib/isc/include/isc/radix.h
  vendor/bind9/dist/lib/isc/include/isc/ratelimiter.h
  vendor/bind9/dist/lib/isc/md5.c
  vendor/bind9/dist/lib/isc/mem.c
  vendor/bind9/dist/lib/isc/radix.c
  vendor/bind9/dist/lib/isc/ratelimiter.c
  vendor/bind9/dist/lib/isc/result.c
  vendor/bind9/dist/lib/isc/sha1.c
  vendor/bind9/dist/lib/isc/sha2.c
  vendor/bind9/dist/lib/isc/unix/app.c
  vendor/bind9/dist/lib/isc/unix/include/isc/net.h
  vendor/bind9/dist/lib/isc/unix/include/isc/time.h
  vendor/bind9/dist/lib/isc/unix/net.c
  vendor/bind9/dist/lib/isc/unix/socket.c
  vendor/bind9/dist/lib/isc/unix/stdio.c
  vendor/bind9/dist/lib/isc/unix/time.c
  vendor/bind9/dist/lib/isccfg/api
  vendor/bind9/dist/lib/isccfg/parser.c
  vendor/bind9/dist/lib/lwres/api
  vendor/bind9/dist/lib/lwres/compat.c
  vendor/bind9/dist/lib/lwres/gethost.c
  vendor/bind9/dist/lib/lwres/man/lwres.html
  vendor/bind9/dist/lib/lwres/man/lwres_buffer.html
  vendor/bind9/dist/lib/lwres/man/lwres_config.html
  vendor/bind9/dist/lib/lwres/man/lwres_context.html
  vendor/bind9/dist/lib/lwres/man/lwres_gabn.html
  vendor/bind9/dist/lib/lwres/man/lwres_gai_strerror.html
  vendor/bind9/dist/lib/lwres/man/lwres_getaddrinfo.html
  vendor/bind9/dist/lib/lwres/man/lwres_gethostent.html
  vendor/bind9/dist/lib/lwres/man/lwres_getipnode.html
  vendor/bind9/dist/lib/lwres/man/lwres_getnameinfo.html
  vendor/bind9/dist/lib/lwres/man/lwres_getrrsetbyname.html
  vendor/bind9/dist/lib/lwres/man/lwres_gnba.html
  vendor/bind9/dist/lib/lwres/man/lwres_hstrerror.html
  vendor/bind9/dist/lib/lwres/man/lwres_inetntop.html
  vendor/bind9/dist/lib/lwres/man/lwres_noop.html
  vendor/bind9/dist/lib/lwres/man/lwres_packet.html
  vendor/bind9/dist/lib/lwres/man/lwres_resutil.html
  vendor/bind9/dist/version

Modified: vendor/bind9/dist/CHANGES
==============================================================================
--- vendor/bind9/dist/CHANGES	Wed Apr  8 17:52:23 2015	(r281267)
+++ vendor/bind9/dist/CHANGES	Wed Apr  8 17:52:54 2015	(r281268)
@@ -1,11 +1,145 @@
-	--- 9.9.6-P2 released ---
+	--- 9.9.7 released ---
+
+	--- 9.9.7rc2 released ---
+
+4061.	[bug]		Handle timeout in legacy system test. [RT #38573]
+
+4060.	[bug]		dns_rdata_freestruct could be called on a
+			uninitialised structure when handling a error.
+			[RT #38568]
+
+4059.	[bug]		Addressed valgrind warnings. [RT #38549]
+
+4058.	[bug]		UDP dispatches could use the wrong pseudorandom
+			number generator context. [RT #38578]
+
+4056.	[bug]		Fixed several small bugs in automatic trust anchor
+			management, including a memory leak and a possible
+			loss of key state information. [RT #38458]
+
+4057.	[bug]		'dnssec-dsfromkey -T 0' failed to add ttl field.
+			[RT #38565]
 
 4053.	[security]	Revoking a managed trust anchor and supplying
 			an untrusted replacement could cause named
 			to crash with an assertion failure.
 			(CVE-2015-1349) [RT #38344]
 
-	--- 9.9.6-P1 released ---
+4052.	[bug]		Fix a leak of query fetchlock. [RT #38454]
+
+4050.	[bug]		RPZ could send spurious SERVFAILs in response
+			to duplicate queries. [RT #38510]
+
+4049.	[bug]		CDS and CDNSKEY had the wrong attributes. [RT #38491]
+
+4048.	[bug]		adb hash table was not being grown. [RT #38470]
+
+	--- 9.9.7rc1 released ---
+
+4047.	[cleanup]	"named -V" now reports the current running versions
+			of OpenSSL and the libxml2 libraries, in addition to
+			the versions that were in use at build time.
+
+4046.	[bug]		Accounting of "total use" in memory context
+			statistics was not correct. [RT #38370]
+
+4045.	[bug]		Skip to next master on dns_request_createvia4 failure.
+			[RT #25185]
+
+4044.	[bug]		Change 3955 was not complete, resulting in an assertion
+			failure if the timing was just right. [RT #38352]
+
+4039.	[cleanup]	Cleaned up warnings from gcc -Wshadow. [RT #37381]
+
+4038.	[bug]		Add 'rpz' flag to node and use it to determine whether
+			to call dns_rpz_delete.  This should prevent unbalanced
+			add / delete calls. [RT #36888]
+
+4037.	[bug]		also-notify was ignoring the tsig key when checking
+			for duplicates resulting in some expected notify
+			messages not being sent. [RT #38369]
+
+4035.	[bug]		Close temporary and NZF FILE pointers before moving
+			the former into the latter's place, as required on
+			Windows. [RT #38332]
+
+4032.	[bug]		Built-in "empty" zones did not correctly inherit the
+			"allow-transfer" ACL from the options or view.
+			[RT #38310]
+
+4031.	[bug]		named-checkconf -z failed to report a missing file
+			with a hint zone. [RT #38294]
+
+4028.	[bug]		$GENERATE with a zero step was not being caught as a
+			error.  A $GENERATE with a / but no step was not being
+			caught as a error. [RT #38262]
+
+3973.	[test]		Added hooks for Google Performance Tools CPU profiler,
+			including real-time/wall-clock profiling. Use
+			"configure --with-gperftools-profiler" to enable.
+			[RT #37339]
+
+	--- 9.9.7b1 released ---
+
+4027.	[port]		Net::DNS 0.81 compatibility. [RT #38165]
+
+4026.	[bug]		Fix RFC 3658 reference in dig +sigchase. [RT #38173]
+
+4025.	[port]		bsdi: failed to build. [RT #38047]
+
+4024.	[bug]		dns_rdata_opt_first, dns_rdata_opt_next,
+			dns_rdata_opt_current, dns_rdata_txt_first,
+			dns_rdata_txt_next and dns_rdata_txt_current were
+			documented but not implemented.  These have now been
+			implemented.
+
+			dns_rdata_spf_first, dns_rdata_spf_next and
+			dns_rdata_spf_current were documented but not
+			implemented.  The prototypes for these
+			functions have been removed. [RT #38068]
+
+4023.	[bug]		win32: socket handling with explicit ports and
+			invoking named with -4 was broken for some
+			configurations. [RT #38068]
+
+4021.	[bug]		Adjust max-recursion-queries to accommodate
+			the need for more queries when the cache is
+			empty. [RT #38104]
+
+4020.	[bug]		Change 3736 broke nsupdate's SOA MNAME discovery
+			resulting in updates being sent to the wrong server.
+			[RT #37925]
+
+4019.	[func]		If named is not configured to validate the answer
+			then allow fallback to plain DNS on timeout even
+			when we know the server supports EDNS. [RT #37978]
+
+4018.	[bug]		Fall back to plain DNS when EDNS queries are being
+			dropped was failing. [RT #37965]
+
+4017.	[test]		Add system test to check lookups to legacy servers
+			with broken DNS behavior. [RT #37965]
+
+4016.	[bug]		Fix a dig segfault due to bad linked list usage.
+			[RT #37591]
+
+4015.	[bug]		Nameservers that are skipped due to them being
+			CNAMEs were not being logged. They are now logged
+			to category 'cname' as per BIND 8. [RT #37935]
+
+4014.	[bug]		When including a master file origin_changed was
+			not being properly set leading to a potentially
+			spurious 'inherited owner' warning. [RT #37919]
+
+4012.	[bug]		Check returned status of OpenSSL digest and HMAC
+			functions when they return one. Note this applies
+			only to FIPS capable OpenSSL libraries put in
+			FIPS mode and MD5. [RT #37944]
+
+4011.	[bug]		master's list port inheritance was not properly
+			implemented. [RT #37792]
+
+4007.	[doc]		Remove acl forward reference restriction. [RT #37772]
 
 4006.	[security]	A flaw in delegation handling could be exploited
 			to put named into an infinite loop.  This has
@@ -19,6 +153,99 @@
 			"max-recursion-depth" option, and the query limit
 			via the "max-recursion-queries" option.  [RT #37580]
 
+4004.	[bug]		When delegations had AAAA glue but not A, a
+			reference could be leaked causing an assertion
+			failure on shutdown. [RT #37796]
+
+4000.	[bug]		NXDOMAIN redirection incorrectly handled NXRRSET
+			from the redirect zone. [RT #37722]
+
+3998.	[bug]		isc_radix_search was returning matches that were
+			too precise. [RT #37680]
+
+3997.	[protocol]	Add OPENGPGKEY record. [RT# 37671]
+
+3996.	[bug]		Address use after free on out of memory error in
+			keyring_add. [RT #37639]
+
+3995.	[bug]		receive_secure_serial holds the zone lock for too
+			long. [RT #37626]
+
+3990.	[testing]	Add tests for unknown DNSSEC algorithm handling.
+			[RT #37541]
+
+3989.	[cleanup]	Remove redundant dns_db_resigned calls. [RT #35748]
+
+3987.	[func]		Handle future Visual Studio 14 incompatible changes.
+			[RT #37380]
+
+3986.	[doc]		Add the BIND version number to page footers
+			in the ARM. [RT #37398]
+
+3985.	[doc]		Describe how +ndots and +search interact in dig.
+			[RT #37529]
+
+3982.	[doc]		Include release notes in product documentation.
+			[RT #37272]
+
+3981.	[bug]		Cache DS/NXDOMAIN independently of other query types.
+			[RT #37467]
+
+3978.	[test]		Added a unit test for Diffie-Hellman key
+			computation, completing change #3974. [RT #37477]
+
+3976.	[bug]		When refreshing managed-key trust anchors, clear
+			any cached trust so that they will always be
+			revalidated with the current set of secure
+			roots. [RT #37506]
+
+3974.	[bug]		Handle DH_compute_key() failure correctly in
+			openssldh_link.c. [RT #37477]
+
+3972.	[bug]		Fix host's usage statement. [RT #37397]
+
+3971.	[bug]		Reduce the cascading failures due to a bad $TTL line
+			in named-checkconf / named-checkzone. [RT #37138]
+
+3970.	[contrib]	Fixed a use after free bug in the SDB LDAP driver.
+			[RT #37237]
+
+3968.	[bug]		Silence spurious log messages when using 'named -[46]'.
+			[RT #37308]
+
+3967.	[test]		Add test for inlined signed zone in multiple views
+			with different DNSKEY sets. [RT #35759]
+
+3966.	[bug]		Missing dns_db_closeversion call in receive_secure_db.
+			[RT #35746]
+
+3962.	[bug]		'dig +topdown +trace +sigchase' address unhandled error
+			conditions. [RT #34663]
+
+3961.	[bug]		Forwarding of SIG(0) signed UPDATE messages failed with
+			BADSIG.  [RT #37216]
+
+3960.	[bug]		'dig +sigchase' could loop forever. [RT #37220]
+
+3959.	[bug]		Updates could be lost if they arrived immediately
+			after a rndc thaw. [RT #37233]
+
+3958.	[bug]		Detect when writeable files have multiple references
+			in named.conf. [RT #37172]
+
+3957.	[bug]		"dnssec-keygen -S" failed for ECCGOST, ECDSAP256SHA256
+			and ECDSAP384SHA384. [RT #37183]
+
+3955.	[bug]		Notify messages due to changes are no longer queued
+			behind startup notify messages. [RT #24454]
+
+3954.	[bug]		Unchecked mutex init in dlz_dlopen_driver.c [RT #37112]
+
+3953.	[bug]		Don't escape semi-colon in TXT fields. [RT #37159]
+
+3952.	[bug]		dns_name_fullcompare failed to set *nlabelsp when the
+			two name pointers were the same. [RT #37176]
+
 	--- 9.9.6 released ---
 
 3950.	[port]		Changed the bin/python Makefile to work around a
@@ -63,7 +290,7 @@
 
 3922.	[bug]		When resigning, dnssec-signzone was removing
 			all signatures from delegation nodes. It now
-			retains	DS and (if applicable) NSEC signatures.
+			retains DS and (if applicable) NSEC signatures.
 			[RT #36946]
 
 3921.	[bug]		AD was inappropriately set on RPZ responses. [RT #36833]

Modified: vendor/bind9/dist/COPYRIGHT
==============================================================================
--- vendor/bind9/dist/COPYRIGHT	Wed Apr  8 17:52:23 2015	(r281267)
+++ vendor/bind9/dist/COPYRIGHT	Wed Apr  8 17:52:54 2015	(r281268)
@@ -1,4 +1,4 @@
-Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 1996-2003  Internet Software Consortium.
 
 Permission to use, copy, modify, and/or distribute this software for any

Modified: vendor/bind9/dist/FAQ.xml
==============================================================================
--- vendor/bind9/dist/FAQ.xml	Wed Apr  8 17:52:23 2015	(r281267)
+++ vendor/bind9/dist/FAQ.xml	Wed Apr  8 17:52:54 2015	(r281268)
@@ -1,7 +1,7 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []>
 <!--
- - Copyright (C) 2004-2010, 2013  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2010, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -31,6 +31,7 @@
       <year>2009</year>
       <year>2010</year>
       <year>2013</year>
+      <year>2014</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>

Modified: vendor/bind9/dist/README
==============================================================================
--- vendor/bind9/dist/README	Wed Apr  8 17:52:23 2015	(r281267)
+++ vendor/bind9/dist/README	Wed Apr  8 17:52:54 2015	(r281268)
@@ -51,14 +51,21 @@ BIND 9
 	For up-to-date release notes and errata, see
 	http://www.isc.org/software/bind9/releasenotes
 
+
+BIND 9.9.7
+
+	BIND 9.9.7 is a maintenance release and addresses bugs
+	found in BIND 9.9.6 and earlier, as well as the security
+	flaws described in CVE-2014-8500 and CVE-2015-1349.
+
 BIND 9.9.6
 
 	BIND 9.9.6 is a maintenance release, and also includes
-        the following new functionality.
+	the following new functionality.
 
 	 - The former behavior with respect to capitalization of names
-           (prior to BIND 9.9.5) can be restored for specific clients via
-           the new "no-case-compress" ACL.
+	   (prior to BIND 9.9.5) can be restored for specific clients via
+	   the new "no-case-compress" ACL.
 
 BIND 9.9.5
 
@@ -219,7 +226,7 @@ Building
 				    -DDIG_SIGCHASE_BU=1)
 		Disable dropping queries from particular well known ports.
 		  -DNS_CLIENT_DROPPORT=0
-	        Sibling glue checking in named-checkzone is enabled by default.
+		Sibling glue checking in named-checkzone is enabled by default.
 		To disable the default check set.  -DCHECK_SIBLING=0
 		named-checkzone checks out-of-zone addresses by default.
 		To disable this default set.  -DCHECK_LOCAL=0
@@ -358,7 +365,7 @@ Change Log
 	   [security]	  Fix for a significant security flaw
 
 	   [experimental] Used for new features when the syntax
-	   		  or other aspects of the design are still
+			  or other aspects of the design are still
 			  in flux and may change
 
 	   [port]	  Portability enhancement
@@ -367,7 +374,7 @@ Change Log
 			  server addresses and keys
 
 	   [tuning]	  Changes to built-in configuration defaults
-	   		  and constants to improve performanceo
+			  and constants to improve performanceo
 
 	   [protocol]	  Updates to the DNS protocol such as new
 			  RR types

Modified: vendor/bind9/dist/bin/check/named-checkconf.c
==============================================================================
--- vendor/bind9/dist/bin/check/named-checkconf.c	Wed Apr  8 17:52:23 2015	(r281267)
+++ vendor/bind9/dist/bin/check/named-checkconf.c	Wed Apr  8 17:52:54 2015	(r281268)
@@ -488,7 +488,33 @@ main(int argc, char **argv) {
 
 	isc_commandline_errprint = ISC_FALSE;
 
-	while ((c = isc_commandline_parse(argc, argv, "dhjt:pvxz")) != EOF) {
+	/*
+	 * Process memory debugging argument first.
+	 */
+#define CMDLINE_FLAGS "dhjm:t:pvxz"
+	while ((c = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != -1) {
+		switch (c) {
+		case 'm':
+			if (strcasecmp(isc_commandline_argument, "record") == 0)
+				isc_mem_debugging |= ISC_MEM_DEBUGRECORD;
+			if (strcasecmp(isc_commandline_argument, "trace") == 0)
+				isc_mem_debugging |= ISC_MEM_DEBUGTRACE;
+			if (strcasecmp(isc_commandline_argument, "usage") == 0)
+				isc_mem_debugging |= ISC_MEM_DEBUGUSAGE;
+			if (strcasecmp(isc_commandline_argument, "size") == 0)
+				isc_mem_debugging |= ISC_MEM_DEBUGSIZE;
+			if (strcasecmp(isc_commandline_argument, "mctx") == 0)
+				isc_mem_debugging |= ISC_MEM_DEBUGCTX;
+			break;
+		default:
+			break;
+		}
+	}
+	isc_commandline_reset = ISC_TRUE;
+
+	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+
+	while ((c = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != EOF) {
 		switch (c) {
 		case 'd':
 			debug++;
@@ -498,6 +524,9 @@ main(int argc, char **argv) {
 			nomerge = ISC_FALSE;
 			break;
 
+		case 'm':
+			break;
+
 		case 't':
 			result = isc_dir_chroot(isc_commandline_argument);
 			if (result != ISC_R_SUCCESS) {
@@ -557,8 +586,6 @@ main(int argc, char **argv) {
 	InitSockets();
 #endif
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
-
 	RUNTIME_CHECK(setup_logging(mctx, stdout, &logc) == ISC_R_SUCCESS);
 
 	RUNTIME_CHECK(isc_entropy_create(mctx, &ectx) == ISC_R_SUCCESS);

Modified: vendor/bind9/dist/bin/dig/dig.1
==============================================================================
--- vendor/bind9/dist/bin/dig/dig.1	Wed Apr  8 17:52:23 2015	(r281267)
+++ vendor/bind9/dist/bin/dig/dig.1	Wed Apr  8 17:52:54 2015	(r281268)
@@ -388,7 +388,10 @@ for it to be considered absolute. The de
 or
 \fBdomain\fR
 directive in
-\fI/etc/resolv.conf\fR.
+\fI/etc/resolv.conf\fR
+if
+\fB+search\fR
+is set.
 .RE
 .PP
 \fB+[no]nsid\fR
@@ -447,6 +450,12 @@ Toggle the display of per\-record commen
 Use [do not use] the search list defined by the searchlist or domain directive in
 \fIresolv.conf\fR
 (if any). The search list is not used by default.
+.sp
+\'ndots' from
+\fIresolv.conf\fR
+(default 1) which may be overridden by
+\fI+ndots\fR
+determines if the name will be treated as relative or not and hence whether a search is eventually performed or not.
 .RE
 .PP
 \fB+[no]short\fR

Modified: vendor/bind9/dist/bin/dig/dig.docbook
==============================================================================
--- vendor/bind9/dist/bin/dig/dig.docbook	Wed Apr  8 17:52:23 2015	(r281267)
+++ vendor/bind9/dist/bin/dig/dig.docbook	Wed Apr  8 17:52:54 2015	(r281268)
@@ -624,7 +624,8 @@
 	      are interpreted as relative names and will be searched
 	      for in the domains listed in the <option>search</option>
 	      or <option>domain</option> directive in
-	      <filename>/etc/resolv.conf</filename>.
+	      <filename>/etc/resolv.conf</filename> if
+	      <option>+search</option> is set.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -731,6 +732,13 @@
 	      <filename>resolv.conf</filename> (if any).  The search
 	      list is not used by default.
 	    </para>
+	    <para>
+	      'ndots' from <filename>resolv.conf</filename> (default 1)
+	       which may be overridden by <parameter>+ndots</parameter>
+	      determines if the name will be treated as relative
+	      or not and hence whether a search is eventually
+	      performed or not.
+	    </para>
 	  </listitem>
 	</varlistentry>
 

Modified: vendor/bind9/dist/bin/dig/dig.html
==============================================================================
--- vendor/bind9/dist/bin/dig/dig.html	Wed Apr  8 17:52:23 2015	(r281267)
+++ vendor/bind9/dist/bin/dig/dig.html	Wed Apr  8 17:52:54 2015	(r281268)
@@ -412,7 +412,8 @@
 	      are interpreted as relative names and will be searched
 	      for in the domains listed in the <code class="option">search</code>
 	      or <code class="option">domain</code> directive in
-	      <code class="filename">/etc/resolv.conf</code>.
+	      <code class="filename">/etc/resolv.conf</code> if
+	      <code class="option">+search</code> is set.
 	    </p></dd>
 <dt><span class="term"><code class="option">+[no]nsid</code></span></dt>
 <dd><p>
@@ -468,12 +469,21 @@
 	      record comments unless multiline mode is active.
 	    </p></dd>
 <dt><span class="term"><code class="option">+[no]search</code></span></dt>
-<dd><p>
+<dd>
+<p>
 	      Use [do not use] the search list defined by the
 	      searchlist or domain directive in
 	      <code class="filename">resolv.conf</code> (if any).  The search
 	      list is not used by default.
-	    </p></dd>
+	    </p>
+<p>
+	      'ndots' from <code class="filename">resolv.conf</code> (default 1)
+	       which may be overridden by <em class="parameter"><code>+ndots</code></em>
+	      determines if the name will be treated as relative
+	      or not and hence whether a search is eventually
+	      performed or not.
+	    </p>
+</dd>
 <dt><span class="term"><code class="option">+[no]short</code></span></dt>
 <dd><p>
 	      Provide a terse answer.  The default is to print the
@@ -590,7 +600,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2545168"></a><h2>MULTIPLE QUERIES</h2>
+<a name="id2545181"></a><h2>MULTIPLE QUERIES</h2>
 <p>
       The BIND 9 implementation of <span><strong class="command">dig </strong></span>
       supports
@@ -636,7 +646,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2545229"></a><h2>IDN SUPPORT</h2>
+<a name="id2545243"></a><h2>IDN SUPPORT</h2>
 <p>
       If <span><strong class="command">dig</strong></span> has been built with IDN (internationalized
       domain name) support, it can accept and display non-ASCII domain names.
@@ -650,14 +660,14 @@ dig +qr www.isc.org any -x 127.0.0.1 isc
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2545252"></a><h2>FILES</h2>
+<a name="id2545266"></a><h2>FILES</h2>
 <p><code class="filename">/etc/resolv.conf</code>
     </p>
 <p><code class="filename">${HOME}/.digrc</code>
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2545269"></a><h2>SEE ALSO</h2>
+<a name="id2545283"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">host</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
@@ -665,7 +675,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2545306"></a><h2>BUGS</h2>
+<a name="id2545320"></a><h2>BUGS</h2>
 <p>
       There are probably too many query options.
     </p>

Modified: vendor/bind9/dist/bin/dig/dighost.c
==============================================================================
--- vendor/bind9/dist/bin/dig/dighost.c	Wed Apr  8 17:52:23 2015	(r281267)
+++ vendor/bind9/dist/bin/dig/dighost.c	Wed Apr  8 17:52:54 2015	(r281268)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -58,6 +58,7 @@
 #include <dns/log.h>
 #include <dns/message.h>
 #include <dns/name.h>
+#include <dns/rcode.h>
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>
 #include <dns/rdatalist.h>
@@ -1070,10 +1071,9 @@ parse_hmac(const char *hmac) {
  */
 static isc_result_t
 read_confkey(void) {
-	isc_log_t *lctx = NULL;
 	cfg_parser_t *pctx = NULL;
 	cfg_obj_t *file = NULL;
-	const cfg_obj_t *key = NULL;
+	const cfg_obj_t *keyobj = NULL;
 	const cfg_obj_t *secretobj = NULL;
 	const cfg_obj_t *algorithmobj = NULL;
 	const char *keyname;
@@ -1084,7 +1084,7 @@ read_confkey(void) {
 	if (! isc_file_exists(keyfile))
 		return (ISC_R_FILENOTFOUND);
 
-	result = cfg_parser_create(mctx, lctx, &pctx);
+	result = cfg_parser_create(mctx, NULL, &pctx);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
 
@@ -1093,16 +1093,16 @@ read_confkey(void) {
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
 
-	result = cfg_map_get(file, "key", &key);
+	result = cfg_map_get(file, "key", &keyobj);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
 
-	(void) cfg_map_get(key, "secret", &secretobj);
-	(void) cfg_map_get(key, "algorithm", &algorithmobj);
+	(void) cfg_map_get(keyobj, "secret", &secretobj);
+	(void) cfg_map_get(keyobj, "algorithm", &algorithmobj);
 	if (secretobj == NULL || algorithmobj == NULL)
 		fatal("key must have algorithm and secret");
 
-	keyname = cfg_obj_asstring(cfg_map_getname(key));
+	keyname = cfg_obj_asstring(cfg_map_getname(keyobj));
 	secretstr = cfg_obj_asstring(secretobj);
 	algorithm = cfg_obj_asstring(algorithmobj);
 
@@ -2216,7 +2216,6 @@ setup_lookup(dig_lookup_t *lookup) {
 		if (result != ISC_R_SUCCESS) {
 			dns_message_puttempname(lookup->sendmsg,
 						&lookup->name);
-			isc_buffer_init(&b, store, MXNAME);
 			fatal("'%s' is not a legal name "
 			      "(%s)", lookup->textname,
 			      isc_result_totext(result));
@@ -2976,7 +2975,8 @@ connect_done(isc_task_t *task, isc_event
 		query->waiting_connect = ISC_FALSE;
 		isc_event_free(&event);
 		l = query->lookup;
-		if (l->current_query != NULL)
+		if ((l->current_query != NULL) &&
+		    (ISC_LINK_LINKED(l->current_query, link)))
 			next = ISC_LIST_NEXT(l->current_query, link);
 		else
 			next = NULL;
@@ -3518,7 +3518,7 @@ recv_done(isc_task_t *task, isc_event_t 
 #endif
 				printmessage(query, msg, ISC_TRUE);
 		} else if (l->trace) {
-			int n = 0;
+			int nl = 0;
 			int count = msg->counts[DNS_SECTION_ANSWER];
 
 			debug("in TRACE code");
@@ -3529,13 +3529,13 @@ recv_done(isc_task_t *task, isc_event_t 
 			if (l->trace_root || (l->ns_search_only && count > 0)) {
 				if (!l->trace_root)
 					l->rdtype = dns_rdatatype_soa;
-				n = followup_lookup(msg, query,
-						    DNS_SECTION_ANSWER);
+				nl = followup_lookup(msg, query,
+						     DNS_SECTION_ANSWER);
 				l->trace_root = ISC_FALSE;
 			} else if (count == 0)
-				n = followup_lookup(msg, query,
-						    DNS_SECTION_AUTHORITY);
-			if (n == 0)
+				nl = followup_lookup(msg, query,
+						     DNS_SECTION_AUTHORITY);
+			if (nl == 0)
 				docancel = ISC_TRUE;
 		} else {
 			debug("in NSSEARCH code");
@@ -3544,12 +3544,12 @@ recv_done(isc_task_t *task, isc_event_t 
 				/*
 				 * This is the initial NS query.
 				 */
-				int n;
+				int nl;
 
 				l->rdtype = dns_rdatatype_soa;
-				n = followup_lookup(msg, query,
-						    DNS_SECTION_ANSWER);
-				if (n == 0)
+				nl = followup_lookup(msg, query,
+						     DNS_SECTION_ANSWER);
+				if (nl == 0)
 					docancel = ISC_TRUE;
 				l->trace_root = ISC_FALSE;
 				usesearch = ISC_FALSE;
@@ -3679,12 +3679,12 @@ recv_done(isc_task_t *task, isc_event_t 
  * routines, since they may be using a non-DNS system for these lookups.
  */
 isc_result_t
-get_address(char *host, in_port_t port, isc_sockaddr_t *sockaddr) {
+get_address(char *host, in_port_t myport, isc_sockaddr_t *sockaddr) {
 	int count;
 	isc_result_t result;
 
 	isc_app_block();
-	result = bind9_getaddresses(host, port, sockaddr, 1, &count);
+	result = bind9_getaddresses(host, myport, sockaddr, 1, &count);
 	isc_app_unblock();
 	if (result != ISC_R_SUCCESS)
 		return (result);
@@ -4151,6 +4151,9 @@ chase_scanname_section(dns_message_t *ms
 	dns_rdataset_t *rdataset;
 	dns_name_t *msg_name = NULL;
 
+	if (msg->counts[section] == 0)
+		return (NULL);
+
 	do {
 		dns_message_currentname(msg, section, &msg_name);
 		if (dns_name_compare(msg_name, name) == 0) {
@@ -4357,8 +4360,8 @@ get_trusted_key(isc_mem_t *mctx)
 	dns_rdatacallbacks_init_stdio(&callbacks);
 	callbacks.add = insert_trustedkey;
 	return (dns_master_loadfile(filename, dns_rootname, dns_rootname,
-				    current_lookup->rdclass, 0, &callbacks,
-				    mctx));
+				    current_lookup->rdclass, DNS_MASTER_NOTTL,
+				    &callbacks, mctx));
 }
 
 
@@ -4558,36 +4561,36 @@ child_of_zone(dns_name_t * name, dns_nam
 }
 
 isc_result_t
-grandfather_pb_test(dns_name_t *zone_name, dns_rdataset_t  *sigrdataset)
-{
-	isc_result_t result;
-	dns_rdata_t sigrdata = DNS_RDATA_INIT;
+grandfather_pb_test(dns_name_t *zone_name, dns_rdataset_t  *sigrdataset) {
 	dns_rdata_sig_t siginfo;
+	dns_rdataset_t mysigrdataset;
+	isc_result_t result;
 
-	result = dns_rdataset_first(sigrdataset);
+	dns_rdataset_init(&mysigrdataset);
+	dns_rdataset_clone(sigrdataset, &mysigrdataset);
+
+	result = dns_rdataset_first(&mysigrdataset);
 	check_result(result, "empty RRSIG dataset");
-	dns_rdata_init(&sigrdata);
 
 	do {
-		dns_rdataset_current(sigrdataset, &sigrdata);
+		dns_rdata_t sigrdata = DNS_RDATA_INIT;
+
+		dns_rdataset_current(&mysigrdataset, &sigrdata);
 
 		result = dns_rdata_tostruct(&sigrdata, &siginfo, NULL);
 		check_result(result, "sigrdata tostruct siginfo");
 
 		if (dns_name_compare(&siginfo.signer, zone_name) == 0) {
-			dns_rdata_freestruct(&siginfo);
-			dns_rdata_reset(&sigrdata);
-			return (ISC_R_SUCCESS);
+			result = ISC_R_SUCCESS;
+			goto cleanup;
 		}
+	} while (dns_rdataset_next(&mysigrdataset) == ISC_R_SUCCESS);
 
-		dns_rdata_freestruct(&siginfo);
-		dns_rdata_reset(&sigrdata);
+	result = ISC_R_FAILURE;
+cleanup:
+	dns_rdataset_disassociate(&mysigrdataset);
 
-	} while (dns_rdataset_next(chase_sigkeyrdataset) == ISC_R_SUCCESS);
-
-	dns_rdata_reset(&sigrdata);
-
-	return (ISC_R_FAILURE);
+	return (result);
 }
 
 
@@ -4667,26 +4670,30 @@ contains_trusted_key(dns_name_t *name, d
 		     dns_rdataset_t *sigrdataset,
 		     isc_mem_t *mctx)
 {
-	isc_result_t result;
-	dns_rdata_t rdata = DNS_RDATA_INIT;
+	dns_rdataset_t myrdataset;
 	dst_key_t *dnsseckey = NULL;
 	int i;
+	isc_result_t result;
 
 	if (name == NULL || rdataset == NULL)
 		return (ISC_R_FAILURE);
 
-	result = dns_rdataset_first(rdataset);
+	dns_rdataset_init(&myrdataset);
+	dns_rdataset_clone(rdataset, &myrdataset);
+
+	result = dns_rdataset_first(&myrdataset);
 	check_result(result, "empty rdataset");
 
 	do {
-		dns_rdataset_current(rdataset, &rdata);
+		dns_rdata_t rdata = DNS_RDATA_INIT;
+
+		dns_rdataset_current(&myrdataset, &rdata);
 		INSIST(rdata.type == dns_rdatatype_dnskey);
 
 		result = dns_dnssec_keyfromrdata(name, &rdata,
 						 mctx, &dnsseckey);
 		check_result(result, "dns_dnssec_keyfromrdata");
 
-
 		for (i = 0; i < tk_list.nb_tk; i++) {
 			if (dst_key_compare(tk_list.key[i], dnsseckey)
 			    == ISC_TRUE) {
@@ -4695,22 +4702,21 @@ contains_trusted_key(dns_name_t *name, d
 				printf(";; Ok, find a Trusted Key in the "
 				       "DNSKEY RRset: %d\n",
 				       dst_key_id(dnsseckey));
-				if (sigchase_verify_sig_key(name, rdataset,
-							    dnsseckey,
-							    sigrdataset,
-							    mctx)
-				    == ISC_R_SUCCESS) {
-					dst_key_free(&dnsseckey);
-					dnsseckey = NULL;
-					return (ISC_R_SUCCESS);
-				}
+				result = sigchase_verify_sig_key(name, rdataset,
+								 dnsseckey,
+								 sigrdataset,
+								 mctx);
+				if (result == ISC_R_SUCCESS)
+					goto cleanup;
 			}
 		}
+		dst_key_free(&dnsseckey);
+	} while (dns_rdataset_next(&myrdataset) == ISC_R_SUCCESS);
 
-		dns_rdata_reset(&rdata);
-		if (dnsseckey != NULL)
-			dst_key_free(&dnsseckey);
-	} while (dns_rdataset_next(rdataset) == ISC_R_SUCCESS);
+cleanup:
+	if (dnsseckey != NULL)
+		dst_key_free(&dnsseckey);
+	dns_rdataset_disassociate(&myrdataset);
 
 	return (ISC_R_NOTFOUND);
 }
@@ -4721,16 +4727,20 @@ sigchase_verify_sig(dns_name_t *name, dn
 		    dns_rdataset_t *sigrdataset,
 		    isc_mem_t *mctx)
 {
-	isc_result_t result;
-	dns_rdata_t keyrdata = DNS_RDATA_INIT;
+	dns_rdataset_t mykeyrdataset;
 	dst_key_t *dnsseckey = NULL;
+	isc_result_t result;
 
-	result = dns_rdataset_first(keyrdataset);
+	dns_rdataset_init(&mykeyrdataset);
+	dns_rdataset_clone(keyrdataset, &mykeyrdataset);
+
+	result = dns_rdataset_first(&mykeyrdataset);
 	check_result(result, "empty DNSKEY dataset");
-	dns_rdata_init(&keyrdata);
 
 	do {
-		dns_rdataset_current(keyrdataset, &keyrdata);
+		dns_rdata_t keyrdata = DNS_RDATA_INIT;
+
+		dns_rdataset_current(&mykeyrdataset, &keyrdata);
 		INSIST(keyrdata.type == dns_rdatatype_dnskey);
 
 		result = dns_dnssec_keyfromrdata(name, &keyrdata,
@@ -4739,18 +4749,19 @@ sigchase_verify_sig(dns_name_t *name, dn
 
 		result = sigchase_verify_sig_key(name, rdataset, dnsseckey,
 						 sigrdataset, mctx);
-		if (result == ISC_R_SUCCESS) {
-			dns_rdata_reset(&keyrdata);
-			dst_key_free(&dnsseckey);
-			return (ISC_R_SUCCESS);
-		}
+		if (result == ISC_R_SUCCESS)
+			goto cleanup;
 		dst_key_free(&dnsseckey);
-		dns_rdata_reset(&keyrdata);
-	} while (dns_rdataset_next(chase_keyrdataset) == ISC_R_SUCCESS);
+	} while (dns_rdataset_next(&mykeyrdataset) == ISC_R_SUCCESS);
 
-	dns_rdata_reset(&keyrdata);
+	result = ISC_R_NOTFOUND;
 
-	return (ISC_R_NOTFOUND);
+ cleanup:
+	if (dnsseckey != NULL)
+		dst_key_free(&dnsseckey);
+	dns_rdataset_disassociate(&mykeyrdataset);
+
+	return (result);
 }
 
 isc_result_t
@@ -4758,16 +4769,23 @@ sigchase_verify_sig_key(dns_name_t *name
 			dst_key_t *dnsseckey, dns_rdataset_t *sigrdataset,
 			isc_mem_t *mctx)
 {
-	isc_result_t result;
-	dns_rdata_t sigrdata = DNS_RDATA_INIT;
 	dns_rdata_sig_t siginfo;
+	dns_rdataset_t myrdataset;
+	dns_rdataset_t mysigrdataset;
+	isc_result_t result;
 
-	result = dns_rdataset_first(sigrdataset);
+	dns_rdataset_init(&myrdataset);
+	dns_rdataset_clone(rdataset, &myrdataset);
+	dns_rdataset_init(&mysigrdataset);
+	dns_rdataset_clone(sigrdataset, &mysigrdataset);
+
+	result = dns_rdataset_first(&mysigrdataset);
 	check_result(result, "empty RRSIG dataset");
-	dns_rdata_init(&sigrdata);
 
 	do {
-		dns_rdataset_current(sigrdataset, &sigrdata);
+		dns_rdata_t sigrdata = DNS_RDATA_INIT;
+
+		dns_rdataset_current(&mysigrdataset, &sigrdata);
 
 		result = dns_rdata_tostruct(&sigrdata, &siginfo, NULL);
 		check_result(result, "sigrdata tostruct siginfo");
@@ -4778,10 +4796,10 @@ sigchase_verify_sig_key(dns_name_t *name
 		 */
 		if (siginfo.keyid == dst_key_id(dnsseckey)) {
 
-			result = dns_rdataset_first(rdataset);
+			result = dns_rdataset_first(&myrdataset);
 			check_result(result, "empty DS dataset");
 
-			result = dns_dnssec_verify(name, rdataset, dnsseckey,
+			result = dns_dnssec_verify(name, &myrdataset, dnsseckey,
 						   ISC_FALSE, mctx, &sigrdata);
 
 			printf(";; VERIFYING ");
@@ -4791,19 +4809,18 @@ sigchase_verify_sig_key(dns_name_t *name
 			printf(" with DNSKEY:%d: %s\n", dst_key_id(dnsseckey),
 			       isc_result_totext(result));
 
-			if (result == ISC_R_SUCCESS) {
-				dns_rdata_reset(&sigrdata);
-				return (result);
-			}
+			if (result == ISC_R_SUCCESS)
+				goto cleanup;
 		}
-		dns_rdata_freestruct(&siginfo);
-		dns_rdata_reset(&sigrdata);
+	} while (dns_rdataset_next(&mysigrdataset) == ISC_R_SUCCESS);
 
-	} while (dns_rdataset_next(chase_sigkeyrdataset) == ISC_R_SUCCESS);
+	result = ISC_R_NOTFOUND;
 
-	dns_rdata_reset(&sigrdata);
+ cleanup:
+	dns_rdataset_disassociate(&myrdataset);
+	dns_rdataset_disassociate(&mysigrdataset);
 
-	return (ISC_R_NOTFOUND);
+	return (result);
 }
 
 
@@ -4811,27 +4828,35 @@ isc_result_t
 sigchase_verify_ds(dns_name_t *name, dns_rdataset_t *keyrdataset,
 		   dns_rdataset_t *dsrdataset, isc_mem_t *mctx)
 {
-	isc_result_t result;
-	dns_rdata_t keyrdata = DNS_RDATA_INIT;
-	dns_rdata_t newdsrdata = DNS_RDATA_INIT;
-	dns_rdata_t dsrdata = DNS_RDATA_INIT;
 	dns_rdata_ds_t dsinfo;
+	dns_rdataset_t mydsrdataset;
+	dns_rdataset_t mykeyrdataset;
 	dst_key_t *dnsseckey = NULL;
+	isc_result_t result;
 	unsigned char dsbuf[DNS_DS_BUFFERSIZE];
 
-	result = dns_rdataset_first(dsrdataset);
+	dns_rdataset_init(&mydsrdataset);
+	dns_rdataset_clone(dsrdataset, &mydsrdataset);
+	dns_rdataset_init(&mykeyrdataset);
+	dns_rdataset_clone(keyrdataset, &mykeyrdataset);
+
+	result = dns_rdataset_first(&mydsrdataset);
 	check_result(result, "empty DSset dataset");
 	do {
-		dns_rdataset_current(dsrdataset, &dsrdata);
+		dns_rdata_t dsrdata = DNS_RDATA_INIT;
+
+		dns_rdataset_current(&mydsrdataset, &dsrdata);
 
 		result = dns_rdata_tostruct(&dsrdata, &dsinfo, NULL);
 		check_result(result, "dns_rdata_tostruct for DS");
 
-		result = dns_rdataset_first(keyrdataset);
+		result = dns_rdataset_first(&mykeyrdataset);
 		check_result(result, "empty KEY dataset");
 
 		do {
-			dns_rdataset_current(keyrdataset, &keyrdata);
+			dns_rdata_t keyrdata = DNS_RDATA_INIT;
+
+			dns_rdataset_current(&mykeyrdataset, &keyrdata);
 			INSIST(keyrdata.type == dns_rdatatype_dnskey);
 
 			result = dns_dnssec_keyfromrdata(name, &keyrdata,
@@ -4843,6 +4868,7 @@ sigchase_verify_ds(dns_name_t *name, dns
 			 * id of DNSKEY referenced by the DS
 			 */
 			if (dsinfo.key_tag == dst_key_id(dnsseckey)) {
+				dns_rdata_t newdsrdata = DNS_RDATA_INIT;
 
 				result = dns_ds_buildrdata(name, &keyrdata,
 							   dsinfo.digest_type,
@@ -4850,14 +4876,9 @@ sigchase_verify_ds(dns_name_t *name, dns
 				dns_rdata_freestruct(&dsinfo);
 
 				if (result != ISC_R_SUCCESS) {
-					dns_rdata_reset(&keyrdata);
-					dns_rdata_reset(&newdsrdata);
-					dns_rdata_reset(&dsrdata);
-					dst_key_free(&dnsseckey);
-					dns_rdata_freestruct(&dsinfo);
 					printf("Oops: impossible to build"
 					       " new DS rdata\n");

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

From owner-svn-src-vendor@FreeBSD.ORG  Wed Apr  8 17:54:20 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CF541B73;
 Wed,  8 Apr 2015 17:54:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A0357F41;
 Wed,  8 Apr 2015 17:54:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t38HsKsi047320;
 Wed, 8 Apr 2015 17:54:20 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t38HsKqk047319;
 Wed, 8 Apr 2015 17:54:20 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201504081754.t38HsKqk047319@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 8 Apr 2015 17:54:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r281269 - vendor/bind9/9.9.7
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Apr 2015 17:54:20 -0000

Author: delphij
Date: Wed Apr  8 17:54:20 2015
New Revision: 281269
URL: https://svnweb.freebsd.org/changeset/base/281269

Log:
  Tag BIND 9.9.7.

Added:
  vendor/bind9/9.9.7/
     - copied from r281268, vendor/bind9/dist/

From owner-svn-src-vendor@FreeBSD.ORG  Wed Apr  8 21:06:07 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3A4CD5C9;
 Wed,  8 Apr 2015 21:06:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 22C8D9C3;
 Wed,  8 Apr 2015 21:06:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t38L67x9039025;
 Wed, 8 Apr 2015 21:06:07 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t38L63A8039012;
 Wed, 8 Apr 2015 21:06:03 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201504082106.t38L63A8039012@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 8 Apr 2015 21:06:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r281277 - in vendor/xz/dist: . src/common
 src/liblzma/api/lzma src/liblzma/common src/liblzma/lz src/liblzma/lzma
 src/xz
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Apr 2015 21:06:07 -0000

Author: delphij
Date: Wed Apr  8 21:06:02 2015
New Revision: 281277
URL: https://svnweb.freebsd.org/changeset/base/281277

Log:
  Vendor import of xz-5.2.1 (trimmed).

Modified:
  vendor/xz/dist/ChangeLog
  vendor/xz/dist/THANKS
  vendor/xz/dist/src/common/tuklib_cpucores.c
  vendor/xz/dist/src/common/tuklib_integer.h
  vendor/xz/dist/src/liblzma/api/lzma/version.h
  vendor/xz/dist/src/liblzma/common/memcmplen.h
  vendor/xz/dist/src/liblzma/lz/lz_encoder.c
  vendor/xz/dist/src/liblzma/lzma/lzma_encoder_optimum_fast.c
  vendor/xz/dist/src/xz/file_io.c

Modified: vendor/xz/dist/ChangeLog
==============================================================================
--- vendor/xz/dist/ChangeLog	Wed Apr  8 20:25:51 2015	(r281276)
+++ vendor/xz/dist/ChangeLog	Wed Apr  8 21:06:02 2015	(r281277)
@@ -1,3 +1,233 @@
+commit dec11497a71518423b5ff0e759100cf8aadf6c7b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-02-26 16:53:44 +0200
+
+    Bump version and soname for 5.2.1.
+
+ src/liblzma/Makefile.am        | 2 +-
+ src/liblzma/api/lzma/version.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 29e39c79975ab89ee5dd671e97064534a9f3a649
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-02-26 13:01:09 +0200
+
+    Update NEWS for 5.2.1.
+
+ NEWS | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+commit 7a11c4a8e5e15f13d5fa59233b3172e65428efdd
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-02-22 19:38:48 +0200
+
+    xz: Use pipe2() if available.
+
+ configure.ac     | 4 ++--
+ src/xz/file_io.c | 9 ++++++++-
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+commit 117d962685c72682c63edc9bb765367189800202
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-02-21 23:40:26 +0200
+
+    liblzma: Fix a compression-ratio regression in LZMA1/2 in fast mode.
+    
+    The bug was added in the commit
+    f48fce093b07aeda95c18850f5e086d9f2383380 and thus
+    affected 5.1.4beta and 5.2.0. Luckily the bug cannot
+    cause data corruption or other nasty things.
+
+ src/liblzma/lzma/lzma_encoder_optimum_fast.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit ae984e31c167d3bc52972ec422dd1ebd5f5d5719
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-02-21 23:00:19 +0200
+
+    xz: Fix the fcntl() usage when creating a pipe for the self-pipe trick.
+    
+    Now it reads the old flags instead of blindly setting O_NONBLOCK.
+    The old code may have worked correctly, but this is better.
+
+ src/xz/file_io.c | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+commit 2205bb5853098aea36a56df6f5747037175f66b4
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-02-10 15:29:34 +0200
+
+    Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit d935b0cdf3db440269b9d952b2b281b18f8c7b08
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-02-10 15:28:30 +0200
+
+    tuklib_cpucores: Use cpuset_getaffinity() on FreeBSD if available.
+    
+    In FreeBSD, cpuset_getaffinity() is the preferred way to get
+    the number of available cores.
+    
+    Thanks to Rui Paulo for the patch. I edited it slightly, but
+    hopefully I didn't break anything.
+
+ m4/tuklib_cpucores.m4        | 23 ++++++++++++++++++++++-
+ src/common/tuklib_cpucores.c | 18 ++++++++++++++++++
+ 2 files changed, 40 insertions(+), 1 deletion(-)
+
+commit eb61bc58c20769cac4d05f363b9c0e8c9c71a560
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-02-09 22:08:37 +0200
+
+    xzdiff: Make the mktemp usage compatible with FreeBSD's mktemp.
+    
+    Thanks to Rui Paulo for the fix.
+
+ src/scripts/xzdiff.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+commit b9a5b6b7a29029680af733082b6a46e0fc01623a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-02-03 21:45:53 +0200
+
+    Add a few casts to tuklib_integer.h to silence possible warnings.
+    
+    I heard that Visual Studio 2013 gave warnings without the casts.
+    
+    Thanks to Gabi Davar.
+
+ src/common/tuklib_integer.h | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+commit c45757135f40e4a0de730ba5fff0100219493982
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-01-26 21:24:39 +0200
+
+    liblzma: Set LZMA_MEMCMPLEN_EXTRA depending on the compare method.
+
+ src/liblzma/common/memcmplen.h | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+commit 3c500174ed5485f550972a2a6109c361e875f069
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-01-26 20:40:16 +0200
+
+    Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit fec88d41e672d9e197c9442aecf02bd0dfa6d516
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-01-26 20:39:28 +0200
+
+    liblzma: Silence harmless Valgrind errors.
+    
+    Thanks to Torsten Rupp for reporting this. I had
+    forgotten to run Valgrind before the 5.2.0 release.
+
+ src/liblzma/lz/lz_encoder.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit a9b45badfec0928d20a27c7176c005fa637f7d1e
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-01-09 21:50:19 +0200
+
+    xz: Fix comments.
+
+ src/xz/file_io.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+commit 541aee6dd4aa97a809aba281475a21b641bb89e2
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-01-09 21:35:06 +0200
+
+    Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4170edc914655310d2363baccf5e615e09b04911
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-01-09 21:34:06 +0200
+
+    xz: Don't fail if stdout doesn't support O_NONBLOCK.
+    
+    This is similar to the case with stdin.
+    
+    Thanks to Brad Smith for the bug report and testing
+    on OpenBSD.
+
+ src/xz/file_io.c | 36 +++++++++++++++---------------------
+ 1 file changed, 15 insertions(+), 21 deletions(-)
+
+commit 04bbc0c2843c50c8ad1cba42b937118e38b0508d
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-01-07 19:18:20 +0200
+
+    xz: Fix a memory leak in DOS-specific code.
+
+ src/xz/file_io.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit f0f1f6c7235ffa901cf76fe18e33749e200b3eea
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-01-07 19:08:06 +0200
+
+    xz: Don't fail if stdin doesn't support O_NONBLOCK.
+    
+    It's a problem at least on OpenBSD which doesn't support
+    O_NONBLOCK on e.g. /dev/null. I'm not surprised if it's
+    a problem on other OSes too since this behavior is allowed
+    in POSIX-1.2008.
+    
+    The code relying on this behavior was committed in June 2013
+    and included in 5.1.3alpha released on 2013-10-26. Clearly
+    the development releases only get limited testing.
+
+ src/xz/file_io.c | 18 +++++++-----------
+ 1 file changed, 7 insertions(+), 11 deletions(-)
+
+commit d2d484647d9d9d679f03c75abb0404f67069271c
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-01-06 20:30:15 +0200
+
+    Tests: Don't hide unexpected error messages in test_files.sh.
+    
+    Hiding them makes no sense since normally there's no error
+    when testing the "good" files. With "bad" files errors are
+    expected and then it makes sense to keep the messages hidden.
+
+ tests/test_files.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit aae6a6aeda51cf94a47e39ad624728f9bee75e30
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-30 11:17:16 +0200
+
+    Update Solaris notes in INSTALL.
+    
+    Mention the possible "make check" failure on Solaris in the
+    Solaris-specific section of INSTALL. It was already in
+    section 4.5 but it is better mention it in the OS-specific
+    section too.
+
+ INSTALL | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 7815112153178800a3521b9f31960e7cdc26cfba
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-26 12:00:05 +0200
+
+    Build: POSIX shell isn't required if scripts are disabled.
+
+ INSTALL      | 3 ++-
+ configure.ac | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
 commit a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
 Author: Lasse Collin <lasse.collin@tukaani.org>
 Date:   2014-12-21 20:48:37 +0200

Modified: vendor/xz/dist/THANKS
==============================================================================
--- vendor/xz/dist/THANKS	Wed Apr  8 20:25:51 2015	(r281276)
+++ vendor/xz/dist/THANKS	Wed Apr  8 21:06:02 2015	(r281277)
@@ -67,6 +67,7 @@ has been important. :-) In alphabetical 
   - Andre Noll
   - Peter O'Gorman
   - Peter Pallinger
+  - Rui Paulo
   - Igor Pavlov
   - Diego Elio Pettenò
   - Elbert Pol
@@ -78,12 +79,14 @@ has been important. :-) In alphabetical 
   - Eric S. Raymond
   - Cristian Rodríguez
   - Christian von Roques
+  - Torsten Rupp
   - Jukka Salmi
   - Alexandre Sauvé
   - Benno Schulenberg
   - Andreas Schwab
   - Dan Shechter
   - Stuart Shelton
+  - Brad Smith
   - Jonathan Stott
   - Dan Stromberg
   - Vincent Torri

Modified: vendor/xz/dist/src/common/tuklib_cpucores.c
==============================================================================
--- vendor/xz/dist/src/common/tuklib_cpucores.c	Wed Apr  8 20:25:51 2015	(r281276)
+++ vendor/xz/dist/src/common/tuklib_cpucores.c	Wed Apr  8 21:06:02 2015	(r281277)
@@ -18,6 +18,11 @@
 #	endif
 #	include <windows.h>
 
+// FreeBSD
+#elif defined(TUKLIB_CPUCORES_CPUSET)
+#	include <sys/param.h>
+#	include <sys/cpuset.h>
+
 #elif defined(TUKLIB_CPUCORES_SYSCTL)
 #	ifdef HAVE_SYS_PARAM_H
 #		include <sys/param.h>
@@ -44,6 +49,19 @@ tuklib_cpucores(void)
 	GetSystemInfo(&sysinfo);
 	ret = sysinfo.dwNumberOfProcessors;
 
+#elif defined(TUKLIB_CPUCORES_CPUSET)
+	cpuset_t set;
+	if (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1,
+			sizeof(set), &set) == 0) {
+#	ifdef CPU_COUNT
+		ret = CPU_COUNT(&set);
+#	else
+		for (unsigned i = 0; i < CPU_SETSIZE; ++i)
+			if (CPU_ISSET(i, &set))
+				++ret;
+#	endif
+	}
+
 #elif defined(TUKLIB_CPUCORES_SYSCTL)
 	int name[2] = { CTL_HW, HW_NCPU };
 	int cpus;

Modified: vendor/xz/dist/src/common/tuklib_integer.h
==============================================================================
--- vendor/xz/dist/src/common/tuklib_integer.h	Wed Apr  8 20:25:51 2015	(r281276)
+++ vendor/xz/dist/src/common/tuklib_integer.h	Wed Apr  8 21:06:02 2015	(r281277)
@@ -321,8 +321,8 @@ unaligned_read32le(const uint8_t *buf)
 static inline void
 unaligned_write16be(uint8_t *buf, uint16_t num)
 {
-	buf[0] = num >> 8;
-	buf[1] = num;
+	buf[0] = (uint8_t)(num >> 8);
+	buf[1] = (uint8_t)num;
 	return;
 }
 
@@ -330,8 +330,8 @@ unaligned_write16be(uint8_t *buf, uint16
 static inline void
 unaligned_write16le(uint8_t *buf, uint16_t num)
 {
-	buf[0] = num;
-	buf[1] = num >> 8;
+	buf[0] = (uint8_t)num;
+	buf[1] = (uint8_t)(num >> 8);
 	return;
 }
 
@@ -339,10 +339,10 @@ unaligned_write16le(uint8_t *buf, uint16
 static inline void
 unaligned_write32be(uint8_t *buf, uint32_t num)
 {
-	buf[0] = num >> 24;
-	buf[1] = num >> 16;
-	buf[2] = num >> 8;
-	buf[3] = num;
+	buf[0] = (uint8_t)(num >> 24);
+	buf[1] = (uint8_t)(num >> 16);
+	buf[2] = (uint8_t)(num >> 8);
+	buf[3] = (uint8_t)num;
 	return;
 }
 
@@ -350,10 +350,10 @@ unaligned_write32be(uint8_t *buf, uint32
 static inline void
 unaligned_write32le(uint8_t *buf, uint32_t num)
 {
-	buf[0] = num;
-	buf[1] = num >> 8;
-	buf[2] = num >> 16;
-	buf[3] = num >> 24;
+	buf[0] = (uint8_t)num;
+	buf[1] = (uint8_t)(num >> 8);
+	buf[2] = (uint8_t)(num >> 16);
+	buf[3] = (uint8_t)(num >> 24);
 	return;
 }
 

Modified: vendor/xz/dist/src/liblzma/api/lzma/version.h
==============================================================================
--- vendor/xz/dist/src/liblzma/api/lzma/version.h	Wed Apr  8 20:25:51 2015	(r281276)
+++ vendor/xz/dist/src/liblzma/api/lzma/version.h	Wed Apr  8 21:06:02 2015	(r281277)
@@ -22,7 +22,7 @@
  */
 #define LZMA_VERSION_MAJOR 5
 #define LZMA_VERSION_MINOR 2
-#define LZMA_VERSION_PATCH 0
+#define LZMA_VERSION_PATCH 1
 #define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE
 
 #ifndef LZMA_VERSION_COMMIT

Modified: vendor/xz/dist/src/liblzma/common/memcmplen.h
==============================================================================
--- vendor/xz/dist/src/liblzma/common/memcmplen.h	Wed Apr  8 20:25:51 2015	(r281276)
+++ vendor/xz/dist/src/liblzma/common/memcmplen.h	Wed Apr  8 21:06:02 2015	(r281277)
@@ -19,11 +19,6 @@
 #	include <immintrin.h>
 #endif
 
-/// How many extra bytes lzma_memcmplen() may read. This depends on
-/// the method but since it is just a few bytes the biggest possible
-/// value is used here.
-#define LZMA_MEMCMPLEN_EXTRA 16
-
 
 /// Find out how many equal bytes the two buffers have.
 ///
@@ -39,6 +34,11 @@
 ///
 /// \return     Number of equal bytes in the buffers is returned.
 ///             This is always at least len and at most limit.
+///
+/// \note       LZMA_MEMCMPLEN_EXTRA defines how many extra bytes may be read.
+///             It's rounded up to 2^n. This extra amount needs to be
+///             allocated in the buffers being used. It needs to be
+///             initialized too to keep Valgrind quiet.
 static inline uint32_t lzma_attribute((__always_inline__))
 lzma_memcmplen(const uint8_t *buf1, const uint8_t *buf2,
 		uint32_t len, uint32_t limit)
@@ -59,6 +59,7 @@ lzma_memcmplen(const uint8_t *buf1, cons
 	// to be a good method. This may be fine on other 64-bit CPUs too.
 	// On big endian one should use xor instead of subtraction and switch
 	// to __builtin_clzll().
+#define LZMA_MEMCMPLEN_EXTRA 8
 	while (len < limit) {
 		const uint64_t x = *(const uint64_t *)(buf1 + len)
 				- *(const uint64_t *)(buf2 + len);
@@ -91,6 +92,7 @@ lzma_memcmplen(const uint8_t *buf1, cons
 	// version is sometimes significantly faster and sometimes
 	// slightly slower than this SSE2 version, so this SSE2
 	// version isn't used on x86-64.
+#	define LZMA_MEMCMPLEN_EXTRA 16
 	while (len < limit) {
 		const uint32_t x = 0xFFFF ^ _mm_movemask_epi8(_mm_cmpeq_epi8(
 			_mm_loadu_si128((const __m128i *)(buf1 + len)),
@@ -116,6 +118,7 @@ lzma_memcmplen(const uint8_t *buf1, cons
 
 #elif defined(TUKLIB_FAST_UNALIGNED_ACCESS) && !defined(WORDS_BIGENDIAN)
 	// Generic 32-bit little endian method
+#	define LZMA_MEMCMPLEN_EXTRA 4
 	while (len < limit) {
 		uint32_t x = *(const uint32_t *)(buf1 + len)
 				- *(const uint32_t *)(buf2 + len);
@@ -138,6 +141,7 @@ lzma_memcmplen(const uint8_t *buf1, cons
 
 #elif defined(TUKLIB_FAST_UNALIGNED_ACCESS) && defined(WORDS_BIGENDIAN)
 	// Generic 32-bit big endian method
+#	define LZMA_MEMCMPLEN_EXTRA 4
 	while (len < limit) {
 		uint32_t x = *(const uint32_t *)(buf1 + len)
 				^ *(const uint32_t *)(buf2 + len);
@@ -160,6 +164,7 @@ lzma_memcmplen(const uint8_t *buf1, cons
 
 #else
 	// Simple portable version that doesn't use unaligned access.
+#	define LZMA_MEMCMPLEN_EXTRA 0
 	while (len < limit && buf1[len] == buf2[len])
 		++len;
 

Modified: vendor/xz/dist/src/liblzma/lz/lz_encoder.c
==============================================================================
--- vendor/xz/dist/src/liblzma/lz/lz_encoder.c	Wed Apr  8 20:25:51 2015	(r281276)
+++ vendor/xz/dist/src/liblzma/lz/lz_encoder.c	Wed Apr  8 21:06:02 2015	(r281277)
@@ -110,6 +110,12 @@ fill_window(lzma_coder *coder, const lzm
 
 	coder->mf.write_pos = write_pos;
 
+	// Silence Valgrind. lzma_memcmplen() can read extra bytes
+	// and Valgrind will give warnings if those bytes are uninitialized
+	// because Valgrind cannot see that the values of the uninitialized
+	// bytes are eventually ignored.
+	memzero(coder->mf.buffer + write_pos, LZMA_MEMCMPLEN_EXTRA);
+
 	// If end of stream has been reached or flushing completed, we allow
 	// the encoder to process all the input (that is, read_pos is allowed
 	// to reach write_pos). Otherwise we keep keep_size_after bytes

Modified: vendor/xz/dist/src/liblzma/lzma/lzma_encoder_optimum_fast.c
==============================================================================
--- vendor/xz/dist/src/liblzma/lzma/lzma_encoder_optimum_fast.c	Wed Apr  8 20:25:51 2015	(r281276)
+++ vendor/xz/dist/src/liblzma/lzma/lzma_encoder_optimum_fast.c	Wed Apr  8 21:06:02 2015	(r281277)
@@ -152,7 +152,7 @@ lzma_lzma_optimum_fast(lzma_coder *restr
 	// the old buf pointer instead of recalculating it with mf_ptr().
 	++buf;
 
-	const uint32_t limit = len_main - 1;
+	const uint32_t limit = my_max(2, len_main - 1);
 
 	for (uint32_t i = 0; i < REPS; ++i) {
 		if (memcmp(buf, buf - coder->reps[i] - 1, limit) == 0) {

Modified: vendor/xz/dist/src/xz/file_io.c
==============================================================================
--- vendor/xz/dist/src/xz/file_io.c	Wed Apr  8 20:25:51 2015	(r281276)
+++ vendor/xz/dist/src/xz/file_io.c	Wed Apr  8 21:06:02 2015	(r281277)
@@ -82,13 +82,26 @@ io_init(void)
 	// we are root.
 	warn_fchown = geteuid() == 0;
 
-	if (pipe(user_abort_pipe)
-			|| fcntl(user_abort_pipe[0], F_SETFL, O_NONBLOCK)
-				== -1
-			|| fcntl(user_abort_pipe[1], F_SETFL, O_NONBLOCK)
-				== -1)
+	// Create a pipe for the self-pipe trick. If pipe2() is available,
+	// we can avoid the fcntl() calls.
+#	ifdef HAVE_PIPE2
+	if (pipe2(user_abort_pipe, O_NONBLOCK))
 		message_fatal(_("Error creating a pipe: %s"),
 				strerror(errno));
+#	else
+	if (pipe(user_abort_pipe))
+		message_fatal(_("Error creating a pipe: %s"),
+				strerror(errno));
+
+	// Make both ends of the pipe non-blocking.
+	for (unsigned i = 0; i < 2; ++i) {
+		int flags = fcntl(user_abort_pipe[i], F_GETFL);
+		if (flags == -1 || fcntl(user_abort_pipe[i], F_SETFL,
+				flags | O_NONBLOCK) == -1)
+			message_fatal(_("Error creating a pipe: %s"),
+					strerror(errno));
+	}
+#	endif
 #endif
 
 #ifdef __DJGPP__
@@ -393,7 +406,11 @@ io_open_src_real(file_pair *pair)
 #ifdef TUKLIB_DOSLIKE
 		setmode(STDIN_FILENO, O_BINARY);
 #else
-		// Enable O_NONBLOCK for stdin.
+		// Try to set stdin to non-blocking mode. It won't work
+		// e.g. on OpenBSD if stdout is e.g. /dev/null. In such
+		// case we proceed as if stdin were non-blocking anyway
+		// (in case of /dev/null it will be in practice). The
+		// same applies to stdout in io_open_dest_real().
 		stdin_flags = fcntl(STDIN_FILENO, F_GETFL);
 		if (stdin_flags == -1) {
 			message_error(_("Error getting the file status flags "
@@ -402,17 +419,10 @@ io_open_src_real(file_pair *pair)
 			return true;
 		}
 
-		if ((stdin_flags & O_NONBLOCK) == 0) {
-			if (fcntl(STDIN_FILENO, F_SETFL,
-					stdin_flags | O_NONBLOCK) == -1) {
-				message_error(_("Error setting O_NONBLOCK "
-						"on standard input: %s"),
-						strerror(errno));
-				return true;
-			}
-
+		if ((stdin_flags & O_NONBLOCK) == 0
+				&& fcntl(STDIN_FILENO, F_SETFL,
+					stdin_flags | O_NONBLOCK) != -1)
 			restore_stdin_flags = true;
-		}
 #endif
 #ifdef HAVE_POSIX_FADVISE
 		// It will fail if stdin is a pipe and that's fine.
@@ -705,7 +715,10 @@ io_open_dest_real(file_pair *pair)
 #ifdef TUKLIB_DOSLIKE
 		setmode(STDOUT_FILENO, O_BINARY);
 #else
-		// Set O_NONBLOCK if it isn't already set.
+		// Try to set O_NONBLOCK if it isn't already set.
+		// If it fails, we assume that stdout is non-blocking
+		// in practice. See the comments in io_open_src_real()
+		// for similar situation with stdin.
 		//
 		// NOTE: O_APPEND may be unset later in this function
 		// and it relies on stdout_flags being set here.
@@ -717,17 +730,10 @@ io_open_dest_real(file_pair *pair)
 			return true;
 		}
 
-		if ((stdout_flags & O_NONBLOCK) == 0) {
-			if (fcntl(STDOUT_FILENO, F_SETFL,
-					stdout_flags | O_NONBLOCK) == -1) {
-				message_error(_("Error setting O_NONBLOCK "
-						"on standard output: %s"),
-						strerror(errno));
-				return true;
-			}
-
-			restore_stdout_flags = true;
-		}
+		if ((stdout_flags & O_NONBLOCK) == 0
+				&& fcntl(STDOUT_FILENO, F_SETFL,
+					stdout_flags | O_NONBLOCK) != -1)
+				restore_stdout_flags = true;
 #endif
 	} else {
 		pair->dest_name = suffix_get_dest_name(pair->src_name);
@@ -742,6 +748,7 @@ io_open_dest_real(file_pair *pair)
 				message_error("%s: Refusing to write to "
 						"a DOS special file",
 						pair->dest_name);
+				free(pair->dest_name);
 				return true;
 			}
 
@@ -751,6 +758,7 @@ io_open_dest_real(file_pair *pair)
 				message_error("%s: Output file is the same "
 						"as the input file",
 						pair->dest_name);
+				free(pair->dest_name);
 				return true;
 			}
 		}
@@ -829,23 +837,24 @@ io_open_dest_real(file_pair *pair)
 				if (lseek(STDOUT_FILENO, 0, SEEK_END) == -1)
 					return false;
 
-				// O_NONBLOCK was set earlier in this function
-				// so it must be kept here too. If this
-				// fcntl() call fails, we continue but won't
+				// Construct the new file status flags.
+				// If O_NONBLOCK was set earlier in this
+				// function, it must be kept here too.
+				int flags = stdout_flags & ~O_APPEND;
+				if (restore_stdout_flags)
+					flags |= O_NONBLOCK;
+
+				// If this fcntl() fails, we continue but won't
 				// try to create sparse output. The original
 				// flags will still be restored if needed (to
 				// unset O_NONBLOCK) when the file is finished.
-				if (fcntl(STDOUT_FILENO, F_SETFL,
-						(stdout_flags | O_NONBLOCK)
-						& ~O_APPEND) == -1)
+				if (fcntl(STDOUT_FILENO, F_SETFL, flags) == -1)
 					return false;
 
 				// Disabling O_APPEND succeeded. Mark
 				// that the flags should be restored
-				// in io_close_dest(). This quite likely was
-				// already set when enabling O_NONBLOCK but
-				// just in case O_NONBLOCK was already set,
-				// set this again here.
+				// in io_close_dest(). (This may have already
+				// been set when enabling O_NONBLOCK.)
 				restore_stdout_flags = true;
 
 			} else if (lseek(STDOUT_FILENO, 0, SEEK_CUR)

From owner-svn-src-vendor@FreeBSD.ORG  Wed Apr  8 21:06:31 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 804E46EF;
 Wed,  8 Apr 2015 21:06:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 51D9F9C7;
 Wed,  8 Apr 2015 21:06:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t38L6VG2039128;
 Wed, 8 Apr 2015 21:06:31 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t38L6V4X039127;
 Wed, 8 Apr 2015 21:06:31 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201504082106.t38L6V4X039127@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 8 Apr 2015 21:06:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r281278 - vendor/xz/5.2.1
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Apr 2015 21:06:31 -0000

Author: delphij
Date: Wed Apr  8 21:06:30 2015
New Revision: 281278
URL: https://svnweb.freebsd.org/changeset/base/281278

Log:
  Tag xz 5.2.1.

Added:
  vendor/xz/5.2.1/
     - copied from r281277, vendor/xz/dist/

From owner-svn-src-vendor@FreeBSD.ORG  Thu Apr  9 23:08:53 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F07D9A2D;
 Thu,  9 Apr 2015 23:08:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D7C24BA0;
 Thu,  9 Apr 2015 23:08:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t39N8qVv087730;
 Thu, 9 Apr 2015 23:08:52 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t39N8mfC087715;
 Thu, 9 Apr 2015 23:08:48 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201504092308.t39N8mfC087715@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org
 using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 9 Apr 2015 23:08:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r281344 - in vendor-sys/acpica/dist: . generate/unix
 generate/unix/acpidump source/common source/compiler
 source/components/debugger source/components/disassembler
 source/components/dis...
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Apr 2015 23:08:53 -0000

Author: jkim
Date: Thu Apr  9 23:08:47 2015
New Revision: 281344
URL: https://svnweb.freebsd.org/changeset/base/281344

Log:
  Import ACPICA 20150408.

Added:
  vendor-sys/acpica/dist/source/include/platform/acdragonfly.h   (contents, props changed)
  vendor-sys/acpica/dist/source/include/platform/acdragonflyex.h   (contents, props changed)
  vendor-sys/acpica/dist/source/os_specific/service_layers/osbsdtbl.c
     - copied, changed from r281343, vendor-sys/acpica/dist/source/os_specific/service_layers/osfreebsdtbl.c
Deleted:
  vendor-sys/acpica/dist/source/os_specific/service_layers/osfreebsdtbl.c
Modified:
  vendor-sys/acpica/dist/changes.txt
  vendor-sys/acpica/dist/generate/unix/Makefile.config
  vendor-sys/acpica/dist/generate/unix/acpidump/Makefile
  vendor-sys/acpica/dist/source/common/adfile.c
  vendor-sys/acpica/dist/source/common/adisasm.c
  vendor-sys/acpica/dist/source/common/dmtable.c
  vendor-sys/acpica/dist/source/common/dmtbdump.c
  vendor-sys/acpica/dist/source/common/dmtbinfo.c
  vendor-sys/acpica/dist/source/compiler/aslcodegen.c
  vendor-sys/acpica/dist/source/compiler/aslcompile.c
  vendor-sys/acpica/dist/source/compiler/aslcompiler.h
  vendor-sys/acpica/dist/source/compiler/asldefine.h
  vendor-sys/acpica/dist/source/compiler/aslfold.c
  vendor-sys/acpica/dist/source/compiler/asllisting.c
  vendor-sys/acpica/dist/source/compiler/aslmain.c
  vendor-sys/acpica/dist/source/compiler/aslmap.c
  vendor-sys/acpica/dist/source/compiler/aslmapenter.c
  vendor-sys/acpica/dist/source/compiler/asloptions.c
  vendor-sys/acpica/dist/source/compiler/aslrules.y
  vendor-sys/acpica/dist/source/compiler/aslstartup.c
  vendor-sys/acpica/dist/source/compiler/asltree.c
  vendor-sys/acpica/dist/source/compiler/asltypes.y
  vendor-sys/acpica/dist/source/compiler/aslutils.c
  vendor-sys/acpica/dist/source/compiler/aslwalks.c
  vendor-sys/acpica/dist/source/compiler/dtcompile.c
  vendor-sys/acpica/dist/source/compiler/dtcompiler.h
  vendor-sys/acpica/dist/source/compiler/dtio.c
  vendor-sys/acpica/dist/source/compiler/dttable.c
  vendor-sys/acpica/dist/source/compiler/dttemplate.h
  vendor-sys/acpica/dist/source/compiler/dtutils.c
  vendor-sys/acpica/dist/source/components/debugger/dbmethod.c
  vendor-sys/acpica/dist/source/components/debugger/dbxface.c
  vendor-sys/acpica/dist/source/components/disassembler/dmcstyle.c
  vendor-sys/acpica/dist/source/components/disassembler/dmopcode.c
  vendor-sys/acpica/dist/source/components/disassembler/dmwalk.c
  vendor-sys/acpica/dist/source/components/dispatcher/dsopcode.c
  vendor-sys/acpica/dist/source/components/dispatcher/dsutils.c
  vendor-sys/acpica/dist/source/components/events/evregion.c
  vendor-sys/acpica/dist/source/components/events/evxfevnt.c
  vendor-sys/acpica/dist/source/components/executer/exdump.c
  vendor-sys/acpica/dist/source/components/executer/exfldio.c
  vendor-sys/acpica/dist/source/components/executer/exoparg3.c
  vendor-sys/acpica/dist/source/components/executer/exregion.c
  vendor-sys/acpica/dist/source/components/hardware/hwgpe.c
  vendor-sys/acpica/dist/source/components/hardware/hwvalid.c
  vendor-sys/acpica/dist/source/components/namespace/nsdump.c
  vendor-sys/acpica/dist/source/components/parser/psopcode.c
  vendor-sys/acpica/dist/source/components/parser/psopinfo.c
  vendor-sys/acpica/dist/source/components/resources/rsaddr.c
  vendor-sys/acpica/dist/source/components/resources/rsdump.c
  vendor-sys/acpica/dist/source/components/resources/rsdumpinfo.c
  vendor-sys/acpica/dist/source/components/resources/rsxface.c
  vendor-sys/acpica/dist/source/components/tables/tbdata.c
  vendor-sys/acpica/dist/source/components/tables/tbinstal.c
  vendor-sys/acpica/dist/source/components/tables/tbprint.c
  vendor-sys/acpica/dist/source/components/tables/tbxfroot.c
  vendor-sys/acpica/dist/source/components/utilities/utaddress.c
  vendor-sys/acpica/dist/source/components/utilities/utbuffer.c
  vendor-sys/acpica/dist/source/components/utilities/utclib.c
  vendor-sys/acpica/dist/source/components/utilities/utglobal.c
  vendor-sys/acpica/dist/source/components/utilities/utmisc.c
  vendor-sys/acpica/dist/source/components/utilities/utosi.c
  vendor-sys/acpica/dist/source/components/utilities/utprint.c
  vendor-sys/acpica/dist/source/components/utilities/utstate.c
  vendor-sys/acpica/dist/source/components/utilities/utuuid.c
  vendor-sys/acpica/dist/source/include/acapps.h
  vendor-sys/acpica/dist/source/include/acdebug.h
  vendor-sys/acpica/dist/source/include/acdisasm.h
  vendor-sys/acpica/dist/source/include/acglobal.h
  vendor-sys/acpica/dist/source/include/aclocal.h
  vendor-sys/acpica/dist/source/include/acmacros.h
  vendor-sys/acpica/dist/source/include/acopcode.h
  vendor-sys/acpica/dist/source/include/acpixf.h
  vendor-sys/acpica/dist/source/include/acresrc.h
  vendor-sys/acpica/dist/source/include/acrestyp.h
  vendor-sys/acpica/dist/source/include/acstruct.h
  vendor-sys/acpica/dist/source/include/actables.h
  vendor-sys/acpica/dist/source/include/actbl2.h
  vendor-sys/acpica/dist/source/include/actypes.h
  vendor-sys/acpica/dist/source/include/acutils.h
  vendor-sys/acpica/dist/source/include/amlcode.h
  vendor-sys/acpica/dist/source/include/platform/acenv.h
  vendor-sys/acpica/dist/source/include/platform/acnetbsd.h
  vendor-sys/acpica/dist/source/os_specific/service_layers/osefixf.c
  vendor-sys/acpica/dist/source/os_specific/service_layers/oslinuxtbl.c
  vendor-sys/acpica/dist/source/os_specific/service_layers/osunixmap.c
  vendor-sys/acpica/dist/source/tools/acpiexec/aemain.c
  vendor-sys/acpica/dist/source/tools/acpiexec/aeregion.c
  vendor-sys/acpica/dist/source/tools/acpiexec/aetables.c
  vendor-sys/acpica/dist/source/tools/acpihelp/ahamlops.c
  vendor-sys/acpica/dist/source/tools/acpihelp/ahaslops.c
  vendor-sys/acpica/dist/source/tools/acpinames/antables.c
  vendor-sys/acpica/dist/source/tools/acpisrc/astable.c
  vendor-sys/acpica/dist/source/tools/examples/extables.c

Modified: vendor-sys/acpica/dist/changes.txt
==============================================================================
--- vendor-sys/acpica/dist/changes.txt	Thu Apr  9 22:16:35 2015	(r281343)
+++ vendor-sys/acpica/dist/changes.txt	Thu Apr  9 23:08:47 2015	(r281344)
@@ -1,7 +1,77 @@
 ----------------------------------------
-04 February 2015. Summary of changes for version 20150204:
+08 April 2015. Summary of changes for version 20150408:
 
-This release is available at https://acpica.org/downloads
+
+1) ACPICA kernel-resident subsystem:
+
+Permanently set the return value for the _REV predefined name. It now 
+returns 2 (was 5). This matches other ACPI implementations. _REV will be 
+deprecated in the future, and is now defined to be 1 for ACPI 1.0, and 2 
+for ACPI 2.0 and later. It should never be used to differentiate or 
+identify operating systems.
+
+Added the "Windows 2015" string to the _OSI support. ACPICA will now 
+return TRUE to a query with this string.
+
+Fixed several issues with the local version of the printf function.
+
+Added the C99 compiler option (-std=c99) to the Unix makefiles.
+
+  Current Release:
+    Non-Debug Version:  99.9K Code, 27.4K Data, 127.3K Total
+    Debug Version:     195.2K Code, 80.7K Data, 275.9K Total
+  Previous Release:
+    Non-Debug Version:  98.8K Code, 27.3K Data, 126.1K Total
+    Debug Version:     192.1K Code, 79.8K Data, 271.9K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL: Implemented an enhancement to the constant folding feature to 
+transform the parse tree to a simple Store operation whenever possible:
+    Add (2, 3, X) ==> is converted to: Store (5, X)
+    X = 2 + 3     ==> is converted to: Store (5, X)
+
+Updated support for the SLIC table (Software Licensing Description Table) 
+in both the Data Table compiler and the disassembler. The SLIC table 
+support now conforms to "Microsoft Software Licensing Tables (SLIC and 
+MSDM). November 29, 2011. Copyright 2011 Microsoft". Note: Any SLIC data 
+following the ACPI header is now defined to be "Proprietary Data", and as 
+such, can only be entered or displayed as a hex data block.
+
+Implemented full support for the MSDM table as described in the document 
+above. Note: The format of MSDM is similar to SLIC. Any MSDM data 
+following the ACPI header is defined to be "Proprietary Data", and can 
+only be entered or displayed as a hex data block.
+
+Implemented the -Pn option for the iASL Table Compiler (was only 
+implemented for the ASL compiler). This option disables the iASL 
+preprocessor.
+
+Disassembler: For disassembly of Data Tables, added a comment field 
+around the Ascii equivalent data that is emitted as part of the "Raw 
+Table Data" block. This prevents the iASL Preprocessor from possible 
+confusion if/when the table is compiled.
+
+Disassembler: Added an option (-df) to force the disassembler to assume 
+that the table being disassembled contains valid AML. This feature is 
+useful for disassembling AML files that contain ACPI signatures other 
+than DSDT or SSDT (such as OEMx or other signatures).
+
+Changes for the EFI version of the tools:
+1) Fixed a build error/issue
+2) Fixed a cast warning
+
+iASL: Fixed a path issue with the __FILE__ operator by making the 
+directory prefix optional within the internal SplitInputFilename 
+function.
+
+Debugger: Removed some unused global variables.
+
+Tests: Updated the makefile for proper generation of the AAPITS suite.
+
+----------------------------------------
+04 February 2015. Summary of changes for version 20150204:
 
 ACPICA kernel-resident subsystem:
 
@@ -14,24 +84,26 @@ Events: Introduce ACPI_GPE_DISPATCH_RAW_
 A raw gpe handling mechanism was created to allow better handling of GPE
 storms that aren't easily managed by the normal handler. The raw handler
 allows disabling/renabling of the the GPE so that interrupt storms can be
-avoided in cases where events cannot be timely serviced. In this scenario,
-handlers should use the AcpiSetGpe() API to disable/enable the GPE. This API
-will leave the reference counts undisturbed, thereby preventing unintentional
-clearing of the GPE when the intent in only to temporarily disable it. Raw
-handlers allow enabling and disabling of a GPE by removing GPE register
-locking. As such, raw handlers much provide their own locks while using
-GPE API's to protect access to GPE data structures.
+avoided in cases where events cannot be timely serviced. In this 
+scenario, handlers should use the AcpiSetGpe() API to disable/enable the 
+GPE. This API will leave the reference counts undisturbed, thereby 
+preventing unintentional clearing of the GPE when the intent in only to 
+temporarily disable it. Raw handlers allow enabling and disabling of a 
+GPE by removing GPE register locking. As such, raw handlers much provide 
+their own locks while using GPE API's to protect access to GPE data 
+structures.
 Lv Zheng
 
 Events: Always modify GPE registers under the GPE lock.
 Applies GPE lock around AcpiFinishGpe() to protect access to GPE register
 values. Reported as bug by joe.liu@apple.com.
 
-Unix makefiles: Separate option to disable optimizations and _FORTIFY_SOURCE.
-This change removes the _FORTIFY_SOURCE flag from the NOOPT disable option and
-creates a separate flag (NOFORTIFY) for this purpose. Some toolchains may
-define _FORTIFY_SOURCE which leads redefined errors when building ACPICA. This
-allows disabling the option without also having to disable optimazations.
+Unix makefiles: Separate option to disable optimizations and 
+_FORTIFY_SOURCE. This change removes the _FORTIFY_SOURCE flag from the 
+NOOPT disable option and creates a separate flag (NOFORTIFY) for this 
+purpose. Some toolchains may define _FORTIFY_SOURCE which leads redefined 
+errors when building ACPICA. This allows disabling the option without 
+also having to disable optimazations.
 David Box
 
   Current Release:

Modified: vendor-sys/acpica/dist/generate/unix/Makefile.config
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/Makefile.config	Thu Apr  9 22:16:35 2015	(r281343)
+++ vendor-sys/acpica/dist/generate/unix/Makefile.config	Thu Apr  9 23:08:47 2015	(r281344)
@@ -59,6 +59,10 @@ ifeq ($(UNAME_S), FreeBSD)
 HOST =       _FreeBSD
 endif
 
+ifeq ($(UNAME_S), NetBSD)
+HOST =       _NetBSD
+endif
+
 ifeq ($(HOST), _APPLE)
 INSTALL  =   cp
 INSTALLFLAGS ?= -f
@@ -161,7 +165,7 @@ CFLAGS += \
 # to -Wall are not automatically included in -Wall.
 #
 CWARNINGFLAGS = \
-    -ansi\
+    -std=c99\
     -Wall\
     -Wbad-function-cast\
     -Wdeclaration-after-statement\
@@ -241,4 +245,3 @@ MFLAGS=     -P -I$(ASL_COMPILER)
 
 LEX=        flex
 LFLAGS +=   -i -s
-

Modified: vendor-sys/acpica/dist/generate/unix/acpidump/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpidump/Makefile	Thu Apr  9 22:16:35 2015	(r281343)
+++ vendor-sys/acpica/dist/generate/unix/acpidump/Makefile	Thu Apr  9 23:08:47 2015	(r281344)
@@ -52,8 +52,16 @@ OBJECTS = \
 # Per-host interfaces
 #
 ifeq ($(HOST), _FreeBSD)
+HOST_FAMILY = BSD
+endif
+
+ifeq ($(HOST), _NetBSD)
+HOST_FAMILY = BSD
+endif
+
+ifeq ($(HOST_FAMILY), BSD)
 OBJECTS += \
-	$(OBJDIR)/osfreebsdtbl.o
+	$(OBJDIR)/osbsdtbl.o
 else
 OBJECTS += \
 	$(OBJDIR)/oslinuxtbl.o

Modified: vendor-sys/acpica/dist/source/common/adfile.c
==============================================================================
--- vendor-sys/acpica/dist/source/common/adfile.c	Thu Apr  9 22:16:35 2015	(r281343)
+++ vendor-sys/acpica/dist/source/common/adfile.c	Thu Apr  9 23:08:47 2015	(r281344)
@@ -295,7 +295,10 @@ FlSplitInputPathname (
     char                    *Filename;
 
 
-    *OutDirectoryPath = NULL;
+    if (OutDirectoryPath)
+    {
+        *OutDirectoryPath = NULL;
+    }
 
     if (!InputPath)
     {
@@ -340,7 +343,10 @@ FlSplitInputPathname (
         return (AE_NO_MEMORY);
     }
 
-    *OutDirectoryPath = DirectoryPath;
+    if (OutDirectoryPath)
+    {
+        *OutDirectoryPath = DirectoryPath;
+    }
 
     if (OutFilename)
     {

Modified: vendor-sys/acpica/dist/source/common/adisasm.c
==============================================================================
--- vendor-sys/acpica/dist/source/common/adisasm.c	Thu Apr  9 22:16:35 2015	(r281343)
+++ vendor-sys/acpica/dist/source/common/adisasm.c	Thu Apr  9 23:08:47 2015	(r281344)
@@ -64,6 +64,11 @@ AdCreateTableHeader (
     char                    *Filename,
     ACPI_TABLE_HEADER       *Table);
 
+static ACPI_STATUS
+AdStoreTable (
+    ACPI_TABLE_HEADER       *Table,
+    UINT32                  *TableIndex);
+
 /* Stubs for ASL compiler */
 
 #ifndef ACPI_ASL_COMPILER
@@ -298,7 +303,7 @@ AdAmlDisassemble (
             return (Status);
         }
 
-        if (!AcpiGbl_DbOpt_disasm)
+        if (!AcpiGbl_DbOpt_Disasm)
         {
             return (AE_OK);
         }
@@ -337,7 +342,6 @@ AdAmlDisassemble (
         {
             fprintf (stderr, "Could not open output file %s\n", DisasmFilename);
             Status = AE_ERROR;
-            ACPI_FREE (DisasmFilename);
             goto Cleanup;
         }
 
@@ -346,9 +350,11 @@ AdAmlDisassemble (
 
     *OutFilename = DisasmFilename;
 
-    if (!AcpiUtIsAmlTable (Table))
+    /* ForceAmlDisassembly means to assume the table contains valid AML */
+
+    if (!AcpiGbl_ForceAmlDisassembly && !AcpiUtIsAmlTable (Table))
     {
-        AdDisassemblerHeader (Filename);
+        AdDisassemblerHeader (Filename, ACPI_IS_DATA_TABLE);
         AcpiOsPrintf (" * ACPI Data Table [%4.4s]\n *\n",
             Table->Signature);
         AcpiOsPrintf (" * Format: [HexOffset DecimalOffset ByteLength]  "
@@ -486,7 +492,7 @@ AdAmlDisassemble (
 
         /* Optional displays */
 
-        if (AcpiGbl_DbOpt_disasm)
+        if (AcpiGbl_DbOpt_Disasm)
         {
             /* This is the real disassembly */
 
@@ -515,7 +521,7 @@ AdAmlDisassemble (
 
 Cleanup:
 
-    if (Table && !AcpiUtIsAmlTable (Table))
+    if (Table && !AcpiGbl_ForceAmlDisassembly &&!AcpiUtIsAmlTable (Table))
     {
         ACPI_FREE (Table);
     }
@@ -543,6 +549,7 @@ Cleanup:
  * FUNCTION:    AdDisassemblerHeader
  *
  * PARAMETERS:  Filename            - Input file for the table
+ *              TableType           - Either AML or DataTable
  *
  * RETURN:      None
  *
@@ -553,7 +560,8 @@ Cleanup:
 
 void
 AdDisassemblerHeader (
-    char                    *Filename)
+    char                    *Filename,
+    UINT8                   TableType)
 {
     time_t                  Timer;
 
@@ -565,17 +573,20 @@ AdDisassemblerHeader (
     AcpiOsPrintf ("/*\n");
     AcpiOsPrintf (ACPI_COMMON_HEADER (AML_DISASSEMBLER_NAME, " * "));
 
-    if (AcpiGbl_CstyleDisassembly)
+    if (TableType == ACPI_IS_AML_TABLE)
     {
-        AcpiOsPrintf (
-            " * Disassembling to symbolic ASL+ operators\n"
-            " *\n");
-    }
-    else
-    {
-        AcpiOsPrintf (
-            " * Disassembling to non-symbolic legacy ASL operators\n"
-            " *\n");
+        if (AcpiGbl_CstyleDisassembly)
+        {
+            AcpiOsPrintf (
+                " * Disassembling to symbolic ASL+ operators\n"
+                " *\n");
+        }
+        else
+        {
+            AcpiOsPrintf (
+                " * Disassembling to non-symbolic legacy ASL operators\n"
+                " *\n");
+        }
     }
 
     AcpiOsPrintf (" * Disassembly of %s, %s", Filename, ctime (&Timer));
@@ -609,7 +620,7 @@ AdCreateTableHeader (
     /*
      * Print file header and dump original table header
      */
-    AdDisassemblerHeader (Filename);
+    AdDisassemblerHeader (Filename, ACPI_IS_AML_TABLE);
 
     AcpiOsPrintf (" * Original Table Header:\n");
     AcpiOsPrintf (" *     Signature        \"%4.4s\"\n",    Table->Signature);
@@ -717,7 +728,7 @@ AdDisplayTables (
         return (AE_NOT_EXIST);
     }
 
-    if (!AcpiGbl_DbOpt_verbose)
+    if (!AcpiGbl_DbOpt_Verbose)
     {
         AdCreateTableHeader (Filename, Table);
     }
@@ -725,7 +736,7 @@ AdDisplayTables (
     AcpiDmDisassemble (NULL, AcpiGbl_ParseOpRoot, ACPI_UINT32_MAX);
     MpEmitMappingInfo ();
 
-    if (AcpiGbl_DbOpt_verbose)
+    if (AcpiGbl_DbOpt_Verbose)
     {
         AcpiOsPrintf ("\n\nTable Header:\n");
         AcpiUtDebugDumpBuffer ((UINT8 *) Table, sizeof (ACPI_TABLE_HEADER),
@@ -740,6 +751,43 @@ AdDisplayTables (
 }
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AdStoreTable
+ *
+ * PARAMETERS:  Table               - Table header
+ *              TableIndex          - Where the table index is returned
+ *
+ * RETURN:      Status and table index.
+ *
+ * DESCRIPTION: Add an ACPI table to the global table list
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AdStoreTable (
+    ACPI_TABLE_HEADER       *Table,
+    UINT32                  *TableIndex)
+{
+    ACPI_STATUS             Status;
+    ACPI_TABLE_DESC         *TableDesc;
+
+
+    Status = AcpiTbGetNextTableDescriptor (TableIndex, &TableDesc);
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
+
+    /* Initialize added table */
+
+    AcpiTbInitTableDescriptor (TableDesc, ACPI_PTR_TO_PHYSADDR (Table),
+        ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL, Table);
+    AcpiTbValidateTable (TableDesc);
+    return (AE_OK);
+}
+
+
 /******************************************************************************
  *
  * FUNCTION:    AdGetLocalTables
@@ -777,8 +825,7 @@ AdGetLocalTables (
 
     /* Store DSDT in the Table Manager */
 
-    Status = AcpiTbStoreTable (0, NewTable, NewTable->Length,
-                0, &TableIndex);
+    Status = AdStoreTable (NewTable, &TableIndex);
     if (ACPI_FAILURE (Status))
     {
         fprintf (stderr, "Could not store DSDT\n");
@@ -871,9 +918,7 @@ AdParseTable (
 
     if (LoadTable)
     {
-        Status = AcpiTbStoreTable ((ACPI_PHYSICAL_ADDRESS) Table, Table,
-                    Table->Length, ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL,
-                    &TableIndex);
+        Status = AdStoreTable (Table, &TableIndex);
         if (ACPI_FAILURE (Status))
         {
             return (Status);

Modified: vendor-sys/acpica/dist/source/common/dmtable.c
==============================================================================
--- vendor-sys/acpica/dist/source/common/dmtable.c	Thu Apr  9 22:16:35 2015	(r281343)
+++ vendor-sys/acpica/dist/source/common/dmtable.c	Thu Apr  9 23:08:47 2015	(r281344)
@@ -241,13 +241,6 @@ static const char           *AcpiDmPmttS
     "Unknown SubTable Type"         /* Reserved */
 };
 
-static const char           *AcpiDmSlicSubnames[] =
-{
-    "Public Key Structure",
-    "Windows Marker Structure",
-    "Unknown SubTable Type"         /* Reserved */
-};
-
 static const char           *AcpiDmSratSubnames[] =
 {
     "Processor Local APIC/SAPIC Affinity",
@@ -339,6 +332,7 @@ ACPI_DMTABLE_DATA    AcpiDmTableData[] =
     {ACPI_SIG_MCHI, AcpiDmTableInfoMchi,    NULL,           NULL,           TemplateMchi,   "Management Controller Host Interface table"},
     {ACPI_SIG_MPST, AcpiDmTableInfoMpst,    AcpiDmDumpMpst, DtCompileMpst,  TemplateMpst,   "Memory Power State Table"},
     {ACPI_SIG_MSCT, NULL,                   AcpiDmDumpMsct, DtCompileMsct,  TemplateMsct,   "Maximum System Characteristics Table"},
+    {ACPI_SIG_MSDM, NULL,                   AcpiDmDumpSlic, DtCompileSlic,  TemplateMsdm,   "Microsoft Data Management table"},
     {ACPI_SIG_MTMR, NULL,                   AcpiDmDumpMtmr, DtCompileMtmr,  TemplateMtmr,   "MID Timer Table"},
     {ACPI_SIG_PCCT, AcpiDmTableInfoPcct,    AcpiDmDumpPcct, DtCompilePcct,  TemplatePcct,   "Platform Communications Channel Table"},
     {ACPI_SIG_PMTT, NULL,                   AcpiDmDumpPmtt, DtCompilePmtt,  TemplatePmtt,   "Platform Memory Topology Table"},
@@ -515,10 +509,20 @@ AcpiDmDumpDataTable (
             }
             else
             {
-                AcpiOsPrintf ("\n**** Unknown ACPI table type [%4.4s]\n\n",
+                AcpiOsPrintf ("\n**** Unknown ACPI table signature [%4.4s]\n\n",
                     Table->Signature);
-                fprintf (stderr, "Unknown ACPI table signature [%4.4s], decoding header only\n",
+
+                fprintf (stderr, "Unknown ACPI table signature [%4.4s], ",
                     Table->Signature);
+
+                if (!AcpiGbl_ForceAmlDisassembly)
+                {
+                    fprintf (stderr, "decoding ACPI table header only\n");
+                }
+                else
+                {
+                    fprintf (stderr, "assuming table contains valid AML code\n");
+                }
             }
         }
         else if (TableData->TableHandler)
@@ -686,6 +690,7 @@ AcpiDmDumpTable (
     UINT32                  ByteLength;
     UINT8                   Temp8;
     UINT16                  Temp16;
+    UINT32                  Temp32;
     UINT64                  Value;
     ACPI_DMTABLE_DATA       *TableData;
     const char              *Name;
@@ -715,7 +720,8 @@ AcpiDmDumpTable (
         if ((CurrentOffset >= TableLength) ||
             (SubtableLength && (Info->Offset >= SubtableLength)))
         {
-            AcpiOsPrintf ("**** ACPI table terminates in the middle of a data structure!\n");
+            AcpiOsPrintf (
+                "**** ACPI table terminates in the middle of a data structure! (dump table)\n");
             return (AE_BAD_DATA);
         }
 
@@ -760,7 +766,6 @@ AcpiDmDumpTable (
         case ACPI_DMT_UINT32:
         case ACPI_DMT_NAME4:
         case ACPI_DMT_SIG:
-        case ACPI_DMT_SLIC:
         case ACPI_DMT_LPIT:
 
             ByteLength = 4;
@@ -805,6 +810,12 @@ AcpiDmDumpTable (
             ByteLength = 128;
             break;
 
+        case ACPI_DMT_BUFFER:
+        case ACPI_DMT_RAW_BUFFER:
+
+            ByteLength = SubtableLength;
+            break;
+
         case ACPI_DMT_STRING:
 
             ByteLength = ACPI_STRLEN (ACPI_CAST_PTR (char, Target)) + 1;
@@ -838,7 +849,8 @@ AcpiDmDumpTable (
 
         if (CurrentOffset + ByteLength > TableLength)
         {
-            AcpiOsPrintf ("**** ACPI table terminates in the middle of a data structure!\n");
+            AcpiOsPrintf (
+                "**** ACPI table terminates in the middle of a data structure!\n");
             return (AE_BAD_DATA);
         }
 
@@ -1005,8 +1017,9 @@ AcpiDmDumpTable (
 
             AcpiOsPrintf ("%2.2X", *Target);
             Temp8 = AcpiDmGenerateChecksum (Table,
-                        ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length,
-                        ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
+                ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length,
+                ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
+
             if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
             {
                 AcpiOsPrintf (
@@ -1032,7 +1045,7 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_GAS_WIDTH_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, Temp8, AcpiDmGasAccessWidth[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmGasAccessWidth[Temp8]);
             break;
 
         case ACPI_DMT_GAS:
@@ -1069,7 +1082,8 @@ AcpiDmDumpTable (
                 Temp16 = ACPI_DMAR_TYPE_RESERVED;
             }
 
-            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target), AcpiDmDmarSubnames[Temp16]);
+            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
+                AcpiDmDmarSubnames[Temp16]);
             break;
 
         case ACPI_DMT_DMAR_SCOPE:
@@ -1082,7 +1096,8 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_DMAR_SCOPE_TYPE_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmDmarScope[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target,
+                AcpiDmDmarScope[Temp8]);
             break;
 
         case ACPI_DMT_EINJACT:
@@ -1095,7 +1110,8 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_EINJ_ACTION_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmEinjActions[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target,
+                AcpiDmEinjActions[Temp8]);
             break;
 
         case ACPI_DMT_EINJINST:
@@ -1108,7 +1124,8 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_EINJ_INSTRUCTION_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmEinjInstructions[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target,
+                AcpiDmEinjInstructions[Temp8]);
             break;
 
         case ACPI_DMT_ERSTACT:
@@ -1121,7 +1138,8 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_ERST_ACTION_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmErstActions[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target,
+                AcpiDmErstActions[Temp8]);
             break;
 
         case ACPI_DMT_ERSTINST:
@@ -1134,7 +1152,8 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_ERST_INSTRUCTION_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmErstInstructions[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target,
+                AcpiDmErstInstructions[Temp8]);
             break;
 
         case ACPI_DMT_GTDT:
@@ -1147,7 +1166,8 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_GTDT_TYPE_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmGtdtSubnames[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target,
+                AcpiDmGtdtSubnames[Temp8]);
             break;
 
         case ACPI_DMT_HEST:
@@ -1160,12 +1180,15 @@ AcpiDmDumpTable (
                 Temp16 = ACPI_HEST_TYPE_RESERVED;
             }
 
-            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target), AcpiDmHestSubnames[Temp16]);
+            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
+                AcpiDmHestSubnames[Temp16]);
             break;
 
         case ACPI_DMT_HESTNTFY:
 
-            AcpiOsPrintf (STRING_FORMAT, "Hardware Error Notification Structure");
+            AcpiOsPrintf (STRING_FORMAT,
+                "Hardware Error Notification Structure");
+
             AcpiDmDumpTable (TableLength, CurrentOffset, Target,
                 sizeof (ACPI_HEST_NOTIFY), AcpiDmTableInfoHestNotify);
             AcpiOsPrintf ("\n");
@@ -1182,7 +1205,8 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_HEST_NOTIFY_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmHestNotifySubnames[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target,
+                AcpiDmHestNotifySubnames[Temp8]);
             break;
 
         case ACPI_DMT_MADT:
@@ -1195,7 +1219,8 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_MADT_TYPE_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmMadtSubnames[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target,
+                AcpiDmMadtSubnames[Temp8]);
             break;
 
         case ACPI_DMT_PCCT:
@@ -1208,7 +1233,8 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_PCCT_TYPE_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmPcctSubnames[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target,
+                AcpiDmPcctSubnames[Temp8]);
             break;
 
         case ACPI_DMT_PMTT:
@@ -1221,20 +1247,20 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_PMTT_TYPE_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmPmttSubnames[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target,
+                AcpiDmPmttSubnames[Temp8]);
             break;
 
-        case ACPI_DMT_SLIC:
-
-            /* SLIC subtable types */
-
-            Temp8 = *Target;
-            if (Temp8 > ACPI_SLIC_TYPE_RESERVED)
-            {
-                Temp8 = ACPI_SLIC_TYPE_RESERVED;
-            }
+        case ACPI_DMT_RAW_BUFFER:
+            /*
+             * Currently only used for SLIC table
+             */
+            AcpiOsPrintf ("/* Proprietary data structure */ ");
 
-            AcpiOsPrintf (UINT32_FORMAT, *Target, AcpiDmSlicSubnames[Temp8]);
+            AcpiDmDumpBuffer (Table, sizeof (ACPI_TABLE_HEADER),
+                ByteLength, sizeof (ACPI_TABLE_HEADER),
+                "Licensing Data", TRUE);
+            AcpiOsPrintf ("\n");
             break;
 
         case ACPI_DMT_SRAT:
@@ -1247,7 +1273,8 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_SRAT_TYPE_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmSratSubnames[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target,
+                AcpiDmSratSubnames[Temp8]);
             break;
 
         case ACPI_DMT_FADTPM:
@@ -1260,7 +1287,8 @@ AcpiDmDumpTable (
                 Temp8 = ACPI_FADT_PM_RESERVED;
             }
 
-            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmFadtProfiles[Temp8]);
+            AcpiOsPrintf (UINT8_FORMAT, *Target,
+                AcpiDmFadtProfiles[Temp8]);
             break;
 
         case ACPI_DMT_IVRS:
@@ -1295,26 +1323,14 @@ AcpiDmDumpTable (
 
             /* LPIT subtable types */
 
-            Temp8 = *Target;
-            switch (Temp8)
+            Temp32 = ACPI_GET32 (Target);
+            if (Temp32 > ACPI_LPIT_TYPE_RESERVED)
             {
-            case ACPI_LPIT_TYPE_NATIVE_CSTATE:
-
-                Name = AcpiDmLpitSubnames[0];
-                break;
-
-            case ACPI_LPIT_TYPE_SIMPLE_IO:
-
-                Name = AcpiDmLpitSubnames[1];
-                break;
-
-            default:
-
-                Name = AcpiDmLpitSubnames[2];
-                break;
+                Temp32 = ACPI_LPIT_TYPE_RESERVED;
             }
 
-            AcpiOsPrintf (UINT32_FORMAT, *Target, Name);
+            AcpiOsPrintf (UINT32_FORMAT, ACPI_GET32 (Target),
+                AcpiDmLpitSubnames[Temp32]);
             break;
 
         case ACPI_DMT_EXIT:
@@ -1331,8 +1347,10 @@ AcpiDmDumpTable (
 
     if (TableOffset && !SubtableLength)
     {
-        /* If this table is not the main table, subtable must have valid length */
-
+        /*
+         * If this table is not the main table, the subtable must have a
+         * valid length
+         */
         AcpiOsPrintf ("Invalid zero length subtable\n");
         return (AE_BAD_DATA);
     }

Modified: vendor-sys/acpica/dist/source/common/dmtbdump.c
==============================================================================
--- vendor-sys/acpica/dist/source/common/dmtbdump.c	Thu Apr  9 22:16:35 2015	(r281343)
+++ vendor-sys/acpica/dist/source/common/dmtbdump.c	Thu Apr  9 23:08:47 2015	(r281344)
@@ -59,14 +59,6 @@ AcpiDmValidateFadtLength (
     UINT32                  Revision,
     UINT32                  Length);
 
-static void
-AcpiDmDumpBuffer (
-    void                    *Table,
-    UINT32                  BufferOffset,
-    UINT32                  Length,
-    UINT32                  AbsoluteOffset,
-    char                    *Header);
-
 
 /*******************************************************************************
  *
@@ -78,6 +70,7 @@ AcpiDmDumpBuffer (
  *              AbsoluteOffset      - Offset of buffer in the main ACPI table
  *              Header              - Name of the buffer field (printed on the
  *                                    first line only.)
+ *              MultiLine           - TRUE if a large, multi-line buffer
  *
  * RETURN:      None
  *
@@ -86,13 +79,14 @@ AcpiDmDumpBuffer (
  *
  ******************************************************************************/
 
-static void
+void
 AcpiDmDumpBuffer (
     void                    *Table,
     UINT32                  BufferOffset,
     UINT32                  Length,
     UINT32                  AbsoluteOffset,
-    char                    *Header)
+    char                    *Header,
+    BOOLEAN                 MultiLine)
 {
     UINT8                   *Buffer;
     UINT32                  i;
@@ -110,10 +104,19 @@ AcpiDmDumpBuffer (
     {
         if (!(i % 16))
         {
-            AcpiOsPrintf ("\n");
-            AcpiDmLineHeader (AbsoluteOffset,
-                ((Length - i) > 16) ? 16 : (Length - i), Header);
-            Header = NULL;
+            if (MultiLine)
+            {
+                /* Insert a backslash - line continuation character */
+
+                AcpiOsPrintf ("\\\n    ");
+            }
+            else
+            {
+                AcpiOsPrintf ("\n");
+                AcpiDmLineHeader (AbsoluteOffset,
+                    ((Length - i) > 16) ? 16 : (Length - i), Header);
+                Header = NULL;
+            }
         }
 
         AcpiOsPrintf ("%.02X ", *Buffer);
@@ -526,7 +529,7 @@ AcpiDmDumpAsf (
                 DataOffset++;
                 if (DataOffset > Table->Length)
                 {
-                    AcpiOsPrintf ("**** ACPI table terminates in the middle of a data structure!\n");
+                    AcpiOsPrintf ("**** ACPI table terminates in the middle of a data structure! (ASF! table)\n");
                     return;
                 }
             }
@@ -692,7 +695,7 @@ AcpiDmDumpCsrt (
             InfoLength = SubSubTable->Length - SubSubOffset;
 
             AcpiDmDumpBuffer (SubSubTable, SubSubOffset, InfoLength,
-                Offset + SubOffset + SubSubOffset, "ResourceInfo");
+                Offset + SubOffset + SubSubOffset, "ResourceInfo", FALSE);
             SubSubOffset += InfoLength;
 
             /* Point to next sub-subtable */
@@ -812,7 +815,7 @@ AcpiDmDumpDbg2 (
         if (SubTable->OemDataOffset)
         {
             AcpiDmDumpBuffer (SubTable, SubTable->OemDataOffset, SubTable->OemDataLength,
-                Offset + SubTable->OemDataOffset, "OEM Data");
+                Offset + SubTable->OemDataOffset, "OEM Data", FALSE);
         }
 
         /* Point to next subtable */
@@ -2535,67 +2538,8 @@ void
 AcpiDmDumpSlic (
     ACPI_TABLE_HEADER       *Table)
 {
-    ACPI_STATUS             Status;
-    UINT32                  Offset = sizeof (ACPI_TABLE_SLIC);
-    ACPI_SLIC_HEADER        *SubTable;
-    ACPI_DMTABLE_INFO       *InfoTable;
-
-
-    /* There is no main SLIC table, only subtables */
-
-    SubTable = ACPI_ADD_PTR (ACPI_SLIC_HEADER, Table, Offset);
-    while (Offset < Table->Length)
-    {
-        /* Common subtable header */
-
-        AcpiOsPrintf ("\n");
-        Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-                    SubTable->Length, AcpiDmTableInfoSlicHdr);
-        if (ACPI_FAILURE (Status))
-        {
-            return;
-        }
-
-        switch (SubTable->Type)
-        {
-        case ACPI_SLIC_TYPE_PUBLIC_KEY:
-
-            InfoTable = AcpiDmTableInfoSlic0;
-            break;
-
-        case ACPI_SLIC_TYPE_WINDOWS_MARKER:
-
-            InfoTable = AcpiDmTableInfoSlic1;
-            break;
-
-        default:
-
-            AcpiOsPrintf ("\n**** Unknown SLIC subtable type 0x%X\n", SubTable->Type);
-
-            /* Attempt to continue */
-
-            if (!SubTable->Length)
-            {
-                AcpiOsPrintf ("Invalid zero length subtable\n");
-                return;
-            }
-            goto NextSubTable;
-        }
-
-        AcpiOsPrintf ("\n");
-        Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-                    SubTable->Length, InfoTable);
-        if (ACPI_FAILURE (Status))
-        {
-            return;
-        }
-
-NextSubTable:
-        /* Point to next subtable */
-
-        Offset += SubTable->Length;
-        SubTable = ACPI_ADD_PTR (ACPI_SLIC_HEADER, SubTable, SubTable->Length);
-    }
+    AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
+                Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
 }
 
 

Modified: vendor-sys/acpica/dist/source/common/dmtbinfo.c
==============================================================================
--- vendor-sys/acpica/dist/source/common/dmtbinfo.c	Thu Apr  9 22:16:35 2015	(r281343)
+++ vendor-sys/acpica/dist/source/common/dmtbinfo.c	Thu Apr  9 23:08:47 2015	(r281344)
@@ -200,9 +200,7 @@
 #define ACPI_S3PTH_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_S3PT_HEADER,f)
 #define ACPI_S3PT0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_S3PT_RESUME,f)
 #define ACPI_S3PT1_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_S3PT_SUSPEND,f)
-#define ACPI_SLICH_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_SLIC_HEADER,f)
-#define ACPI_SLIC0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_SLIC_KEY,f)
-#define ACPI_SLIC1_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_SLIC_MARKER,f)
+#define ACPI_SLIC_OFFSET(f)             (UINT16) ACPI_OFFSET (ACPI_TABLE_SLIC,f)
 #define ACPI_SRATH_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_SUBTABLE_HEADER,f)
 #define ACPI_SRAT0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_SRAT_CPU_AFFINITY,f)
 #define ACPI_SRAT1_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_SRAT_MEM_AFFINITY,f)
@@ -2043,42 +2041,16 @@ ACPI_DMTABLE_INFO           AcpiDmTableI
 
 /*******************************************************************************
  *
- * SLIC - Software Licensing Description Table. There is no common table, just
- * the standard ACPI header and then subtables.
+ * SLIC - Software Licensing Description Table. This table contains the standard
+ * ACPI header followed by proprietary data structures
  *
  ******************************************************************************/
 
-/* Common Subtable header (one per Subtable) */
-
-ACPI_DMTABLE_INFO           AcpiDmTableInfoSlicHdr[] =
-{
-    {ACPI_DMT_SLIC,     ACPI_SLICH_OFFSET (Type),                   "Subtable Type", 0},
-    {ACPI_DMT_UINT32,   ACPI_SLICH_OFFSET (Length),                 "Length", DT_LENGTH},
-    ACPI_DMT_TERMINATOR
-};
-
-ACPI_DMTABLE_INFO           AcpiDmTableInfoSlic0[] =
-{
-    {ACPI_DMT_UINT8,    ACPI_SLIC0_OFFSET (KeyType),                "Key Type", 0},
-    {ACPI_DMT_UINT8,    ACPI_SLIC0_OFFSET (Version),                "Version", 0},
-    {ACPI_DMT_UINT16,   ACPI_SLIC0_OFFSET (Reserved),               "Reserved", 0},
-    {ACPI_DMT_UINT32,   ACPI_SLIC0_OFFSET (Algorithm),              "Algorithm", 0},
-    {ACPI_DMT_NAME4,    ACPI_SLIC0_OFFSET (Magic),                  "Magic", 0},
-    {ACPI_DMT_UINT32,   ACPI_SLIC0_OFFSET (BitLength),              "BitLength", 0},
-    {ACPI_DMT_UINT32,   ACPI_SLIC0_OFFSET (Exponent),               "Exponent", 0},
-    {ACPI_DMT_BUF128,   ACPI_SLIC0_OFFSET (Modulus[0]),             "Modulus", 0},
-    ACPI_DMT_TERMINATOR
-};
+/* Single subtable, a proprietary format, so treat it as a buffer */
 
-ACPI_DMTABLE_INFO           AcpiDmTableInfoSlic1[] =
+ACPI_DMTABLE_INFO           AcpiDmTableInfoSlic[] =
 {
-    {ACPI_DMT_UINT32,   ACPI_SLIC1_OFFSET (Version),                "Version", 0},
-    {ACPI_DMT_NAME6,    ACPI_SLIC1_OFFSET (OemId[0]),               "Oem ID", 0},
-    {ACPI_DMT_NAME8,    ACPI_SLIC1_OFFSET (OemTableId[0]),          "Oem Table ID", 0},
-    {ACPI_DMT_NAME8,    ACPI_SLIC1_OFFSET (WindowsFlag[0]),         "Windows Flag", 0},
-    {ACPI_DMT_UINT32,   ACPI_SLIC1_OFFSET (SlicVersion),            "SLIC Version", 0},
-    {ACPI_DMT_BUF16,    ACPI_SLIC1_OFFSET (Reserved[0]),            "Reserved", 0},
-    {ACPI_DMT_BUF128,   ACPI_SLIC1_OFFSET (Signature[0]),           "Signature", 0},
+    {ACPI_DMT_RAW_BUFFER, 0,                                        "Software Licensing Structure", 0},
     ACPI_DMT_TERMINATOR
 };
 
@@ -2091,7 +2063,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableI
 
 ACPI_DMTABLE_INFO           AcpiDmTableInfoSlit[] =
 {
-    {ACPI_DMT_UINT64,   ACPI_SLIT_OFFSET (LocalityCount),          "Localities", 0},
+    {ACPI_DMT_UINT64,   ACPI_SLIT_OFFSET (LocalityCount),           "Localities", 0},
     ACPI_DMT_TERMINATOR
 };
 

Modified: vendor-sys/acpica/dist/source/compiler/aslcodegen.c
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/aslcodegen.c	Thu Apr  9 22:16:35 2015	(r281343)
+++ vendor-sys/acpica/dist/source/compiler/aslcodegen.c	Thu Apr  9 23:08:47 2015	(r281344)
@@ -460,7 +460,7 @@ CgWriteTableHeader (
 
     /* Compiler version */
 
-    TableHeader.AslCompilerRevision = ASL_REVISION;
+    TableHeader.AslCompilerRevision = ACPI_CA_VERSION;
 
     /* Table length. Checksum zero for now, will rewrite later */
 

Modified: vendor-sys/acpica/dist/source/compiler/aslcompile.c
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/aslcompile.c	Thu Apr  9 22:16:35 2015	(r281343)
+++ vendor-sys/acpica/dist/source/compiler/aslcompile.c	Thu Apr  9 23:08:47 2015	(r281344)
@@ -195,8 +195,16 @@ CmDoCompile (
     Event = UtBeginEvent ("Constant folding via AML interpreter");
     DbgPrint (ASL_DEBUG_OUTPUT,
         "\nInterpreting compile-time constant expressions\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
-        OpcAmlConstantWalk, NULL, NULL);
+
+    if (Gbl_FoldConstants)
+    {
+        TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
+            OpcAmlConstantWalk, NULL, NULL);
+    }
+    else
+    {
+        DbgPrint (ASL_PARSE_OUTPUT, "    Optional folding disabled\n");
+    }
     UtEndEvent (Event);
 
     /* Update AML opcodes if necessary, after constant folding */

Modified: vendor-sys/acpica/dist/source/compiler/aslcompiler.h
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/aslcompiler.h	Thu Apr  9 22:16:35 2015	(r281343)
+++ vendor-sys/acpica/dist/source/compiler/aslcompiler.h	Thu Apr  9 23:08:47 2015	(r281344)
@@ -686,6 +686,10 @@ TrAllocateNode (
     UINT32                  ParseOpcode);
 

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

From owner-svn-src-vendor@FreeBSD.ORG  Thu Apr  9 23:09:48 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A6C80B5D;
 Thu,  9 Apr 2015 23:09:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 78D59BA8;
 Thu,  9 Apr 2015 23:09:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t39N9mgd087903;
 Thu, 9 Apr 2015 23:09:48 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t39N9msU087902;
 Thu, 9 Apr 2015 23:09:48 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201504092309.t39N9msU087902@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org
 using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 9 Apr 2015 23:09:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r281345 - vendor-sys/acpica/20150408
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Apr 2015 23:09:48 -0000

Author: jkim
Date: Thu Apr  9 23:09:47 2015
New Revision: 281345
URL: https://svnweb.freebsd.org/changeset/base/281345

Log:
  Tag ACPICA 20150408.

Added:
  vendor-sys/acpica/20150408/
     - copied from r281344, vendor-sys/acpica/dist/

From owner-svn-src-vendor@FreeBSD.ORG  Fri Apr 10 01:26:04 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EEA16664;
 Fri, 10 Apr 2015 01:26:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D6198B77;
 Fri, 10 Apr 2015 01:26:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3A1Q34U053949;
 Fri, 10 Apr 2015 01:26:03 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3A1Q3PJ053937;
 Fri, 10 Apr 2015 01:26:03 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201504100126.t3A1Q3PJ053937@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Fri, 10 Apr 2015 01:26:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r281348 - in vendor/ntp/dist: . adjtimed clockstuff html
 include include/isc kernel kernel/sys lib/isc lib/isc/unix libntp libparse
 ntpd ntpdate ntpdc ntpq ntpsnmpd parseutil ports/winn...
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2015 01:26:04 -0000

Author: cy
Date: Fri Apr 10 01:26:02 2015
New Revision: 281348
URL: https://svnweb.freebsd.org/changeset/base/281348

Log:
  Vendor import ntp 4.2.8p2
  
  Approved by:	delphij
  Security:	CVE-2015-1798, CVE-2015-1799
  Security:	VuXML ebd84c96-dd7e-11e4-854e-3c970e169bc2

Added:
  vendor/ntp/dist/ports/winnt/libntp/arc4wrap.c   (contents, props changed)
  vendor/ntp/dist/scripts/update-leap/
  vendor/ntp/dist/scripts/update-leap/Makefile.am   (contents, props changed)
  vendor/ntp/dist/scripts/update-leap/Makefile.in   (contents, props changed)
  vendor/ntp/dist/scripts/update-leap/invoke-update-leap.menu
  vendor/ntp/dist/scripts/update-leap/invoke-update-leap.texi
  vendor/ntp/dist/scripts/update-leap/update-leap
  vendor/ntp/dist/scripts/update-leap/update-leap-opts
  vendor/ntp/dist/scripts/update-leap/update-leap-opts.def
  vendor/ntp/dist/scripts/update-leap/update-leap.1update-leapman
  vendor/ntp/dist/scripts/update-leap/update-leap.1update-leapmdoc
  vendor/ntp/dist/scripts/update-leap/update-leap.html   (contents, props changed)
  vendor/ntp/dist/scripts/update-leap/update-leap.man.in   (contents, props changed)
  vendor/ntp/dist/scripts/update-leap/update-leap.mdoc.in   (contents, props changed)
  vendor/ntp/dist/scripts/update-leap/update-leap.texi
  vendor/ntp/dist/sntp/libevent/m4/acx_pthread.m4
  vendor/ntp/dist/sntp/m4/ax_c99_struct_init.m4
  vendor/ntp/dist/sntp/m4/openldap-thread-check.m4
  vendor/ntp/dist/sntp/m4/openldap.m4
Deleted:
  vendor/ntp/dist/sntp/libevent/README
  vendor/ntp/dist/sntp/libevent/m4/openldap-thread-check.m4
  vendor/ntp/dist/sntp/libevent/m4/openldap.m4
  vendor/ntp/dist/util/jitter.h
Modified:
  vendor/ntp/dist/ChangeLog
  vendor/ntp/dist/CommitLog
  vendor/ntp/dist/Makefile.in
  vendor/ntp/dist/NEWS
  vendor/ntp/dist/aclocal.m4
  vendor/ntp/dist/adjtimed/Makefile.in
  vendor/ntp/dist/clockstuff/Makefile.in
  vendor/ntp/dist/config.h.in
  vendor/ntp/dist/configure
  vendor/ntp/dist/configure.ac
  vendor/ntp/dist/html/build.html
  vendor/ntp/dist/html/miscopt.html
  vendor/ntp/dist/html/sntp.html
  vendor/ntp/dist/include/Makefile.in
  vendor/ntp/dist/include/binio.h
  vendor/ntp/dist/include/isc/Makefile.in
  vendor/ntp/dist/include/mbg_gps166.h
  vendor/ntp/dist/include/ntp.h
  vendor/ntp/dist/include/ntp_calendar.h
  vendor/ntp/dist/include/ntp_fp.h
  vendor/ntp/dist/include/ntp_md5.h
  vendor/ntp/dist/include/ntpd.h
  vendor/ntp/dist/include/parse.h
  vendor/ntp/dist/include/parse_conf.h
  vendor/ntp/dist/kernel/Makefile.in
  vendor/ntp/dist/kernel/sys/Makefile.in
  vendor/ntp/dist/kernel/sys/parsestreams.h
  vendor/ntp/dist/lib/isc/inet_ntop.c
  vendor/ntp/dist/lib/isc/log.c
  vendor/ntp/dist/lib/isc/result.c
  vendor/ntp/dist/lib/isc/unix/file.c
  vendor/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c
  vendor/ntp/dist/lib/isc/unix/ifiter_ioctl.c
  vendor/ntp/dist/lib/isc/unix/net.c
  vendor/ntp/dist/libntp/Makefile.in
  vendor/ntp/dist/libntp/ntp_calendar.c
  vendor/ntp/dist/libntp/work_fork.c
  vendor/ntp/dist/libparse/Makefile.in
  vendor/ntp/dist/libparse/clk_computime.c
  vendor/ntp/dist/libparse/clk_dcf7000.c
  vendor/ntp/dist/libparse/clk_hopf6021.c
  vendor/ntp/dist/libparse/clk_meinberg.c
  vendor/ntp/dist/libparse/clk_rawdcf.c
  vendor/ntp/dist/libparse/clk_rcc8000.c
  vendor/ntp/dist/libparse/clk_schmid.c
  vendor/ntp/dist/libparse/clk_sel240x.c
  vendor/ntp/dist/libparse/clk_trimtaip.c
  vendor/ntp/dist/libparse/clk_trimtsip.c
  vendor/ntp/dist/libparse/clk_varitext.c
  vendor/ntp/dist/libparse/clk_wharton.c
  vendor/ntp/dist/libparse/data_mbg.c
  vendor/ntp/dist/libparse/gpstolfp.c
  vendor/ntp/dist/libparse/parse.c
  vendor/ntp/dist/libparse/parse_conf.c
  vendor/ntp/dist/libparse/parsesolaris.c
  vendor/ntp/dist/libparse/parsestreams.c
  vendor/ntp/dist/libparse/trim_info.c
  vendor/ntp/dist/ntpd/Makefile.in
  vendor/ntp/dist/ntpd/cmd_args.c
  vendor/ntp/dist/ntpd/invoke-ntp.conf.texi
  vendor/ntp/dist/ntpd/invoke-ntp.keys.texi
  vendor/ntp/dist/ntpd/invoke-ntpd.texi
  vendor/ntp/dist/ntpd/keyword-gen-utd
  vendor/ntp/dist/ntpd/keyword-gen.c
  vendor/ntp/dist/ntpd/ntp.conf.5man
  vendor/ntp/dist/ntpd/ntp.conf.5mdoc
  vendor/ntp/dist/ntpd/ntp.conf.def
  vendor/ntp/dist/ntpd/ntp.conf.html
  vendor/ntp/dist/ntpd/ntp.conf.man.in
  vendor/ntp/dist/ntpd/ntp.conf.mdoc.in
  vendor/ntp/dist/ntpd/ntp.keys.5man
  vendor/ntp/dist/ntpd/ntp.keys.5mdoc
  vendor/ntp/dist/ntpd/ntp.keys.html
  vendor/ntp/dist/ntpd/ntp.keys.man.in
  vendor/ntp/dist/ntpd/ntp.keys.mdoc.in
  vendor/ntp/dist/ntpd/ntp_config.c
  vendor/ntp/dist/ntpd/ntp_control.c
  vendor/ntp/dist/ntpd/ntp_crypto.c
  vendor/ntp/dist/ntpd/ntp_keyword.h
  vendor/ntp/dist/ntpd/ntp_leapsec.c
  vendor/ntp/dist/ntpd/ntp_loopfilter.c
  vendor/ntp/dist/ntpd/ntp_parser.c
  vendor/ntp/dist/ntpd/ntp_parser.h
  vendor/ntp/dist/ntpd/ntp_parser.y
  vendor/ntp/dist/ntpd/ntp_peer.c
  vendor/ntp/dist/ntpd/ntp_proto.c
  vendor/ntp/dist/ntpd/ntpd-opts.c
  vendor/ntp/dist/ntpd/ntpd-opts.h
  vendor/ntp/dist/ntpd/ntpd.1ntpdman
  vendor/ntp/dist/ntpd/ntpd.1ntpdmdoc
  vendor/ntp/dist/ntpd/ntpd.c
  vendor/ntp/dist/ntpd/ntpd.html
  vendor/ntp/dist/ntpd/ntpd.man.in
  vendor/ntp/dist/ntpd/ntpd.mdoc.in
  vendor/ntp/dist/ntpd/ntpdbase-opts.def
  vendor/ntp/dist/ntpd/refclock_palisade.c
  vendor/ntp/dist/ntpd/refclock_palisade.h
  vendor/ntp/dist/ntpd/refclock_parse.c
  vendor/ntp/dist/ntpdate/Makefile.in
  vendor/ntp/dist/ntpdc/Makefile.in
  vendor/ntp/dist/ntpdc/invoke-ntpdc.texi
  vendor/ntp/dist/ntpdc/ntpdc-opts.c
  vendor/ntp/dist/ntpdc/ntpdc-opts.h
  vendor/ntp/dist/ntpdc/ntpdc.1ntpdcman
  vendor/ntp/dist/ntpdc/ntpdc.1ntpdcmdoc
  vendor/ntp/dist/ntpdc/ntpdc.html
  vendor/ntp/dist/ntpdc/ntpdc.man.in
  vendor/ntp/dist/ntpdc/ntpdc.mdoc.in
  vendor/ntp/dist/ntpq/Makefile.in
  vendor/ntp/dist/ntpq/invoke-ntpq.texi
  vendor/ntp/dist/ntpq/ntpq-opts.c
  vendor/ntp/dist/ntpq/ntpq-opts.h
  vendor/ntp/dist/ntpq/ntpq-subs.c
  vendor/ntp/dist/ntpq/ntpq.1ntpqman
  vendor/ntp/dist/ntpq/ntpq.1ntpqmdoc
  vendor/ntp/dist/ntpq/ntpq.html
  vendor/ntp/dist/ntpq/ntpq.man.in
  vendor/ntp/dist/ntpq/ntpq.mdoc.in
  vendor/ntp/dist/ntpsnmpd/Makefile.in
  vendor/ntp/dist/ntpsnmpd/invoke-ntpsnmpd.texi
  vendor/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c
  vendor/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h
  vendor/ntp/dist/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
  vendor/ntp/dist/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
  vendor/ntp/dist/ntpsnmpd/ntpsnmpd.html
  vendor/ntp/dist/ntpsnmpd/ntpsnmpd.man.in
  vendor/ntp/dist/ntpsnmpd/ntpsnmpd.mdoc.in
  vendor/ntp/dist/packageinfo.sh
  vendor/ntp/dist/parseutil/Makefile.in
  vendor/ntp/dist/parseutil/dcfd.c
  vendor/ntp/dist/parseutil/testdcf.c
  vendor/ntp/dist/ports/winnt/include/config.h
  vendor/ntp/dist/ports/winnt/include/termios.h
  vendor/ntp/dist/ports/winnt/libntp/getclock.c
  vendor/ntp/dist/ports/winnt/libntp/termios.c
  vendor/ntp/dist/ports/winnt/ntpd/nt_clockstuff.c
  vendor/ntp/dist/ports/winnt/vs2005/libntp.vcproj
  vendor/ntp/dist/ports/winnt/vs2008/libntp/libntp.vcproj
  vendor/ntp/dist/ports/winnt/vs2013/libntp/libntp.vcxproj
  vendor/ntp/dist/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
  vendor/ntp/dist/scripts/Makefile.am
  vendor/ntp/dist/scripts/Makefile.in
  vendor/ntp/dist/scripts/build/Makefile.in
  vendor/ntp/dist/scripts/calc_tickadj/Makefile.in
  vendor/ntp/dist/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
  vendor/ntp/dist/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
  vendor/ntp/dist/scripts/calc_tickadj/calc_tickadj.html
  vendor/ntp/dist/scripts/calc_tickadj/calc_tickadj.man.in
  vendor/ntp/dist/scripts/calc_tickadj/calc_tickadj.mdoc.in
  vendor/ntp/dist/scripts/calc_tickadj/invoke-calc_tickadj.texi
  vendor/ntp/dist/scripts/invoke-plot_summary.texi
  vendor/ntp/dist/scripts/invoke-summary.texi
  vendor/ntp/dist/scripts/lib/Makefile.in
  vendor/ntp/dist/scripts/lib/NTP/Util.pm
  vendor/ntp/dist/scripts/ntp-wait/Makefile.in
  vendor/ntp/dist/scripts/ntp-wait/invoke-ntp-wait.texi
  vendor/ntp/dist/scripts/ntp-wait/ntp-wait-opts
  vendor/ntp/dist/scripts/ntp-wait/ntp-wait.1ntp-waitman
  vendor/ntp/dist/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
  vendor/ntp/dist/scripts/ntp-wait/ntp-wait.html
  vendor/ntp/dist/scripts/ntp-wait/ntp-wait.man.in
  vendor/ntp/dist/scripts/ntp-wait/ntp-wait.mdoc.in
  vendor/ntp/dist/scripts/ntpsweep/Makefile.in
  vendor/ntp/dist/scripts/ntpsweep/invoke-ntpsweep.texi
  vendor/ntp/dist/scripts/ntpsweep/ntpsweep-opts
  vendor/ntp/dist/scripts/ntpsweep/ntpsweep.1ntpsweepman
  vendor/ntp/dist/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
  vendor/ntp/dist/scripts/ntpsweep/ntpsweep.html
  vendor/ntp/dist/scripts/ntpsweep/ntpsweep.man.in
  vendor/ntp/dist/scripts/ntpsweep/ntpsweep.mdoc.in
  vendor/ntp/dist/scripts/ntptrace/Makefile.in
  vendor/ntp/dist/scripts/ntptrace/invoke-ntptrace.texi
  vendor/ntp/dist/scripts/ntptrace/ntptrace-opts
  vendor/ntp/dist/scripts/ntptrace/ntptrace.1ntptraceman
  vendor/ntp/dist/scripts/ntptrace/ntptrace.1ntptracemdoc
  vendor/ntp/dist/scripts/ntptrace/ntptrace.html
  vendor/ntp/dist/scripts/ntptrace/ntptrace.man.in
  vendor/ntp/dist/scripts/ntptrace/ntptrace.mdoc.in
  vendor/ntp/dist/scripts/plot_summary-opts
  vendor/ntp/dist/scripts/plot_summary.1plot_summaryman
  vendor/ntp/dist/scripts/plot_summary.1plot_summarymdoc
  vendor/ntp/dist/scripts/plot_summary.html
  vendor/ntp/dist/scripts/plot_summary.man.in
  vendor/ntp/dist/scripts/plot_summary.mdoc.in
  vendor/ntp/dist/scripts/summary-opts
  vendor/ntp/dist/scripts/summary.1summaryman
  vendor/ntp/dist/scripts/summary.1summarymdoc
  vendor/ntp/dist/scripts/summary.html
  vendor/ntp/dist/scripts/summary.man.in
  vendor/ntp/dist/scripts/summary.mdoc.in
  vendor/ntp/dist/sntp/Makefile.in
  vendor/ntp/dist/sntp/aclocal.m4
  vendor/ntp/dist/sntp/configure
  vendor/ntp/dist/sntp/include/Makefile.in
  vendor/ntp/dist/sntp/include/version.def
  vendor/ntp/dist/sntp/include/version.texi
  vendor/ntp/dist/sntp/invoke-sntp.texi
  vendor/ntp/dist/sntp/libevent/ChangeLog
  vendor/ntp/dist/sntp/libevent/Makefile.am
  vendor/ntp/dist/sntp/libevent/Makefile.in
  vendor/ntp/dist/sntp/libevent/WIN32-Code/nmake/event2/event-config.h
  vendor/ntp/dist/sntp/libevent/WIN32-Code/tree.h
  vendor/ntp/dist/sntp/libevent/aclocal.m4
  vendor/ntp/dist/sntp/libevent/buffer.c
  vendor/ntp/dist/sntp/libevent/bufferevent.c
  vendor/ntp/dist/sntp/libevent/bufferevent_async.c
  vendor/ntp/dist/sntp/libevent/bufferevent_filter.c
  vendor/ntp/dist/sntp/libevent/bufferevent_openssl.c
  vendor/ntp/dist/sntp/libevent/bufferevent_pair.c
  vendor/ntp/dist/sntp/libevent/config.h.in
  vendor/ntp/dist/sntp/libevent/configure
  vendor/ntp/dist/sntp/libevent/configure.ac
  vendor/ntp/dist/sntp/libevent/evbuffer-internal.h
  vendor/ntp/dist/sntp/libevent/evdns.c
  vendor/ntp/dist/sntp/libevent/event.c
  vendor/ntp/dist/sntp/libevent/event_tagging.c
  vendor/ntp/dist/sntp/libevent/evrpc-internal.h
  vendor/ntp/dist/sntp/libevent/evthread-internal.h
  vendor/ntp/dist/sntp/libevent/evthread.c
  vendor/ntp/dist/sntp/libevent/evutil.c
  vendor/ntp/dist/sntp/libevent/evutil_time.c
  vendor/ntp/dist/sntp/libevent/ht-internal.h
  vendor/ntp/dist/sntp/libevent/http-internal.h
  vendor/ntp/dist/sntp/libevent/http.c
  vendor/ntp/dist/sntp/libevent/include/event2/buffer.h
  vendor/ntp/dist/sntp/libevent/include/event2/bufferevent.h
  vendor/ntp/dist/sntp/libevent/include/event2/dns.h
  vendor/ntp/dist/sntp/libevent/include/event2/event.h
  vendor/ntp/dist/sntp/libevent/include/event2/http.h
  vendor/ntp/dist/sntp/libevent/include/event2/listener.h
  vendor/ntp/dist/sntp/libevent/include/event2/util.h
  vendor/ntp/dist/sntp/libevent/kqueue.c
  vendor/ntp/dist/sntp/libevent/listener.c
  vendor/ntp/dist/sntp/libevent/sample/http-server.c
  vendor/ntp/dist/sntp/libevent/sample/https-client.c
  vendor/ntp/dist/sntp/libevent/sample/include.am
  vendor/ntp/dist/sntp/libevent/test/include.am
  vendor/ntp/dist/sntp/libevent/test/regress.c
  vendor/ntp/dist/sntp/libevent/test/regress.h
  vendor/ntp/dist/sntp/libevent/test/regress_buffer.c
  vendor/ntp/dist/sntp/libevent/test/regress_bufferevent.c
  vendor/ntp/dist/sntp/libevent/test/regress_dns.c
  vendor/ntp/dist/sntp/libevent/test/regress_finalize.c
  vendor/ntp/dist/sntp/libevent/test/regress_http.c
  vendor/ntp/dist/sntp/libevent/test/regress_main.c
  vendor/ntp/dist/sntp/libevent/test/regress_minheap.c
  vendor/ntp/dist/sntp/libevent/test/regress_ssl.c
  vendor/ntp/dist/sntp/libevent/test/regress_thread.c
  vendor/ntp/dist/sntp/libevent/test/regress_util.c
  vendor/ntp/dist/sntp/libevent/test/regress_zlib.c
  vendor/ntp/dist/sntp/libevent/test/test-fdleak.c
  vendor/ntp/dist/sntp/libevent/test/test-ratelim.c
  vendor/ntp/dist/sntp/libevent/test/test-time.c
  vendor/ntp/dist/sntp/libevent/test/tinytest.c
  vendor/ntp/dist/sntp/libevent/test/tinytest.h
  vendor/ntp/dist/sntp/libevent/test/tinytest_macros.h
  vendor/ntp/dist/sntp/libevent/time-internal.h
  vendor/ntp/dist/sntp/libevent/util-internal.h
  vendor/ntp/dist/sntp/libevent/whatsnew-2.1.txt
  vendor/ntp/dist/sntp/libopts/Makefile.in
  vendor/ntp/dist/sntp/libopts/m4/libopts.m4
  vendor/ntp/dist/sntp/loc/darwin
  vendor/ntp/dist/sntp/loc/debian
  vendor/ntp/dist/sntp/loc/freebsd
  vendor/ntp/dist/sntp/loc/legacy
  vendor/ntp/dist/sntp/loc/netbsd
  vendor/ntp/dist/sntp/loc/solaris
  vendor/ntp/dist/sntp/m4/ntp_libntp.m4
  vendor/ntp/dist/sntp/m4/ntp_locinfo.m4
  vendor/ntp/dist/sntp/m4/version.m4
  vendor/ntp/dist/sntp/main.c
  vendor/ntp/dist/sntp/scripts/Makefile.in
  vendor/ntp/dist/sntp/sntp-opts.c
  vendor/ntp/dist/sntp/sntp-opts.def
  vendor/ntp/dist/sntp/sntp-opts.h
  vendor/ntp/dist/sntp/sntp.1sntpman
  vendor/ntp/dist/sntp/sntp.1sntpmdoc
  vendor/ntp/dist/sntp/sntp.html
  vendor/ntp/dist/sntp/sntp.man.in
  vendor/ntp/dist/sntp/sntp.mdoc.in
  vendor/ntp/dist/sntp/tests/Makefile.in
  vendor/ntp/dist/tests/Makefile.in
  vendor/ntp/dist/tests/libntp/Makefile.in
  vendor/ntp/dist/tests/ntpd/Makefile.in
  vendor/ntp/dist/util/Makefile.am
  vendor/ntp/dist/util/Makefile.in
  vendor/ntp/dist/util/invoke-ntp-keygen.texi
  vendor/ntp/dist/util/jitter.c
  vendor/ntp/dist/util/ntp-keygen-opts.c
  vendor/ntp/dist/util/ntp-keygen-opts.h
  vendor/ntp/dist/util/ntp-keygen.1ntp-keygenman
  vendor/ntp/dist/util/ntp-keygen.1ntp-keygenmdoc
  vendor/ntp/dist/util/ntp-keygen.c
  vendor/ntp/dist/util/ntp-keygen.html
  vendor/ntp/dist/util/ntp-keygen.man.in
  vendor/ntp/dist/util/ntp-keygen.mdoc.in

Modified: vendor/ntp/dist/ChangeLog
==============================================================================
--- vendor/ntp/dist/ChangeLog	Fri Apr 10 00:44:43 2015	(r281347)
+++ vendor/ntp/dist/ChangeLog	Fri Apr 10 01:26:02 2015	(r281348)
@@ -1,4 +1,80 @@
 ---
+(4.2.8p2) 2015/04/07 Released by Harlan Stenn <stenn@ntp.org>
+(4.2.8p2-RC3) 2015/04/03 Released by Harlan Stenn <stenn@ntp.org>
+
+* [Bug 2763] Fix for different thresholds for forward and backward steps.
+---
+(4.2.8p2-RC2) 2015/04/03 Released by Harlan Stenn <stenn@ntp.org>
+
+* [Bug 2592] FLAG_TSTAMP_PPS cleanup for refclock_parse.c.
+* [Bug 2769] New script: update-leap
+* [Bug 2769] cleannup for update-leap
+* [Bug 2788] New flag -G (force_step_once).
+* [Bug 2794] Clean up kernel clock status reports.
+* [Bug 2795] Cannot build without OpenSLL (on Win32).
+  Provided a Win32 specific wrapper around libevent/arc4random.c.
+  fixed some minor warnings.
+* [Bug 2796] ntp-keygen crashes in 'getclock()' on Win32.
+* [Bug 2797] ntp-keygen trapped in endless loop for MD5 keys
+  on big-endian machines.
+* [Bug 2798] sntp should decode and display the leap indicator.
+* Simple cleanup to html/build.html
+---
+(4.2.8p2-RC1) 2015/03/30 Released by Harlan Stenn <stenn@ntp.org>
+
+* [Bug 2794] Don't let reports on normal kernel status changes
+  look like errors.
+* [Bug 2788] New flag -G (force_step_once).
+* [Bug 2592] Account for PPS sources which can provide an accurate
+  absolute time stamp, and status information.
+  Fixed indention and removed trailing whitespace.
+* [Bug 1787] DCF77's formerly "antenna" bit is "call bit" since 2003.
+* [Bug 1960] setsockopt IPV6_MULTICAST_IF: Invalid argument.
+* [Bug 2346] "graceful termination" signals do not do peer cleanup.
+* [Bug 2728] See if C99-style structure initialization works.
+* [Bug 2747] Upgrade libevent to 2.1.5-beta.
+* [Bug 2749] ntp/lib/NTP/Util.pm needs update for ntpq -w, IPv6, .POOL. .
+* [Bug 2751] jitter.h has stale copies of l_fp macros.
+* [Bug 2756] ntpd hangs in startup with gcc 3.3.5 on ARM.
+* [Bug 2757] Quiet compiler warnings.
+* [Bug 2759] Expose nonvolatile/clk_wander_threshold to ntpq.
+* [Bug 2763] Allow different thresholds for forward and backward steps.
+* [Bug 2766] ntp-keygen output files should not be world-readable.
+* [Bug 2767] ntp-keygen -M should symlink to ntp.keys.
+* [Bug 2771] nonvolatile value is documented in wrong units.
+* [Bug 2773] Early leap announcement from Palisade/Thunderbolt
+* [Bug 2774] Unreasonably verbose printout - leap pending/warning
+* [Bug 2775] ntp-keygen.c fails to compile under Windows.
+* [Bug 2777] Fixed loops and decoding of Meinberg GPS satellite info.
+  Removed non-ASCII characters from some copyright comments.
+  Removed trailing whitespace.
+  Updated definitions for Meinberg clocks from current Meinberg header files.
+  Now use C99 fixed-width types and avoid non-ASCII characters in comments.
+  Account for updated definitions pulled from Meinberg header files.
+  Updated comments on Meinberg GPS receivers which are not only called GPS16x.
+  Replaced some constant numbers by defines from ntp_calendar.h
+  Modified creation of parse-specific variables for Meinberg devices
+  in gps16x_message().
+  Reworked mk_utcinfo() to avoid printing of ambiguous leap second dates.
+  Modified mbg_tm_str() which now expexts an additional parameter controlling
+  if the time status shall be printed.
+* [Sec 2779] ntpd accepts unauthenticated packets with symmetric key crypto.
+* [Sec 2781] Authentication doesn't protect symmetric associations against
+  DoS attacks.
+* [Bug 2783] Quiet autoconf warnings about missing AC_LANG_SOURCE.
+* [Bug 2789] Quiet compiler warnings from libevent.
+* [Bug 2790] If ntpd sets the Windows MM timer highest resolution
+  pause briefly before measuring system clock precision to yield
+  correct results.
+* Comment from Juergen Perlinger in ntp_calendar.c to make the code clearer.
+* Use predefined function types for parse driver functions
+  used to set up function pointers.
+  Account for changed prototype of parse_inp_fnc_t functions.
+  Cast parse conversion results to appropriate types to avoid
+  compiler warnings.
+  Let ioctl() for Windows accept a (void *) to avoid compiler warnings
+  when called with pointers to different types.
+---
 (4.2.8p1) 2015/02/04 Released by Harlan Stenn <stenn@ntp.org>
 
 * Update the NEWS file.
@@ -14,7 +90,7 @@
   (This should work for all versions of Windows >= W2K)
 * [Bug 2738] Missing buffer initialization in refclocK_parse.c::parsestate().
 * [Bug 2739] Parse driver with PPS enabled occasionally evaluates
-  PPS timestamp with wrong sign. 
+  PPS timestamp with wrong sign.
   Removed some German umlauts.
 * [Bug 2740] Removed some obsolete code from the parse driver.
 * [Bug 2741] Incorrect buffer check in refclocK_parse.c::parsestatus().
@@ -94,7 +170,7 @@
 * [Bug 2678] nmea_control() now checks 'refclock_params()' result.
 (4.2.7p481) 2014/11/22 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2314] Only enable PPS if kernel consumer binding succeeds.
-* [Bug 2314] Kernel PPS binding EOPNOTSUPP is a failure condition. 
+* [Bug 2314] Kernel PPS binding EOPNOTSUPP is a failure condition.
 * Rename pps_enable to hardpps_enable.
 (4.2.7p480) 2014/11/21 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2677] PATH_MAX isn't #define'd under Windows.

Modified: vendor/ntp/dist/CommitLog
==============================================================================
--- vendor/ntp/dist/CommitLog	Fri Apr 10 00:44:43 2015	(r281347)
+++ vendor/ntp/dist/CommitLog	Fri Apr 10 01:26:02 2015	(r281348)
@@ -1,3 +1,2569 @@
+ChangeSet@1.3320, 2015-04-07 04:28:16-04:00, stenn@deacon.udel.edu
+  NTP_4_2_8P2
+  TAG: NTP_4_2_8P2
+
+  ChangeLog@1.1633 +1 -0
+    NTP_4_2_8P2
+
+  ntpd/invoke-ntp.conf.texi@1.182 +1 -1
+    NTP_4_2_8P2
+
+  ntpd/invoke-ntp.keys.texi@1.178 +1 -1
+    NTP_4_2_8P2
+
+  ntpd/invoke-ntpd.texi@1.495 +2 -2
+    NTP_4_2_8P2
+
+  ntpd/ntp.conf.5man@1.216 +3 -3
+    NTP_4_2_8P2
+
+  ntpd/ntp.conf.5mdoc@1.216 +2 -2
+    NTP_4_2_8P2
+
+  ntpd/ntp.conf.html@1.173 +1 -1
+    NTP_4_2_8P2
+
+  ntpd/ntp.conf.man.in@1.216 +3 -3
+    NTP_4_2_8P2
+
+  ntpd/ntp.conf.mdoc.in@1.216 +2 -2
+    NTP_4_2_8P2
+
+  ntpd/ntp.keys.5man@1.212 +2 -2
+    NTP_4_2_8P2
+
+  ntpd/ntp.keys.5mdoc@1.212 +2 -2
+    NTP_4_2_8P2
+
+  ntpd/ntp.keys.html@1.174 +1 -1
+    NTP_4_2_8P2
+
+  ntpd/ntp.keys.man.in@1.212 +2 -2
+    NTP_4_2_8P2
+
+  ntpd/ntp.keys.mdoc.in@1.212 +2 -2
+    NTP_4_2_8P2
+
+  ntpd/ntpd-opts.c@1.517 +245 -245
+    NTP_4_2_8P2
+
+  ntpd/ntpd-opts.h@1.516 +3 -3
+    NTP_4_2_8P2
+
+  ntpd/ntpd.1ntpdman@1.324 +3 -3
+    NTP_4_2_8P2
+
+  ntpd/ntpd.1ntpdmdoc@1.324 +2 -2
+    NTP_4_2_8P2
+
+  ntpd/ntpd.html@1.168 +2 -2
+    NTP_4_2_8P2
+
+  ntpd/ntpd.man.in@1.324 +3 -3
+    NTP_4_2_8P2
+
+  ntpd/ntpd.mdoc.in@1.324 +2 -2
+    NTP_4_2_8P2
+
+  ntpdc/invoke-ntpdc.texi@1.492 +2 -2
+    NTP_4_2_8P2
+
+  ntpdc/ntpdc-opts.c@1.510 +107 -107
+    NTP_4_2_8P2
+
+  ntpdc/ntpdc-opts.h@1.509 +3 -3
+    NTP_4_2_8P2
+
+  ntpdc/ntpdc.1ntpdcman@1.323 +3 -3
+    NTP_4_2_8P2
+
+  ntpdc/ntpdc.1ntpdcmdoc@1.323 +2 -2
+    NTP_4_2_8P2
+
+  ntpdc/ntpdc.html@1.336 +2 -2
+    NTP_4_2_8P2
+
+  ntpdc/ntpdc.man.in@1.323 +3 -3
+    NTP_4_2_8P2
+
+  ntpdc/ntpdc.mdoc.in@1.323 +2 -2
+    NTP_4_2_8P2
+
+  ntpq/invoke-ntpq.texi@1.498 +2 -2
+    NTP_4_2_8P2
+
+  ntpq/ntpq-opts.c@1.515 +106 -106
+    NTP_4_2_8P2
+
+  ntpq/ntpq-opts.h@1.513 +3 -3
+    NTP_4_2_8P2
+
+  ntpq/ntpq.1ntpqman@1.326 +3 -3
+    NTP_4_2_8P2
+
+  ntpq/ntpq.1ntpqmdoc@1.326 +2 -2
+    NTP_4_2_8P2
+
+  ntpq/ntpq.html@1.165 +2 -2
+    NTP_4_2_8P2
+
+  ntpq/ntpq.man.in@1.326 +3 -3
+    NTP_4_2_8P2
+
+  ntpq/ntpq.mdoc.in@1.326 +2 -2
+    NTP_4_2_8P2
+
+  ntpsnmpd/invoke-ntpsnmpd.texi@1.494 +2 -2
+    NTP_4_2_8P2
+
+  ntpsnmpd/ntpsnmpd-opts.c@1.512 +68 -68
+    NTP_4_2_8P2
+
+  ntpsnmpd/ntpsnmpd-opts.h@1.511 +3 -3
+    NTP_4_2_8P2
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.323 +3 -3
+    NTP_4_2_8P2
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.323 +2 -2
+    NTP_4_2_8P2
+
+  ntpsnmpd/ntpsnmpd.html@1.163 +1 -1
+    NTP_4_2_8P2
+
+  ntpsnmpd/ntpsnmpd.man.in@1.323 +3 -3
+    NTP_4_2_8P2
+
+  ntpsnmpd/ntpsnmpd.mdoc.in@1.323 +2 -2
+    NTP_4_2_8P2
+
+  packageinfo.sh@1.509 +2 -2
+    NTP_4_2_8P2
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.84 +3 -3
+    NTP_4_2_8P2
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.85 +2 -2
+    NTP_4_2_8P2
+
+  scripts/calc_tickadj/calc_tickadj.html@1.86 +1 -1
+    NTP_4_2_8P2
+
+  scripts/calc_tickadj/calc_tickadj.man.in@1.83 +3 -3
+    NTP_4_2_8P2
+
+  scripts/calc_tickadj/calc_tickadj.mdoc.in@1.85 +2 -2
+    NTP_4_2_8P2
+
+  scripts/calc_tickadj/invoke-calc_tickadj.texi@1.88 +1 -1
+    NTP_4_2_8P2
+
+  scripts/invoke-plot_summary.texi@1.105 +2 -2
+    NTP_4_2_8P2
+
+  scripts/invoke-summary.texi@1.105 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntp-wait/invoke-ntp-wait.texi@1.315 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntp-wait/ntp-wait-opts@1.51 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitman@1.312 +3 -3
+    NTP_4_2_8P2
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.313 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntp-wait/ntp-wait.html@1.332 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntp-wait/ntp-wait.man.in@1.312 +3 -3
+    NTP_4_2_8P2
+
+  scripts/ntp-wait/ntp-wait.mdoc.in@1.313 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntpsweep/invoke-ntpsweep.texi@1.103 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntpsweep/ntpsweep-opts@1.53 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepman@1.91 +3 -3
+    NTP_4_2_8P2
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.91 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntpsweep/ntpsweep.html@1.104 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntpsweep/ntpsweep.man.in@1.91 +3 -3
+    NTP_4_2_8P2
+
+  scripts/ntpsweep/ntpsweep.mdoc.in@1.92 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntptrace/invoke-ntptrace.texi@1.104 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntptrace/ntptrace-opts@1.53 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntptrace/ntptrace.1ntptraceman@1.91 +3 -3
+    NTP_4_2_8P2
+
+  scripts/ntptrace/ntptrace.1ntptracemdoc@1.92 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntptrace/ntptrace.html@1.105 +2 -2
+    NTP_4_2_8P2
+
+  scripts/ntptrace/ntptrace.man.in@1.91 +3 -3
+    NTP_4_2_8P2
+
+  scripts/ntptrace/ntptrace.mdoc.in@1.93 +2 -2
+    NTP_4_2_8P2
+
+  scripts/plot_summary-opts@1.53 +2 -2
+    NTP_4_2_8P2
+
+  scripts/plot_summary.1plot_summaryman@1.103 +3 -3
+    NTP_4_2_8P2
+
+  scripts/plot_summary.1plot_summarymdoc@1.103 +2 -2
+    NTP_4_2_8P2
+
+  scripts/plot_summary.html@1.106 +2 -2
+    NTP_4_2_8P2
+
+  scripts/plot_summary.man.in@1.103 +3 -3
+    NTP_4_2_8P2
+
+  scripts/plot_summary.mdoc.in@1.103 +2 -2
+    NTP_4_2_8P2
+
+  scripts/summary-opts@1.53 +2 -2
+    NTP_4_2_8P2
+
+  scripts/summary.1summaryman@1.103 +3 -3
+    NTP_4_2_8P2
+
+  scripts/summary.1summarymdoc@1.103 +2 -2
+    NTP_4_2_8P2
+
+  scripts/summary.html@1.106 +2 -2
+    NTP_4_2_8P2
+
+  scripts/summary.man.in@1.103 +3 -3
+    NTP_4_2_8P2
+
+  scripts/summary.mdoc.in@1.103 +2 -2
+    NTP_4_2_8P2
+
+  scripts/update-leap/invoke-update-leap.texi@1.4 +1 -1
+    NTP_4_2_8P2
+
+  scripts/update-leap/update-leap-opts@1.4 +2 -2
+    NTP_4_2_8P2
+
+  scripts/update-leap/update-leap.1update-leapman@1.4 +3 -3
+    NTP_4_2_8P2
+
+  scripts/update-leap/update-leap.1update-leapmdoc@1.4 +2 -2
+    NTP_4_2_8P2
+
+  scripts/update-leap/update-leap.html@1.4 +1 -1
+    NTP_4_2_8P2
+
+  scripts/update-leap/update-leap.man.in@1.4 +3 -3
+    NTP_4_2_8P2
+
+  scripts/update-leap/update-leap.mdoc.in@1.4 +2 -2
+    NTP_4_2_8P2
+
+  sntp/invoke-sntp.texi@1.492 +2 -2
+    NTP_4_2_8P2
+
+  sntp/sntp-opts.c@1.511 +159 -159
+    NTP_4_2_8P2
+
+  sntp/sntp-opts.h@1.509 +3 -3
+    NTP_4_2_8P2
+
+  sntp/sntp.1sntpman@1.327 +3 -3
+    NTP_4_2_8P2
+
+  sntp/sntp.1sntpmdoc@1.327 +2 -2
+    NTP_4_2_8P2
+
+  sntp/sntp.html@1.507 +2 -2
+    NTP_4_2_8P2
+
+  sntp/sntp.man.in@1.327 +3 -3
+    NTP_4_2_8P2
+
+  sntp/sntp.mdoc.in@1.327 +2 -2
+    NTP_4_2_8P2
+
+  util/invoke-ntp-keygen.texi@1.495 +2 -2
+    NTP_4_2_8P2
+
+  util/ntp-keygen-opts.c@1.513 +173 -173
+    NTP_4_2_8P2
+
+  util/ntp-keygen-opts.h@1.511 +3 -3
+    NTP_4_2_8P2
+
+  util/ntp-keygen.1ntp-keygenman@1.323 +3 -3
+    NTP_4_2_8P2
+
+  util/ntp-keygen.1ntp-keygenmdoc@1.323 +2 -2
+    NTP_4_2_8P2
+
+  util/ntp-keygen.html@1.169 +2 -2
+    NTP_4_2_8P2
+
+  util/ntp-keygen.man.in@1.323 +3 -3
+    NTP_4_2_8P2
+
+  util/ntp-keygen.mdoc.in@1.323 +2 -2
+    NTP_4_2_8P2
+
+ChangeSet@1.3319, 2015-04-07 04:05:46-04:00, stenn@deacon.udel.edu
+  ntp-4.2.8p2
+
+  packageinfo.sh@1.508 +2 -2
+    ntp-4.2.8p2
+
+ChangeSet@1.3318, 2015-04-07 07:57:32+00:00, stenn@psp-fb1.ntp.org
+  NEWS update
+
+  NEWS@1.135 +4 -2
+    NEWS update
+
+ChangeSet@1.3314.1.3, 2015-04-03 03:56:38-04:00, stenn@deacon.udel.edu
+  NTP_4_2_8P2_RC3
+  TAG: NTP_4_2_8P2_RC3
+
+  ChangeLog@1.1629.1.3 +1 -0
+    NTP_4_2_8P2_RC3
+
+  ntpd/invoke-ntp.conf.texi@1.181 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpd/invoke-ntp.keys.texi@1.177 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpd/invoke-ntpd.texi@1.494 +2 -2
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntp.conf.5man@1.215 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntp.conf.5mdoc@1.215 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntp.conf.html@1.172 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntp.conf.man.in@1.215 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntp.conf.mdoc.in@1.215 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntp.keys.5man@1.211 +2 -2
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntp.keys.5mdoc@1.211 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntp.keys.html@1.173 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntp.keys.man.in@1.211 +2 -2
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntp.keys.mdoc.in@1.211 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntpd-opts.c@1.516 +7 -7
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntpd-opts.h@1.515 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntpd.1ntpdman@1.323 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntpd.1ntpdmdoc@1.323 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntpd.html@1.167 +2 -2
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntpd.man.in@1.323 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpd/ntpd.mdoc.in@1.323 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpdc/invoke-ntpdc.texi@1.491 +2 -2
+    NTP_4_2_8P2_RC3
+
+  ntpdc/ntpdc-opts.c@1.509 +7 -7
+    NTP_4_2_8P2_RC3
+
+  ntpdc/ntpdc-opts.h@1.508 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpdc/ntpdc.1ntpdcman@1.322 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpdc/ntpdc.1ntpdcmdoc@1.322 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpdc/ntpdc.html@1.335 +2 -2
+    NTP_4_2_8P2_RC3
+
+  ntpdc/ntpdc.man.in@1.322 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpdc/ntpdc.mdoc.in@1.322 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpq/invoke-ntpq.texi@1.497 +2 -2
+    NTP_4_2_8P2_RC3
+
+  ntpq/ntpq-opts.c@1.514 +7 -7
+    NTP_4_2_8P2_RC3
+
+  ntpq/ntpq-opts.h@1.512 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpq/ntpq.1ntpqman@1.325 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpq/ntpq.1ntpqmdoc@1.325 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpq/ntpq.html@1.164 +2 -2
+    NTP_4_2_8P2_RC3
+
+  ntpq/ntpq.man.in@1.325 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpq/ntpq.mdoc.in@1.325 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpsnmpd/invoke-ntpsnmpd.texi@1.493 +2 -2
+    NTP_4_2_8P2_RC3
+
+  ntpsnmpd/ntpsnmpd-opts.c@1.511 +7 -7
+    NTP_4_2_8P2_RC3
+
+  ntpsnmpd/ntpsnmpd-opts.h@1.510 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.322 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.322 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpsnmpd/ntpsnmpd.html@1.162 +1 -1
+    NTP_4_2_8P2_RC3
+
+  ntpsnmpd/ntpsnmpd.man.in@1.322 +3 -3
+    NTP_4_2_8P2_RC3
+
+  ntpsnmpd/ntpsnmpd.mdoc.in@1.322 +1 -1
+    NTP_4_2_8P2_RC3
+
+  packageinfo.sh@1.507 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.83 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.84 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/calc_tickadj/calc_tickadj.html@1.85 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/calc_tickadj/calc_tickadj.man.in@1.82 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/calc_tickadj/calc_tickadj.mdoc.in@1.84 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/calc_tickadj/invoke-calc_tickadj.texi@1.87 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/invoke-plot_summary.texi@1.104 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/invoke-summary.texi@1.104 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/ntp-wait/invoke-ntp-wait.texi@1.314 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/ntp-wait/ntp-wait-opts@1.50 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitman@1.311 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.312 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/ntp-wait/ntp-wait.html@1.331 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/ntp-wait/ntp-wait.man.in@1.311 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/ntp-wait/ntp-wait.mdoc.in@1.312 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/ntpsweep/invoke-ntpsweep.texi@1.102 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/ntpsweep/ntpsweep-opts@1.52 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepman@1.90 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.90 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/ntpsweep/ntpsweep.html@1.103 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/ntpsweep/ntpsweep.man.in@1.90 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/ntpsweep/ntpsweep.mdoc.in@1.91 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/ntptrace/invoke-ntptrace.texi@1.103 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/ntptrace/ntptrace-opts@1.52 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/ntptrace/ntptrace.1ntptraceman@1.90 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/ntptrace/ntptrace.1ntptracemdoc@1.91 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/ntptrace/ntptrace.html@1.104 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/ntptrace/ntptrace.man.in@1.90 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/ntptrace/ntptrace.mdoc.in@1.92 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/plot_summary-opts@1.52 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/plot_summary.1plot_summaryman@1.102 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/plot_summary.1plot_summarymdoc@1.102 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/plot_summary.html@1.105 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/plot_summary.man.in@1.102 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/plot_summary.mdoc.in@1.102 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/summary-opts@1.52 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/summary.1summaryman@1.102 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/summary.1summarymdoc@1.102 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/summary.html@1.105 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/summary.man.in@1.102 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/summary.mdoc.in@1.102 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/update-leap/invoke-update-leap.texi@1.3 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/update-leap/update-leap-opts@1.3 +2 -2
+    NTP_4_2_8P2_RC3
+
+  scripts/update-leap/update-leap.1update-leapman@1.3 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/update-leap/update-leap.1update-leapmdoc@1.3 +1 -1
+    NTP_4_2_8P2_RC3
+
+  scripts/update-leap/update-leap.html@1.3 +6 -5
+    NTP_4_2_8P2_RC3
+
+  scripts/update-leap/update-leap.man.in@1.3 +3 -3
+    NTP_4_2_8P2_RC3
+
+  scripts/update-leap/update-leap.mdoc.in@1.3 +1 -1
+    NTP_4_2_8P2_RC3
+
+  sntp/invoke-sntp.texi@1.491 +2 -2
+    NTP_4_2_8P2_RC3
+
+  sntp/sntp-opts.c@1.510 +7 -7
+    NTP_4_2_8P2_RC3
+
+  sntp/sntp-opts.h@1.508 +3 -3
+    NTP_4_2_8P2_RC3
+
+  sntp/sntp.1sntpman@1.326 +3 -3
+    NTP_4_2_8P2_RC3
+
+  sntp/sntp.1sntpmdoc@1.326 +1 -1
+    NTP_4_2_8P2_RC3
+
+  sntp/sntp.html@1.506 +2 -2
+    NTP_4_2_8P2_RC3
+
+  sntp/sntp.man.in@1.326 +3 -3
+    NTP_4_2_8P2_RC3
+
+  sntp/sntp.mdoc.in@1.326 +1 -1
+    NTP_4_2_8P2_RC3
+
+  util/invoke-ntp-keygen.texi@1.494 +2 -2
+    NTP_4_2_8P2_RC3
+
+  util/ntp-keygen-opts.c@1.512 +7 -7
+    NTP_4_2_8P2_RC3
+
+  util/ntp-keygen-opts.h@1.510 +3 -3
+    NTP_4_2_8P2_RC3
+
+  util/ntp-keygen.1ntp-keygenman@1.322 +3 -3
+    NTP_4_2_8P2_RC3
+
+  util/ntp-keygen.1ntp-keygenmdoc@1.322 +1 -1
+    NTP_4_2_8P2_RC3
+
+  util/ntp-keygen.html@1.168 +2 -2
+    NTP_4_2_8P2_RC3
+
+  util/ntp-keygen.man.in@1.322 +3 -3
+    NTP_4_2_8P2_RC3
+
+  util/ntp-keygen.mdoc.in@1.322 +1 -1
+    NTP_4_2_8P2_RC3
+
+ChangeSet@1.3314.1.2, 2015-04-03 03:35:54-04:00, stenn@deacon.udel.edu
+  [Bug 2763] Fix for different thresholds for forward and backward steps
+
+  ChangeLog@1.1629.1.2 +3 -0
+    [Bug 2763] Fix for different thresholds for forward and backward steps
+
+  ntpd/ntp_loopfilter.c@1.183 +2 -2
+    [Bug 2763] Fix for different thresholds for forward and backward steps
+
+ChangeSet@1.3314.1.1, 2015-04-03 01:16:34-04:00, stenn@deacon.udel.edu
+  NTP_4_2_8P2_RC2
+  TAG: NTP_4_2_8P2_RC2
+
+  ChangeLog@1.1629.1.1 +1 -0
+    NTP_4_2_8P2_RC2
+
+  ntpd/invoke-ntp.conf.texi@1.180 +1 -1
+    NTP_4_2_8P2_RC2
+
+  ntpd/invoke-ntp.keys.texi@1.176 +1 -1
+    NTP_4_2_8P2_RC2
+
+  ntpd/invoke-ntpd.texi@1.493 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntp.conf.5man@1.214 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntp.conf.5mdoc@1.214 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntp.conf.html@1.171 +1 -1
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntp.conf.man.in@1.214 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntp.conf.mdoc.in@1.214 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntp.keys.5man@1.210 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntp.keys.5mdoc@1.210 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntp.keys.html@1.172 +1 -1
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntp.keys.man.in@1.210 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntp.keys.mdoc.in@1.210 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntpd-opts.c@1.515 +7 -7
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntpd-opts.h@1.514 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntpd.1ntpdman@1.322 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntpd.1ntpdmdoc@1.322 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntpd.html@1.166 +50 -26
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntpd.man.in@1.322 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpd/ntpd.mdoc.in@1.322 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpdc/invoke-ntpdc.texi@1.490 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpdc/ntpdc-opts.c@1.508 +7 -7
+    NTP_4_2_8P2_RC2
+
+  ntpdc/ntpdc-opts.h@1.507 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpdc/ntpdc.1ntpdcman@1.321 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpdc/ntpdc.1ntpdcmdoc@1.321 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpdc/ntpdc.html@1.334 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpdc/ntpdc.man.in@1.321 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpdc/ntpdc.mdoc.in@1.321 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpq/invoke-ntpq.texi@1.496 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpq/ntpq-opts.c@1.513 +7 -7
+    NTP_4_2_8P2_RC2
+
+  ntpq/ntpq-opts.h@1.511 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpq/ntpq.1ntpqman@1.324 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpq/ntpq.1ntpqmdoc@1.324 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpq/ntpq.html@1.163 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpq/ntpq.man.in@1.324 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpq/ntpq.mdoc.in@1.324 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpsnmpd/invoke-ntpsnmpd.texi@1.492 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpsnmpd/ntpsnmpd-opts.c@1.510 +7 -7
+    NTP_4_2_8P2_RC2
+
+  ntpsnmpd/ntpsnmpd-opts.h@1.509 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.321 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.321 +2 -2
+    NTP_4_2_8P2_RC2
+
+  ntpsnmpd/ntpsnmpd.html@1.161 +1 -1
+    NTP_4_2_8P2_RC2
+
+  ntpsnmpd/ntpsnmpd.man.in@1.321 +3 -3
+    NTP_4_2_8P2_RC2
+
+  ntpsnmpd/ntpsnmpd.mdoc.in@1.321 +2 -2
+    NTP_4_2_8P2_RC2
+
+  packageinfo.sh@1.506 +1 -1
+    NTP_4_2_8P2_RC2
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.82 +3 -3
+    NTP_4_2_8P2_RC2
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.83 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/calc_tickadj/calc_tickadj.html@1.84 +1 -1
+    NTP_4_2_8P2_RC2
+
+  scripts/calc_tickadj/calc_tickadj.man.in@1.81 +3 -3
+    NTP_4_2_8P2_RC2
+
+  scripts/calc_tickadj/calc_tickadj.mdoc.in@1.83 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/calc_tickadj/invoke-calc_tickadj.texi@1.86 +1 -1
+    NTP_4_2_8P2_RC2
+
+  scripts/invoke-plot_summary.texi@1.103 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/invoke-summary.texi@1.103 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/ntp-wait/invoke-ntp-wait.texi@1.313 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/ntp-wait/ntp-wait-opts@1.49 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitman@1.310 +3 -3
+    NTP_4_2_8P2_RC2
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.311 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/ntp-wait/ntp-wait.html@1.330 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/ntp-wait/ntp-wait.man.in@1.310 +3 -3
+    NTP_4_2_8P2_RC2
+
+  scripts/ntp-wait/ntp-wait.mdoc.in@1.311 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/ntpsweep/invoke-ntpsweep.texi@1.101 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/ntpsweep/ntpsweep-opts@1.51 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepman@1.89 +3 -3
+    NTP_4_2_8P2_RC2
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.89 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/ntpsweep/ntpsweep.html@1.102 +2 -2
+    NTP_4_2_8P2_RC2
+
+  scripts/ntpsweep/ntpsweep.man.in@1.89 +3 -3
+    NTP_4_2_8P2_RC2
+
+  scripts/ntpsweep/ntpsweep.mdoc.in@1.90 +2 -2
+    NTP_4_2_8P2_RC2

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

From owner-svn-src-vendor@FreeBSD.ORG  Fri Apr 10 01:29:30 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5433280A;
 Fri, 10 Apr 2015 01:29:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 26865B9F;
 Fri, 10 Apr 2015 01:29:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3A1TT57054415;
 Fri, 10 Apr 2015 01:29:29 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3A1TTuv054414;
 Fri, 10 Apr 2015 01:29:29 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201504100129.t3A1TTuv054414@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Fri, 10 Apr 2015 01:29:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r281349 - vendor/ntp/4.2.8p2
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2015 01:29:30 -0000

Author: cy
Date: Fri Apr 10 01:29:29 2015
New Revision: 281349
URL: https://svnweb.freebsd.org/changeset/base/281349

Log:
  Tag ntp-4.2.8p2.
  
  Approved by:	delphij
  Security:	CVE-2015-1798, CVE-2015-1799
  Security:	VuXML ebd84c96-dd7e-11e4-854e-3c970e169bc2

Added:
  vendor/ntp/4.2.8p2/
     - copied from r281348, vendor/ntp/dist/

From owner-svn-src-vendor@FreeBSD.ORG  Fri Apr 10 13:26:10 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3A6F178A;
 Fri, 10 Apr 2015 13:26:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 227057B5;
 Fri, 10 Apr 2015 13:26:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3ADQAa5098168;
 Fri, 10 Apr 2015 13:26:10 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3ADQ6X2098127;
 Fri, 10 Apr 2015 13:26:06 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201504101326.t3ADQ6X2098127@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 10 Apr 2015 13:26:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r281368 - in vendor/nvi/dist: . catalog cl common docs
 docs/USD.doc docs/internals docs/interp docs/man docs/tutorial ex regex vi
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2015 13:26:10 -0000

Author: bapt
Date: Fri Apr 10 13:26:05 2015
New Revision: 281368
URL: https://svnweb.freebsd.org/changeset/base/281368

Log:
  Import nvi 2.1.3
  
  Approved by:	peter

Added:
  vendor/nvi/dist/docs/man/
  vendor/nvi/dist/docs/man/Makefile   (contents, props changed)
  vendor/nvi/dist/docs/man/vi.1   (contents, props changed)
Deleted:
  vendor/nvi/dist/catalog/spell.ok
  vendor/nvi/dist/docs/TODO
  vendor/nvi/dist/docs/USD.doc/
  vendor/nvi/dist/docs/changelog
  vendor/nvi/dist/docs/ev
  vendor/nvi/dist/docs/features
  vendor/nvi/dist/docs/help
  vendor/nvi/dist/docs/internals/
  vendor/nvi/dist/docs/interp/
  vendor/nvi/dist/docs/spell.ok
  vendor/nvi/dist/docs/tutorial/
Modified:
  vendor/nvi/dist/README
  vendor/nvi/dist/catalog/dump.c
  vendor/nvi/dist/cl/cl.h
  vendor/nvi/dist/cl/cl_funcs.c
  vendor/nvi/dist/cl/cl_main.c
  vendor/nvi/dist/cl/cl_read.c
  vendor/nvi/dist/cl/cl_screen.c
  vendor/nvi/dist/cl/cl_term.c
  vendor/nvi/dist/cl/extern.h
  vendor/nvi/dist/common/common.h
  vendor/nvi/dist/common/conv.c
  vendor/nvi/dist/common/cut.c
  vendor/nvi/dist/common/delete.c
  vendor/nvi/dist/common/encoding.c
  vendor/nvi/dist/common/exf.c
  vendor/nvi/dist/common/extern.h
  vendor/nvi/dist/common/gs.h
  vendor/nvi/dist/common/key.c
  vendor/nvi/dist/common/line.c
  vendor/nvi/dist/common/log.c
  vendor/nvi/dist/common/main.c
  vendor/nvi/dist/common/mark.c
  vendor/nvi/dist/common/msg.c
  vendor/nvi/dist/common/options.c
  vendor/nvi/dist/common/options.h
  vendor/nvi/dist/common/options_f.c
  vendor/nvi/dist/common/put.c
  vendor/nvi/dist/common/recover.c
  vendor/nvi/dist/common/screen.c
  vendor/nvi/dist/common/search.c
  vendor/nvi/dist/common/seq.c
  vendor/nvi/dist/common/util.c
  vendor/nvi/dist/ex/ex.c
  vendor/nvi/dist/ex/ex.h
  vendor/nvi/dist/ex/ex_abbrev.c
  vendor/nvi/dist/ex/ex_append.c
  vendor/nvi/dist/ex/ex_args.c
  vendor/nvi/dist/ex/ex_argv.c
  vendor/nvi/dist/ex/ex_at.c
  vendor/nvi/dist/ex/ex_bang.c
  vendor/nvi/dist/ex/ex_cd.c
  vendor/nvi/dist/ex/ex_cscope.c
  vendor/nvi/dist/ex/ex_delete.c
  vendor/nvi/dist/ex/ex_display.c
  vendor/nvi/dist/ex/ex_edit.c
  vendor/nvi/dist/ex/ex_equal.c
  vendor/nvi/dist/ex/ex_file.c
  vendor/nvi/dist/ex/ex_filter.c
  vendor/nvi/dist/ex/ex_global.c
  vendor/nvi/dist/ex/ex_init.c
  vendor/nvi/dist/ex/ex_join.c
  vendor/nvi/dist/ex/ex_map.c
  vendor/nvi/dist/ex/ex_mark.c
  vendor/nvi/dist/ex/ex_mkexrc.c
  vendor/nvi/dist/ex/ex_move.c
  vendor/nvi/dist/ex/ex_open.c
  vendor/nvi/dist/ex/ex_preserve.c
  vendor/nvi/dist/ex/ex_print.c
  vendor/nvi/dist/ex/ex_put.c
  vendor/nvi/dist/ex/ex_quit.c
  vendor/nvi/dist/ex/ex_read.c
  vendor/nvi/dist/ex/ex_screen.c
  vendor/nvi/dist/ex/ex_script.c
  vendor/nvi/dist/ex/ex_set.c
  vendor/nvi/dist/ex/ex_shell.c
  vendor/nvi/dist/ex/ex_shift.c
  vendor/nvi/dist/ex/ex_source.c
  vendor/nvi/dist/ex/ex_stop.c
  vendor/nvi/dist/ex/ex_subst.c
  vendor/nvi/dist/ex/ex_tag.c
  vendor/nvi/dist/ex/ex_txt.c
  vendor/nvi/dist/ex/ex_undo.c
  vendor/nvi/dist/ex/ex_usage.c
  vendor/nvi/dist/ex/ex_util.c
  vendor/nvi/dist/ex/ex_version.c
  vendor/nvi/dist/ex/ex_visual.c
  vendor/nvi/dist/ex/ex_write.c
  vendor/nvi/dist/ex/ex_yank.c
  vendor/nvi/dist/ex/ex_z.c
  vendor/nvi/dist/ex/extern.h
  vendor/nvi/dist/ex/version.h
  vendor/nvi/dist/regex/COPYRIGHT
  vendor/nvi/dist/regex/cclass.h
  vendor/nvi/dist/regex/cname.h
  vendor/nvi/dist/regex/engine.c
  vendor/nvi/dist/regex/re_format.7
  vendor/nvi/dist/regex/regcomp.c
  vendor/nvi/dist/regex/regerror.c
  vendor/nvi/dist/regex/regex.3
  vendor/nvi/dist/regex/regex.h
  vendor/nvi/dist/regex/regex2.h
  vendor/nvi/dist/regex/regexec.c
  vendor/nvi/dist/regex/regfree.c
  vendor/nvi/dist/regex/utils.h
  vendor/nvi/dist/vi/extern.h
  vendor/nvi/dist/vi/getc.c
  vendor/nvi/dist/vi/v_at.c
  vendor/nvi/dist/vi/v_ch.c
  vendor/nvi/dist/vi/v_delete.c
  vendor/nvi/dist/vi/v_ex.c
  vendor/nvi/dist/vi/v_increment.c
  vendor/nvi/dist/vi/v_init.c
  vendor/nvi/dist/vi/v_itxt.c
  vendor/nvi/dist/vi/v_left.c
  vendor/nvi/dist/vi/v_mark.c
  vendor/nvi/dist/vi/v_match.c
  vendor/nvi/dist/vi/v_paragraph.c
  vendor/nvi/dist/vi/v_put.c
  vendor/nvi/dist/vi/v_redraw.c
  vendor/nvi/dist/vi/v_replace.c
  vendor/nvi/dist/vi/v_right.c
  vendor/nvi/dist/vi/v_screen.c
  vendor/nvi/dist/vi/v_scroll.c
  vendor/nvi/dist/vi/v_search.c
  vendor/nvi/dist/vi/v_section.c
  vendor/nvi/dist/vi/v_sentence.c
  vendor/nvi/dist/vi/v_status.c
  vendor/nvi/dist/vi/v_txt.c
  vendor/nvi/dist/vi/v_ulcase.c
  vendor/nvi/dist/vi/v_undo.c
  vendor/nvi/dist/vi/v_util.c
  vendor/nvi/dist/vi/v_word.c
  vendor/nvi/dist/vi/v_xchar.c
  vendor/nvi/dist/vi/v_yank.c
  vendor/nvi/dist/vi/v_z.c
  vendor/nvi/dist/vi/v_zexit.c
  vendor/nvi/dist/vi/vi.c
  vendor/nvi/dist/vi/vi.h
  vendor/nvi/dist/vi/vs_line.c
  vendor/nvi/dist/vi/vs_msg.c
  vendor/nvi/dist/vi/vs_refresh.c
  vendor/nvi/dist/vi/vs_relative.c
  vendor/nvi/dist/vi/vs_smap.c
  vendor/nvi/dist/vi/vs_split.c

Modified: vendor/nvi/dist/README
==============================================================================
--- vendor/nvi/dist/README	Fri Apr 10 13:20:31 2015	(r281367)
+++ vendor/nvi/dist/README	Fri Apr 10 13:26:05 2015	(r281368)
@@ -1,6 +1,6 @@
-#	$Id: README,v 9.1 2013/11/02 02:50:23 zy Exp $
+#	$Id: README,v 9.2 2015/04/08 17:18:56 zy Exp $
 
-This is version 2.1.2 (2012-11-02) of nex/nvi, a reimplementation of the ex/vi
+This is version 2.1.3 (2015-04-08) of nex/nvi, a reimplementation of the ex/vi
 text editors originally distributed as part of the Fourth Berkeley
 Software Distribution (4BSD), by the University of California, Berkeley.
 

Modified: vendor/nvi/dist/catalog/dump.c
==============================================================================
--- vendor/nvi/dist/catalog/dump.c	Fri Apr 10 13:20:31 2015	(r281367)
+++ vendor/nvi/dist/catalog/dump.c	Fri Apr 10 13:26:05 2015	(r281368)
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -32,12 +28,6 @@
  */
 
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
 static char sccsid[] = "$Id: dump.c,v 8.2 2011/07/14 00:05:25 zy Exp $";
 #endif /* not lint */
 
@@ -45,8 +35,7 @@ static char sccsid[] = "$Id: dump.c,v 8.
 #include <stdio.h>
 
 static void
-parse(fp)
-	FILE *fp;
+parse(FILE *fp)
 {
 	int ch, s1, s2, s3;
 
@@ -96,9 +85,7 @@ parse(fp)
 }
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	FILE *fp;
 

Modified: vendor/nvi/dist/cl/cl.h
==============================================================================
--- vendor/nvi/dist/cl/cl.h	Fri Apr 10 13:20:31 2015	(r281367)
+++ vendor/nvi/dist/cl/cl.h	Fri Apr 10 13:26:05 2015	(r281368)
@@ -80,16 +80,4 @@ typedef enum { INP_OK=0, INP_EOF, INP_ER
 #define	RCNO(sp, cno)	(cno)
 #define	RLNO(sp, lno)	(lno)
 
-/*
- * XXX
- * Some implementations of curses.h don't define these for us.  Used for
- * compatibility only.
- */
-#ifndef TRUE
-#define	TRUE	1
-#endif
-#ifndef FALSE
-#define	FALSE	0
-#endif
-
 #include "extern.h"

Modified: vendor/nvi/dist/cl/cl_funcs.c
==============================================================================
--- vendor/nvi/dist/cl/cl_funcs.c	Fri Apr 10 13:20:31 2015	(r281367)
+++ vendor/nvi/dist/cl/cl_funcs.c	Fri Apr 10 13:26:05 2015	(r281368)
@@ -33,7 +33,7 @@ static const char sccsid[] = "$Id: cl_fu
 #include "../vi/vi.h"
 #include "cl.h"
 
-static void cl_rdiv __P((SCR *));
+static void cl_rdiv(SCR *);
 
 static int 
 addstr4(SCR *sp, void *str, size_t len, int wide)
@@ -76,31 +76,31 @@ addstr4(SCR *sp, void *str, size_t len, 
  * cl_waddstr --
  *	Add len bytes from the string at the cursor, advancing the cursor.
  *
- * PUBLIC: int cl_waddstr __P((SCR *, const CHAR_T *, size_t));
+ * PUBLIC: int cl_waddstr(SCR *, const CHAR_T *, size_t);
  */
 int
 cl_waddstr(SCR *sp, const CHAR_T *str, size_t len)
 {
-    return addstr4(sp, (void *)str, len, 1);
+	return addstr4(sp, (void *)str, len, 1);
 }
 
 /*
  * cl_addstr --
  *	Add len bytes from the string at the cursor, advancing the cursor.
  *
- * PUBLIC: int cl_addstr __P((SCR *, const char *, size_t));
+ * PUBLIC: int cl_addstr(SCR *, const char *, size_t);
  */
 int
 cl_addstr(SCR *sp, const char *str, size_t len)
 {
-    return addstr4(sp, (void *)str, len, 0);
+	return addstr4(sp, (void *)str, len, 0);
 }
 
 /*
  * cl_attr --
  *	Toggle a screen attribute on/off.
  *
- * PUBLIC: int cl_attr __P((SCR *, scr_attr_t, int));
+ * PUBLIC: int cl_attr(SCR *, scr_attr_t, int);
  */
 int
 cl_attr(SCR *sp, scr_attr_t attribute, int on)
@@ -187,7 +187,7 @@ cl_attr(SCR *sp, scr_attr_t attribute, i
  * cl_baud --
  *	Return the baud rate.
  *
- * PUBLIC: int cl_baud __P((SCR *, u_long *));
+ * PUBLIC: int cl_baud(SCR *, u_long *);
  */
 int
 cl_baud(SCR *sp, u_long *ratep)
@@ -228,7 +228,7 @@ cl_baud(SCR *sp, u_long *ratep)
  * cl_bell --
  *	Ring the bell/flash the screen.
  *
- * PUBLIC: int cl_bell __P((SCR *));
+ * PUBLIC: int cl_bell(SCR *);
  */
 int
 cl_bell(SCR *sp)
@@ -252,7 +252,7 @@ cl_bell(SCR *sp)
  * cl_clrtoeol --
  *	Clear from the current cursor to the end of the line.
  *
- * PUBLIC: int cl_clrtoeol __P((SCR *));
+ * PUBLIC: int cl_clrtoeol(SCR *);
  */
 int
 cl_clrtoeol(SCR *sp)
@@ -281,7 +281,7 @@ cl_clrtoeol(SCR *sp)
  * cl_cursor --
  *	Return the current cursor position.
  *
- * PUBLIC: int cl_cursor __P((SCR *, size_t *, size_t *));
+ * PUBLIC: int cl_cursor(SCR *, size_t *, size_t *);
  */
 int
 cl_cursor(SCR *sp, size_t *yp, size_t *xp)
@@ -307,7 +307,7 @@ cl_cursor(SCR *sp, size_t *yp, size_t *x
  * cl_deleteln --
  *	Delete the current line, scrolling all lines below it.
  *
- * PUBLIC: int cl_deleteln __P((SCR *));
+ * PUBLIC: int cl_deleteln(SCR *);
  */
 int
 cl_deleteln(SCR *sp)
@@ -344,7 +344,7 @@ cl_deleteln(SCR *sp)
  * cl_discard --
  *	Discard a screen.
  *
- * PUBLIC: int cl_discard __P((SCR *, SCR **));
+ * PUBLIC: int cl_discard(SCR *, SCR **);
  */
 int
 cl_discard(SCR *discardp, SCR **acquirep)
@@ -385,7 +385,7 @@ cl_discard(SCR *discardp, SCR **acquirep
  *	Adjust the screen for ex.  This routine is purely for standalone
  *	ex programs.  All special purpose, all special case.
  *
- * PUBLIC: int cl_ex_adjust __P((SCR *, exadj_t));
+ * PUBLIC: int cl_ex_adjust(SCR *, exadj_t);
  */
 int
 cl_ex_adjust(SCR *sp, exadj_t action)
@@ -440,7 +440,7 @@ cl_ex_adjust(SCR *sp, exadj_t action)
  * cl_insertln --
  *	Push down the current line, discarding the bottom line.
  *
- * PUBLIC: int cl_insertln __P((SCR *));
+ * PUBLIC: int cl_insertln(SCR *);
  */
 int
 cl_insertln(SCR *sp)
@@ -458,7 +458,7 @@ cl_insertln(SCR *sp)
  * cl_keyval --
  *	Return the value for a special key.
  *
- * PUBLIC: int cl_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *));
+ * PUBLIC: int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *);
  */
 int
 cl_keyval(SCR *sp, scr_keyval_t val, CHAR_T *chp, int *dnep)
@@ -496,7 +496,7 @@ cl_keyval(SCR *sp, scr_keyval_t val, CHA
  * cl_move --
  *	Move the cursor.
  *
- * PUBLIC: int cl_move __P((SCR *, size_t, size_t));
+ * PUBLIC: int cl_move(SCR *, size_t, size_t);
  */
 int
 cl_move(SCR *sp, size_t lno, size_t cno)
@@ -516,7 +516,7 @@ cl_move(SCR *sp, size_t lno, size_t cno)
  * cl_refresh --
  *	Refresh the screen.
  *
- * PUBLIC: int cl_refresh __P((SCR *, int));
+ * PUBLIC: int cl_refresh(SCR *, int);
  */
 int
 cl_refresh(SCR *sp, int repaint)
@@ -599,7 +599,7 @@ cl_rdiv(SCR *sp)
  * cl_rename --
  *	Rename the file.
  *
- * PUBLIC: int cl_rename __P((SCR *, char *, int));
+ * PUBLIC: int cl_rename(SCR *, char *, int);
  */
 int
 cl_rename(SCR *sp, char *name, int on)
@@ -621,7 +621,7 @@ cl_rename(SCR *sp, char *name, int on)
 	if (on) {
 		clp->focus = sp;
 		if (!F_ISSET(clp, CL_RENAME_OK) ||
-				strncmp(OG_STR(gp, GO_TERM), "xterm", 5))
+		    strncmp(OG_STR(gp, GO_TERM), "xterm", 5))
 			return (0);
 
 		if (clp->oname == NULL && (wid = getenv("WINDOWID"))) {
@@ -654,7 +654,7 @@ rename:		cl_setname(gp, name);
  * cl_setname --
  *	Set a X11 icon/window name.
  *
- * PUBLIC: void cl_setname __P((GS *, char *));
+ * PUBLIC: void cl_setname(GS *, char *);
  */
 void
 cl_setname(GS *gp, char *name)
@@ -671,7 +671,7 @@ cl_setname(GS *gp, char *name)
  * cl_split --
  *	Split a screen.
  *
- * PUBLIC: int cl_split __P((SCR *, SCR *));
+ * PUBLIC: int cl_split(SCR *, SCR *);
  */
 int
 cl_split(SCR *origp, SCR *newp)
@@ -697,7 +697,7 @@ cl_split(SCR *origp, SCR *newp)
  * cl_suspend --
  *	Suspend a screen.
  *
- * PUBLIC: int cl_suspend __P((SCR *, int *));
+ * PUBLIC: int cl_suspend(SCR *, int *);
  */
 int
 cl_suspend(SCR *sp, int *allowedp)
@@ -825,7 +825,7 @@ cl_suspend(SCR *sp, int *allowedp)
  * cl_usage --
  *	Print out the curses usage messages.
  * 
- * PUBLIC: void cl_usage __P((void));
+ * PUBLIC: void cl_usage(void);
  */
 void
 cl_usage(void)

Modified: vendor/nvi/dist/cl/cl_main.c
==============================================================================
--- vendor/nvi/dist/cl/cl_main.c	Fri Apr 10 13:20:31 2015	(r281367)
+++ vendor/nvi/dist/cl/cl_main.c	Fri Apr 10 13:26:05 2015	(r281368)
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: cl_main.c,v 10.55 2011/08/15 19:52:28 zy Exp $";
+static const char sccsid[] = "$Id: cl_main.c,v 10.56 2015/04/05 06:20:53 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -36,20 +36,20 @@ static const char sccsid[] = "$Id: cl_ma
 GS *__global_list;				/* GLOBAL: List of screens. */
 sigset_t __sigblockset;				/* GLOBAL: Blocked signals. */
 
-static void	   cl_func_std __P((GS *));
-static CL_PRIVATE *cl_init __P((GS *));
-static GS	  *gs_init __P((char *));
-static void	   perr __P((char *, char *));
-static int	   setsig __P((int, struct sigaction *, void (*)(int)));
-static void	   sig_end __P((GS *));
-static void	   term_init __P((char *, char *));
+static void	   cl_func_std(GS *);
+static CL_PRIVATE *cl_init(GS *);
+static GS	  *gs_init(char *);
+static void	   perr(char *, char *);
+static int	   setsig(int, struct sigaction *, void (*)(int));
+static void	   sig_end(GS *);
+static void	   term_init(char *, char *);
 
 /*
  * main --
  *	This is the main loop for the standalone curses editor.
  */
 int
-main(int argc, char **argv)
+main(int argc, char *argv[])
 {
 	static int reenter;
 	CL_PRIVATE *clp;
@@ -92,7 +92,7 @@ main(int argc, char **argv)
 	 * have to use termcap/terminfo to find out how big the screen is.
 	 */
 	if ((ttype = getenv("TERM")) == NULL)
-		ttype = "unknown";
+		ttype = "ansi";
 	term_init(gp->progname, ttype);
 
 	/* Add the terminal type to the global structure. */
@@ -146,7 +146,7 @@ main(int argc, char **argv)
 	}
 
 	/* Free the global and CL private areas. */
-#if defined(DEBUG) || defined(PURIFY) || defined(LIBRARY)
+#if defined(DEBUG) || defined(PURIFY)
 	if (clp->oname != NULL)
 		free(clp->oname);
 	free(clp);
@@ -292,7 +292,7 @@ h_winch(int signo)
  * sig_init --
  *	Initialize signals.
  *
- * PUBLIC: int sig_init __P((GS *, SCR *));
+ * PUBLIC: int sig_init(GS *, SCR *);
  */
 int
 sig_init(GS *gp, SCR *sp)
@@ -337,7 +337,7 @@ sig_init(GS *gp, SCR *sp)
  *	Set a signal handler.
  */
 static int
-setsig(int signo, struct sigaction *oactp, void (*handler) (int))
+setsig(int signo, struct sigaction *oactp, void (*handler)(int))
 {
 	struct sigaction act;
 
@@ -345,21 +345,12 @@ setsig(int signo, struct sigaction *oact
 	 * Use sigaction(2), not signal(3), since we don't always want to
 	 * restart system calls.  The example is when waiting for a command
 	 * mode keystroke and SIGWINCH arrives.  Besides, you can't portably
-	 * restart system calls (thanks, POSIX!).  On the other hand, you
-	 * can't portably NOT restart system calls (thanks, Sun!).  SunOS
-	 * used SA_INTERRUPT as their extension to NOT restart read calls.
-	 * We sure hope nobody else used it for anything else.  Mom told me
-	 * there'd be days like this.  She just never told me that there'd
-	 * be so many.
+	 * restart system calls (thanks, POSIX!).
 	 */
 	act.sa_handler = handler;
 	sigemptyset(&act.sa_mask);
 
-#ifdef SA_INTERRUPT
-	act.sa_flags = SA_INTERRUPT;
-#else
 	act.sa_flags = 0;
-#endif
 	return (sigaction(signo, &act, oactp));
 }
 

Modified: vendor/nvi/dist/cl/cl_read.c
==============================================================================
--- vendor/nvi/dist/cl/cl_read.c	Fri Apr 10 13:20:31 2015	(r281367)
+++ vendor/nvi/dist/cl/cl_read.c	Fri Apr 10 13:26:05 2015	(r281368)
@@ -35,15 +35,15 @@ static const char sccsid[] = "$Id: cl_re
 #undef columns
 #undef lines  
 
-static input_t	cl_read __P((SCR *,
-    u_int32_t, char *, size_t, int *, struct timeval *));
-static int	cl_resize __P((SCR *, size_t, size_t));
+static input_t	cl_read(SCR *,
+    u_int32_t, char *, size_t, int *, struct timeval *);
+static int	cl_resize(SCR *, size_t, size_t);
 
 /*
  * cl_event --
  *	Return a single event.
  *
- * PUBLIC: int cl_event __P((SCR *, EVENT *, u_int32_t, int));
+ * PUBLIC: int cl_event(SCR *, EVENT *, u_int32_t, int);
  */
 int
 cl_event(SCR *sp, EVENT *evp, u_int32_t flags, int ms)
@@ -143,7 +143,8 @@ read:
  *	Read characters from the input.
  */
 static input_t
-cl_read(SCR *sp, u_int32_t flags, char *bp, size_t blen, int *nrp, struct timeval *tp)
+cl_read(SCR *sp, u_int32_t flags, char *bp, size_t blen, int *nrp,
+    struct timeval *tp)
 {
 	struct termios term1, term2;
 	CL_PRIVATE *clp;

Modified: vendor/nvi/dist/cl/cl_screen.c
==============================================================================
--- vendor/nvi/dist/cl/cl_screen.c	Fri Apr 10 13:20:31 2015	(r281367)
+++ vendor/nvi/dist/cl/cl_screen.c	Fri Apr 10 13:26:05 2015	(r281368)
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: cl_screen.c,v 10.56 2002/05/03 19:59:44 skimo Exp $";
+static const char sccsid[] = "$Id: cl_screen.c,v 10.58 2015/04/08 02:12:11 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -32,18 +32,18 @@ static const char sccsid[] = "$Id: cl_sc
 #include "../common/common.h"
 #include "cl.h"
 
-static int	cl_ex_end __P((GS *));
-static int	cl_ex_init __P((SCR *));
-static void	cl_freecap __P((CL_PRIVATE *));
-static int	cl_vi_end __P((GS *));
-static int	cl_vi_init __P((SCR *));
-static int	cl_putenv __P((char *, char *, u_long));
+static int	cl_ex_end(GS *);
+static int	cl_ex_init(SCR *);
+static void	cl_freecap(CL_PRIVATE *);
+static int	cl_vi_end(GS *);
+static int	cl_vi_init(SCR *);
+static int	cl_putenv(char *, char *, u_long);
 
 /*
  * cl_screen --
  *	Switch screen types.
  *
- * PUBLIC: int cl_screen __P((SCR *, u_int32_t));
+ * PUBLIC: int cl_screen(SCR *, u_int32_t);
  */
 int
 cl_screen(SCR *sp, u_int32_t flags)
@@ -58,11 +58,9 @@ cl_screen(SCR *sp, u_int32_t flags)
 
 	/* See if the current information is incorrect. */
 	if (F_ISSET(gp, G_SRESTART)) {
-		if (CLSP(sp)) {
-		    delwin(CLSP(sp));
-		    sp->cl_private = NULL;
-		}
-		if (cl_quit(gp))
+		if ((!F_ISSET(sp, SC_SCR_EX | SC_SCR_VI) ||
+		     resizeterm(O_VAL(sp, O_LINES), O_VAL(sp, O_COLUMNS))) &&
+		    cl_quit(gp))
 			return (1);
 		F_CLR(gp, G_SRESTART);
 	}
@@ -131,7 +129,7 @@ cl_screen(SCR *sp, u_int32_t flags)
  * cl_quit --
  *	Shutdown the screens.
  *
- * PUBLIC: int cl_quit __P((GS *));
+ * PUBLIC: int cl_quit(GS *);
  */
 int
 cl_quit(GS *gp)
@@ -234,20 +232,15 @@ cl_vi_init(SCR *sp)
 	cl_putenv("COLUMNS", NULL, (u_long)O_VAL(sp, O_COLUMNS));
 
 	/*
-	 * We don't care about the SCREEN reference returned by newterm, we
-	 * never have more than one SCREEN at a time.
-	 *
-	 * XXX
-	 * The SunOS initscr() can't be called twice.  Don't even think about
-	 * using it.  It fails in subtle ways (e.g. select(2) on fileno(stdin)
-	 * stops working).  (The SVID notes that applications should only call
-	 * initscr() once.)
-	 *
-	 * XXX
-	 * The HP/UX newterm doesn't support the NULL first argument, so we
-	 * have to specify the terminal type.
+	 * The terminal is aways initialized, either in `main`, or by a
+	 * previous call to newterm(3X).
 	 */
 	(void)del_curterm(cur_term);
+
+	/*
+	 * We never have more than one SCREEN at a time, so set_term(NULL) will
+	 * give us the last SCREEN.
+	 */
 	errno = 0;
 	if (newterm(ttype, stdout, stdin) == NULL) {
 		if (errno)
@@ -416,6 +409,9 @@ cl_vi_end(GS *gp)
 	/* End curses window. */
 	(void)endwin();
 
+	/* Free the SCREEN created by newterm(3X). */
+	delscreen(set_term(NULL));
+
 	/*
 	 * XXX
 	 * The screen TE sequence just got sent.  See the comment in
@@ -520,7 +516,7 @@ cl_ex_end(GS *gp)
  * cl_getcap --
  *	Retrieve termcap/terminfo strings.
  *
- * PUBLIC: int cl_getcap __P((SCR *, char *, char **));
+ * PUBLIC: int cl_getcap(SCR *, char *, char **);
  */
 int
 cl_getcap(SCR *sp, char *name, char **elementp)

Modified: vendor/nvi/dist/cl/cl_term.c
==============================================================================
--- vendor/nvi/dist/cl/cl_term.c	Fri Apr 10 13:20:31 2015	(r281367)
+++ vendor/nvi/dist/cl/cl_term.c	Fri Apr 10 13:26:05 2015	(r281368)
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: cl_term.c,v 10.34 2013/12/07 16:21:14 wjenkner Exp $";
+static const char sccsid[] = "$Id: cl_term.c,v 10.35 2015/04/08 02:12:11 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -34,7 +34,7 @@ static const char sccsid[] = "$Id: cl_te
 #include "../common/common.h"
 #include "cl.h"
 
-static int cl_pfmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
+static int cl_pfmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
 
 /*
  * XXX
@@ -81,7 +81,7 @@ static TKLIST const m2_tklist[] = {	/* I
  * cl_term_init --
  *	Initialize the special keys defined by the termcap/terminfo entry.
  *
- * PUBLIC: int cl_term_init __P((SCR *));
+ * PUBLIC: int cl_term_init(SCR *);
  */
 int
 cl_term_init(SCR *sp)
@@ -182,7 +182,7 @@ cl_term_init(SCR *sp)
  * cl_term_end --
  *	End the special keys defined by the termcap/terminfo entry.
  *
- * PUBLIC: int cl_term_end __P((GS *));
+ * PUBLIC: int cl_term_end(GS *);
  */
 int
 cl_term_end(GS *gp)
@@ -206,7 +206,7 @@ cl_term_end(GS *gp)
  * cl_fmap --
  *	Map a function key.
  *
- * PUBLIC: int cl_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
+ * PUBLIC: int cl_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
  */
 int
 cl_fmap(SCR *sp, seq_t stype, CHAR_T *from, size_t flen, CHAR_T *to, size_t tlen)
@@ -258,7 +258,7 @@ cl_pfmap(SCR *sp, seq_t stype, CHAR_T *f
  * cl_optchange --
  *	Curses screen specific "option changed" routine.
  *
- * PUBLIC: int cl_optchange __P((SCR *, int, char *, u_long *));
+ * PUBLIC: int cl_optchange(SCR *, int, char *, u_long *);
  */
 int
 cl_optchange(SCR *sp, int opt, char *str, u_long *valp)
@@ -268,15 +268,16 @@ cl_optchange(SCR *sp, int opt, char *str
 	clp = CLP(sp);
 
 	switch (opt) {
+	case O_TERM:
+		F_CLR(sp, SC_SCR_EX | SC_SCR_VI);
+		/* FALLTHROUGH */
 	case O_COLUMNS:
 	case O_LINES:
-	case O_TERM:
 		/*
-		 * Changing the columns, lines or terminal require that
-		 * we restart the screen.
+		 * Changing the terminal type requires that we reinitialize
+		 * curses, while resizing does not.
 		 */
 		F_SET(sp->gp, G_SRESTART);
-		F_CLR(sp, SC_SCR_EX | SC_SCR_VI);
 		break;
 	case O_MESG:
 		(void)cl_omesg(sp, clp, *valp);
@@ -305,7 +306,7 @@ cl_optchange(SCR *sp, int opt, char *str
  * cl_omesg --
  *	Turn the tty write permission on or off.
  *
- * PUBLIC: int cl_omesg __P((SCR *, CL_PRIVATE *, int));
+ * PUBLIC: int cl_omesg(SCR *, CL_PRIVATE *, int);
  */
 int
 cl_omesg(SCR *sp, CL_PRIVATE *clp, int on)
@@ -351,7 +352,7 @@ cl_omesg(SCR *sp, CL_PRIVATE *clp, int o
  * cl_ssize --
  *	Return the terminal size.
  *
- * PUBLIC: int cl_ssize __P((SCR *, int, size_t *, size_t *, int *));
+ * PUBLIC: int cl_ssize(SCR *, int, size_t *, size_t *, int *);
  */
 int
 cl_ssize(SCR *sp, int sigwinch, size_t *rowp, size_t *colp, int *changedp)
@@ -467,7 +468,7 @@ noterm:	if (row == 0)
  * cl_putchar --
  *	Function version of putchar, for tputs.
  *
- * PUBLIC: int cl_putchar __P((int));
+ * PUBLIC: int cl_putchar(int);
  */
 int
 cl_putchar(int ch)

Modified: vendor/nvi/dist/cl/extern.h
==============================================================================
--- vendor/nvi/dist/cl/extern.h	Fri Apr 10 13:20:31 2015	(r281367)
+++ vendor/nvi/dist/cl/extern.h	Fri Apr 10 13:26:05 2015	(r281368)
@@ -1,31 +1,31 @@
-int cl_waddstr __P((SCR *, const CHAR_T *, size_t));
-int cl_addstr __P((SCR *, const char *, size_t));
-int cl_attr __P((SCR *, scr_attr_t, int));
-int cl_baud __P((SCR *, u_long *));
-int cl_bell __P((SCR *));
-int cl_clrtoeol __P((SCR *));
-int cl_cursor __P((SCR *, size_t *, size_t *));
-int cl_deleteln __P((SCR *));
-int cl_discard __P((SCR *, SCR **));
-int cl_ex_adjust __P((SCR *, exadj_t));
-int cl_insertln __P((SCR *));
-int cl_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *));
-int cl_move __P((SCR *, size_t, size_t));
-int cl_refresh __P((SCR *, int));
-int cl_rename __P((SCR *, char *, int));
-void cl_setname __P((GS *, char *));
-int cl_split __P((SCR *, SCR *));
-int cl_suspend __P((SCR *, int *));
-void cl_usage __P((void));
-int sig_init __P((GS *, SCR *));
-int cl_event __P((SCR *, EVENT *, u_int32_t, int));
-int cl_screen __P((SCR *, u_int32_t));
-int cl_quit __P((GS *));
-int cl_getcap __P((SCR *, char *, char **));
-int cl_term_init __P((SCR *));
-int cl_term_end __P((GS *));
-int cl_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
-int cl_optchange __P((SCR *, int, char *, u_long *));
-int cl_omesg __P((SCR *, CL_PRIVATE *, int));
-int cl_ssize __P((SCR *, int, size_t *, size_t *, int *));
-int cl_putchar __P((int));
+int cl_waddstr(SCR *, const CHAR_T *, size_t);
+int cl_addstr(SCR *, const char *, size_t);
+int cl_attr(SCR *, scr_attr_t, int);
+int cl_baud(SCR *, u_long *);
+int cl_bell(SCR *);
+int cl_clrtoeol(SCR *);
+int cl_cursor(SCR *, size_t *, size_t *);
+int cl_deleteln(SCR *);
+int cl_discard(SCR *, SCR **);
+int cl_ex_adjust(SCR *, exadj_t);
+int cl_insertln(SCR *);
+int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *);
+int cl_move(SCR *, size_t, size_t);
+int cl_refresh(SCR *, int);
+int cl_rename(SCR *, char *, int);
+void cl_setname(GS *, char *);
+int cl_split(SCR *, SCR *);
+int cl_suspend(SCR *, int *);
+void cl_usage(void);
+int sig_init(GS *, SCR *);
+int cl_event(SCR *, EVENT *, u_int32_t, int);
+int cl_screen(SCR *, u_int32_t);
+int cl_quit(GS *);
+int cl_getcap(SCR *, char *, char **);
+int cl_term_init(SCR *);
+int cl_term_end(GS *);
+int cl_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
+int cl_optchange(SCR *, int, char *, u_long *);
+int cl_omesg(SCR *, CL_PRIVATE *, int);
+int cl_ssize(SCR *, int, size_t *, size_t *, int *);
+int cl_putchar(int);

Modified: vendor/nvi/dist/common/common.h
==============================================================================
--- vendor/nvi/dist/common/common.h	Fri Apr 10 13:20:31 2015	(r281367)
+++ vendor/nvi/dist/common/common.h	Fri Apr 10 13:26:05 2015	(r281368)
@@ -23,8 +23,8 @@
  */
 typedef struct _cb		CB;
 typedef struct _csc		CSC;
-typedef struct _conv	    	CONV;
-typedef struct _conv_win    	CONVWIN;
+typedef struct _conv		CONV;
+typedef struct _conv_win	CONVWIN;
 typedef struct _event		EVENT;
 typedef struct _excmd		EXCMD;
 typedef struct _exf		EXF;

Modified: vendor/nvi/dist/common/conv.c
==============================================================================
--- vendor/nvi/dist/common/conv.c	Fri Apr 10 13:20:31 2015	(r281367)
+++ vendor/nvi/dist/common/conv.c	Fri Apr 10 13:26:05 2015	(r281368)
@@ -12,7 +12,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: conv.c,v 2.39 2013/07/01 23:28:13 zy Exp $";
+static const char sccsid[] = "$Id: conv.c,v 2.40 2014/02/27 16:25:29 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -36,35 +36,37 @@ static const char sccsid[] = "$Id: conv.
  * codeset --
  *	Get the locale encoding.
  *
- * PUBLIC: char * codeset __P((void));
+ * PUBLIC: char * codeset(void);
  */
 char *
-codeset(void) {
-    static char *cs;
+codeset(void)
+{
+	static char *cs;
+
+	if (cs == NULL)
+		cs = nl_langinfo(CODESET);
 
-    if (cs == NULL)
-	cs = nl_langinfo(CODESET);
-    return cs;
+	return cs;
 }
 
 #ifdef USE_WIDECHAR
 static int 
-raw2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw,
-	size_t *tolen, CHAR_T **dst)
+raw2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen,
+    CHAR_T **dst)
 {
-    int i;
-    CHAR_T **tostr = &cw->bp1.wc;
-    size_t  *blen = &cw->blen1;
+	int i;
+	CHAR_T **tostr = &cw->bp1.wc;
+	size_t  *blen = &cw->blen1;
 
-    BINC_RETW(NULL, *tostr, *blen, len);
+	BINC_RETW(NULL, *tostr, *blen, len);
 
-    *tolen = len;
-    for (i = 0; i < len; ++i)
-	(*tostr)[i] = (u_char) str[i];
+	*tolen = len;
+	for (i = 0; i < len; ++i)
+		(*tostr)[i] = (u_char) str[i];
 
-    *dst = cw->bp1.wc;
+	*dst = cw->bp1.wc;
 
-    return 0;
+	return 0;
 }
 
 #define CONV_BUFFER_SIZE    512
@@ -73,27 +75,27 @@ raw2int(SCR *sp, const char * str, ssize
  * len contains the number of bytes put in the buffer
  */
 #ifdef USE_ICONV
-#define CONVERT(str, left, src, len)				    	\
-    do {								\
-	size_t outleft;							\
-	char *bp = buffer;						\
-	outleft = CONV_BUFFER_SIZE;					\
-	errno = 0;							\
-	if (iconv(id, (iconv_src_t)&str, &left, &bp, &outleft) == -1 &&	\
-		errno != E2BIG)						\
-	    goto err;							\
-	if ((len = CONV_BUFFER_SIZE - outleft) == 0) {			\
-	    error = -left;						\
-	    goto err;							\
-	}				    				\
-	src = buffer;							\
-    } while (0)
+#define CONVERT(str, left, src, len)					\
+	do {								\
+		size_t outleft;						\
+		char *bp = buffer;					\
+		outleft = CONV_BUFFER_SIZE;				\
+		errno = 0;						\
+		if (iconv(id, (iconv_src_t)&str, &left, &bp, &outleft)	\
+		    == -1 && errno != E2BIG)				\
+			goto err;					\
+		if ((len = CONV_BUFFER_SIZE - outleft) == 0) {		\
+			error = -left;					\
+			goto err;					\
+		}							\
+		src = buffer;						\
+	} while (0)
 
 #define IC_RESET()							\
-    do {								\
-	if (id != (iconv_t)-1)						\
-	    iconv(id, NULL, NULL, NULL, NULL);				\
-    } while(0)
+	do {								\
+		if (id != (iconv_t)-1)					\
+			iconv(id, NULL, NULL, NULL, NULL);		\
+	} while(0)
 #else
 #define CONVERT(str, left, src, len)
 #define IC_RESET()
@@ -101,114 +103,116 @@ raw2int(SCR *sp, const char * str, ssize
 
 static int 
 default_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, 
-		size_t *tolen, CHAR_T **dst, iconv_t id)
+    size_t *tolen, CHAR_T **dst, iconv_t id)
 {
-    size_t i = 0, j;
-    CHAR_T **tostr = &cw->bp1.wc;
-    size_t  *blen = &cw->blen1;
-    mbstate_t mbs;
-    size_t   n;
-    ssize_t  nlen = len;
-    char *src = (char *)str;
+	size_t i = 0, j;
+	CHAR_T **tostr = &cw->bp1.wc;
+	size_t *blen = &cw->blen1;
+	mbstate_t mbs;
+	size_t n;
+	ssize_t nlen = len;
+	char *src = (char *)str;
 #ifdef USE_ICONV
-    char	buffer[CONV_BUFFER_SIZE];
+	char buffer[CONV_BUFFER_SIZE];
 #endif
-    size_t	left = len;
-    int		error = 1;
+	size_t left = len;
+	int error = 1;
 
-    BZERO(&mbs, 1);
-    BINC_RETW(NULL, *tostr, *blen, nlen);
+	BZERO(&mbs, 1);
+	BINC_RETW(NULL, *tostr, *blen, nlen);
 
 #ifdef USE_ICONV
-    if (id != (iconv_t)-1)
-	CONVERT(str, left, src, len);
+	if (id != (iconv_t)-1)
+		CONVERT(str, left, src, len);
 #endif
 
-    for (i = 0, j = 0; j < len; ) {
-	n = mbrtowc((*tostr)+i, src+j, len-j, &mbs);
-	/* NULL character converted */
-	if (n == -2) error = -(len-j);
-	if (n == -1 || n == -2) goto err;
-	if (n == 0) n = 1;
-	j += n;
-	if (++i >= *blen) {
-	    nlen += 256;
-	    BINC_RETW(NULL, *tostr, *blen, nlen);
-	}
-	if (id != (iconv_t)-1 && j == len && left) {
-	    CONVERT(str, left, src, len);
-	    j = 0;
+	for (i = 0, j = 0; j < len; ) {
+		n = mbrtowc((*tostr)+i, src+j, len-j, &mbs);
+		/* NULL character converted */
+		if (n == -2)
+			error = -(len-j);
+		if (n == -1 || n == -2)
+			goto err;
+		if (n == 0)
+			n = 1;
+		j += n;
+		if (++i >= *blen) {
+			nlen += 256;
+			BINC_RETW(NULL, *tostr, *blen, nlen);
+		}
+		if (id != (iconv_t)-1 && j == len && left) {
+			CONVERT(str, left, src, len);
+			j = 0;
+		}
 	}
-    }
 
-    error = 0;
+	error = 0;
 err:
-    *tolen = i;
-    *dst = cw->bp1.wc;
-    IC_RESET();
+	*tolen = i;
+	*dst = cw->bp1.wc;
+	IC_RESET();
 
-    return error;
+	return error;
 }
 
 static int 
-fe_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, 
-	    size_t *tolen, CHAR_T **dst)
+fe_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen,
+    CHAR_T **dst)
 {
-    return default_char2int(sp, str, len, cw, tolen, dst,
-	sp->conv.id[IC_FE_CHAR2INT]);
+	return default_char2int(sp, str, len, cw, tolen, dst,
+	    sp->conv.id[IC_FE_CHAR2INT]);
 }
 
 static int 
-ie_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, 
-	    size_t *tolen, CHAR_T **dst)
+ie_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen,
+    CHAR_T **dst)
 {
-    return default_char2int(sp, str, len, cw, tolen, dst,
-	sp->conv.id[IC_IE_CHAR2INT]);
+	return default_char2int(sp, str, len, cw, tolen, dst,
+	    sp->conv.id[IC_IE_CHAR2INT]);
 }
 
 static int 
-cs_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, 
-	    size_t *tolen, CHAR_T **dst)
+cs_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen,
+    CHAR_T **dst)
 {
-    return default_char2int(sp, str, len, cw, tolen, dst,
-	(iconv_t)-1);
+	return default_char2int(sp, str, len, cw, tolen, dst, (iconv_t)-1);
 }
 
 static int 
-int2raw(SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw,
-	size_t *tolen, char **dst)
+int2raw(SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw, size_t *tolen,
+    char **dst)
 {
-    int i;
-    char **tostr = &cw->bp1.c;
-    size_t  *blen = &cw->blen1;
+	int i;
+	char **tostr = &cw->bp1.c;
+	size_t  *blen = &cw->blen1;
 
-    BINC_RETC(NULL, *tostr, *blen, len);
+	BINC_RETC(NULL, *tostr, *blen, len);
 
-    *tolen = len;
-    for (i = 0; i < len; ++i)
-	(*tostr)[i] = str[i];
+	*tolen = len;
+	for (i = 0; i < len; ++i)
+		(*tostr)[i] = str[i];
 
-    *dst = cw->bp1.c;
+	*dst = cw->bp1.c;
 
-    return 0;
+	return 0;
 }
 
 static int 
 default_int2char(SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw, 
-		size_t *tolen, char **pdst, iconv_t id)
+    size_t *tolen, char **pdst, iconv_t id)
 {
-    size_t i, j, offset = 0;
-    char **tostr = &cw->bp1.c;
-    size_t  *blen = &cw->blen1;
-    mbstate_t mbs;
-    size_t n;
-    ssize_t  nlen = len + MB_CUR_MAX;
-    char *dst;
-    size_t buflen;
+	size_t i, j, offset = 0;
+	char **tostr = &cw->bp1.c;
+	size_t *blen = &cw->blen1;
+	mbstate_t mbs;
+	size_t n;
+	ssize_t  nlen = len + MB_CUR_MAX;
+	char *dst;
+	size_t buflen;
 #ifdef USE_ICONV
-    char	buffer[CONV_BUFFER_SIZE];
+	char buffer[CONV_BUFFER_SIZE];
 #endif
-    int		error = 1;
+	int error = 1;
 
 /* convert first len bytes of buffer and append it to cw->bp
  * len is adjusted => 0

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

From owner-svn-src-vendor@FreeBSD.ORG  Fri Apr 10 13:28:03 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 28E2EA3C;
 Fri, 10 Apr 2015 13:28:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0F4627E3;
 Fri, 10 Apr 2015 13:28:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3ADS3HQ098495;
 Fri, 10 Apr 2015 13:28:03 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3ADS1Yr098485;
 Fri, 10 Apr 2015 13:28:01 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201504101328.t3ADS1Yr098485@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 10 Apr 2015 13:28:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r281370 - in vendor/nvi/2.1.3: . catalog cl common docs
 docs/USD.doc docs/internals docs/interp docs/man docs/tutorial ex regex vi
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2015 13:28:03 -0000

Author: bapt
Date: Fri Apr 10 13:28:01 2015
New Revision: 281370
URL: https://svnweb.freebsd.org/changeset/base/281370

Log:
  Tag nvi2 import 2.1.3

Added:
  vendor/nvi/2.1.3/
     - copied from r281364, vendor/nvi/dist/
  vendor/nvi/2.1.3/docs/man/
     - copied from r281368, vendor/nvi/dist/docs/man/
Replaced:
  vendor/nvi/2.1.3/README
     - copied unchanged from r281368, vendor/nvi/dist/README
  vendor/nvi/2.1.3/catalog/dump.c
     - copied unchanged from r281368, vendor/nvi/dist/catalog/dump.c
  vendor/nvi/2.1.3/cl/cl.h
     - copied unchanged from r281368, vendor/nvi/dist/cl/cl.h
  vendor/nvi/2.1.3/cl/cl_funcs.c
     - copied unchanged from r281368, vendor/nvi/dist/cl/cl_funcs.c
  vendor/nvi/2.1.3/cl/cl_main.c
     - copied unchanged from r281368, vendor/nvi/dist/cl/cl_main.c
  vendor/nvi/2.1.3/cl/cl_read.c
     - copied unchanged from r281368, vendor/nvi/dist/cl/cl_read.c
  vendor/nvi/2.1.3/cl/cl_screen.c
     - copied unchanged from r281368, vendor/nvi/dist/cl/cl_screen.c
  vendor/nvi/2.1.3/cl/cl_term.c
     - copied unchanged from r281368, vendor/nvi/dist/cl/cl_term.c
  vendor/nvi/2.1.3/cl/extern.h
     - copied unchanged from r281368, vendor/nvi/dist/cl/extern.h
  vendor/nvi/2.1.3/common/common.h
     - copied unchanged from r281368, vendor/nvi/dist/common/common.h
  vendor/nvi/2.1.3/common/conv.c
     - copied unchanged from r281368, vendor/nvi/dist/common/conv.c
  vendor/nvi/2.1.3/common/cut.c
     - copied unchanged from r281368, vendor/nvi/dist/common/cut.c
  vendor/nvi/2.1.3/common/delete.c
     - copied unchanged from r281368, vendor/nvi/dist/common/delete.c
  vendor/nvi/2.1.3/common/encoding.c
     - copied unchanged from r281368, vendor/nvi/dist/common/encoding.c
  vendor/nvi/2.1.3/common/exf.c
     - copied unchanged from r281368, vendor/nvi/dist/common/exf.c
  vendor/nvi/2.1.3/common/extern.h
     - copied unchanged from r281368, vendor/nvi/dist/common/extern.h
  vendor/nvi/2.1.3/common/gs.h
     - copied unchanged from r281368, vendor/nvi/dist/common/gs.h
  vendor/nvi/2.1.3/common/key.c
     - copied unchanged from r281368, vendor/nvi/dist/common/key.c
  vendor/nvi/2.1.3/common/line.c
     - copied unchanged from r281368, vendor/nvi/dist/common/line.c
  vendor/nvi/2.1.3/common/log.c
     - copied unchanged from r281368, vendor/nvi/dist/common/log.c
  vendor/nvi/2.1.3/common/main.c
     - copied unchanged from r281368, vendor/nvi/dist/common/main.c
  vendor/nvi/2.1.3/common/mark.c
     - copied unchanged from r281368, vendor/nvi/dist/common/mark.c
  vendor/nvi/2.1.3/common/msg.c
     - copied unchanged from r281368, vendor/nvi/dist/common/msg.c
  vendor/nvi/2.1.3/common/options.c
     - copied unchanged from r281368, vendor/nvi/dist/common/options.c
  vendor/nvi/2.1.3/common/options.h
     - copied unchanged from r281368, vendor/nvi/dist/common/options.h
  vendor/nvi/2.1.3/common/options_f.c
     - copied unchanged from r281368, vendor/nvi/dist/common/options_f.c
  vendor/nvi/2.1.3/common/put.c
     - copied unchanged from r281368, vendor/nvi/dist/common/put.c
  vendor/nvi/2.1.3/common/recover.c
     - copied unchanged from r281368, vendor/nvi/dist/common/recover.c
  vendor/nvi/2.1.3/common/screen.c
     - copied unchanged from r281368, vendor/nvi/dist/common/screen.c
  vendor/nvi/2.1.3/common/search.c
     - copied unchanged from r281368, vendor/nvi/dist/common/search.c
  vendor/nvi/2.1.3/common/seq.c
     - copied unchanged from r281368, vendor/nvi/dist/common/seq.c
  vendor/nvi/2.1.3/common/util.c
     - copied unchanged from r281368, vendor/nvi/dist/common/util.c
  vendor/nvi/2.1.3/ex/ex.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex.c
  vendor/nvi/2.1.3/ex/ex.h
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex.h
  vendor/nvi/2.1.3/ex/ex_abbrev.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_abbrev.c
  vendor/nvi/2.1.3/ex/ex_append.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_append.c
  vendor/nvi/2.1.3/ex/ex_args.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_args.c
  vendor/nvi/2.1.3/ex/ex_argv.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_argv.c
  vendor/nvi/2.1.3/ex/ex_at.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_at.c
  vendor/nvi/2.1.3/ex/ex_bang.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_bang.c
  vendor/nvi/2.1.3/ex/ex_cd.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_cd.c
  vendor/nvi/2.1.3/ex/ex_cscope.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_cscope.c
  vendor/nvi/2.1.3/ex/ex_delete.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_delete.c
  vendor/nvi/2.1.3/ex/ex_display.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_display.c
  vendor/nvi/2.1.3/ex/ex_edit.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_edit.c
  vendor/nvi/2.1.3/ex/ex_equal.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_equal.c
  vendor/nvi/2.1.3/ex/ex_file.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_file.c
  vendor/nvi/2.1.3/ex/ex_filter.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_filter.c
  vendor/nvi/2.1.3/ex/ex_global.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_global.c
  vendor/nvi/2.1.3/ex/ex_init.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_init.c
  vendor/nvi/2.1.3/ex/ex_join.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_join.c
  vendor/nvi/2.1.3/ex/ex_map.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_map.c
  vendor/nvi/2.1.3/ex/ex_mark.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_mark.c
  vendor/nvi/2.1.3/ex/ex_mkexrc.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_mkexrc.c
  vendor/nvi/2.1.3/ex/ex_move.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_move.c
  vendor/nvi/2.1.3/ex/ex_open.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_open.c
  vendor/nvi/2.1.3/ex/ex_preserve.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_preserve.c
  vendor/nvi/2.1.3/ex/ex_print.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_print.c
  vendor/nvi/2.1.3/ex/ex_put.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_put.c
  vendor/nvi/2.1.3/ex/ex_quit.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_quit.c
  vendor/nvi/2.1.3/ex/ex_read.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_read.c
  vendor/nvi/2.1.3/ex/ex_screen.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_screen.c
  vendor/nvi/2.1.3/ex/ex_script.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_script.c
  vendor/nvi/2.1.3/ex/ex_set.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_set.c
  vendor/nvi/2.1.3/ex/ex_shell.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_shell.c
  vendor/nvi/2.1.3/ex/ex_shift.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_shift.c
  vendor/nvi/2.1.3/ex/ex_source.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_source.c
  vendor/nvi/2.1.3/ex/ex_stop.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_stop.c
  vendor/nvi/2.1.3/ex/ex_subst.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_subst.c
  vendor/nvi/2.1.3/ex/ex_tag.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_tag.c
  vendor/nvi/2.1.3/ex/ex_txt.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_txt.c
  vendor/nvi/2.1.3/ex/ex_undo.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_undo.c
  vendor/nvi/2.1.3/ex/ex_usage.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_usage.c
  vendor/nvi/2.1.3/ex/ex_util.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_util.c
  vendor/nvi/2.1.3/ex/ex_version.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_version.c
  vendor/nvi/2.1.3/ex/ex_visual.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_visual.c
  vendor/nvi/2.1.3/ex/ex_write.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_write.c
  vendor/nvi/2.1.3/ex/ex_yank.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_yank.c
  vendor/nvi/2.1.3/ex/ex_z.c
     - copied unchanged from r281368, vendor/nvi/dist/ex/ex_z.c
  vendor/nvi/2.1.3/ex/extern.h
     - copied unchanged from r281368, vendor/nvi/dist/ex/extern.h
  vendor/nvi/2.1.3/ex/version.h
     - copied unchanged from r281368, vendor/nvi/dist/ex/version.h
  vendor/nvi/2.1.3/regex/COPYRIGHT
     - copied unchanged from r281368, vendor/nvi/dist/regex/COPYRIGHT
  vendor/nvi/2.1.3/regex/cclass.h
     - copied unchanged from r281368, vendor/nvi/dist/regex/cclass.h
  vendor/nvi/2.1.3/regex/cname.h
     - copied unchanged from r281368, vendor/nvi/dist/regex/cname.h
  vendor/nvi/2.1.3/regex/engine.c
     - copied unchanged from r281368, vendor/nvi/dist/regex/engine.c
  vendor/nvi/2.1.3/regex/re_format.7
     - copied unchanged from r281368, vendor/nvi/dist/regex/re_format.7
  vendor/nvi/2.1.3/regex/regcomp.c
     - copied unchanged from r281368, vendor/nvi/dist/regex/regcomp.c
  vendor/nvi/2.1.3/regex/regerror.c
     - copied unchanged from r281368, vendor/nvi/dist/regex/regerror.c
  vendor/nvi/2.1.3/regex/regex.3
     - copied unchanged from r281368, vendor/nvi/dist/regex/regex.3
  vendor/nvi/2.1.3/regex/regex.h
     - copied unchanged from r281368, vendor/nvi/dist/regex/regex.h
  vendor/nvi/2.1.3/regex/regex2.h
     - copied unchanged from r281368, vendor/nvi/dist/regex/regex2.h
  vendor/nvi/2.1.3/regex/regexec.c
     - copied unchanged from r281368, vendor/nvi/dist/regex/regexec.c
  vendor/nvi/2.1.3/regex/regfree.c
     - copied unchanged from r281368, vendor/nvi/dist/regex/regfree.c
  vendor/nvi/2.1.3/regex/utils.h
     - copied unchanged from r281368, vendor/nvi/dist/regex/utils.h
  vendor/nvi/2.1.3/vi/extern.h
     - copied unchanged from r281368, vendor/nvi/dist/vi/extern.h
  vendor/nvi/2.1.3/vi/getc.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/getc.c
  vendor/nvi/2.1.3/vi/v_at.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_at.c
  vendor/nvi/2.1.3/vi/v_ch.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_ch.c
  vendor/nvi/2.1.3/vi/v_delete.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_delete.c
  vendor/nvi/2.1.3/vi/v_ex.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_ex.c
  vendor/nvi/2.1.3/vi/v_increment.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_increment.c
  vendor/nvi/2.1.3/vi/v_init.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_init.c
  vendor/nvi/2.1.3/vi/v_itxt.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_itxt.c
  vendor/nvi/2.1.3/vi/v_left.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_left.c
  vendor/nvi/2.1.3/vi/v_mark.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_mark.c
  vendor/nvi/2.1.3/vi/v_match.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_match.c
  vendor/nvi/2.1.3/vi/v_paragraph.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_paragraph.c
  vendor/nvi/2.1.3/vi/v_put.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_put.c
  vendor/nvi/2.1.3/vi/v_redraw.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_redraw.c
  vendor/nvi/2.1.3/vi/v_replace.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_replace.c
  vendor/nvi/2.1.3/vi/v_right.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_right.c
  vendor/nvi/2.1.3/vi/v_screen.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_screen.c
  vendor/nvi/2.1.3/vi/v_scroll.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_scroll.c
  vendor/nvi/2.1.3/vi/v_search.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_search.c
  vendor/nvi/2.1.3/vi/v_section.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_section.c
  vendor/nvi/2.1.3/vi/v_sentence.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_sentence.c
  vendor/nvi/2.1.3/vi/v_status.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_status.c
  vendor/nvi/2.1.3/vi/v_txt.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_txt.c
  vendor/nvi/2.1.3/vi/v_ulcase.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_ulcase.c
  vendor/nvi/2.1.3/vi/v_undo.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_undo.c
  vendor/nvi/2.1.3/vi/v_util.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_util.c
  vendor/nvi/2.1.3/vi/v_word.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_word.c
  vendor/nvi/2.1.3/vi/v_xchar.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_xchar.c
  vendor/nvi/2.1.3/vi/v_yank.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_yank.c
  vendor/nvi/2.1.3/vi/v_z.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_z.c
  vendor/nvi/2.1.3/vi/v_zexit.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/v_zexit.c
  vendor/nvi/2.1.3/vi/vi.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/vi.c
  vendor/nvi/2.1.3/vi/vi.h
     - copied unchanged from r281368, vendor/nvi/dist/vi/vi.h
  vendor/nvi/2.1.3/vi/vs_line.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/vs_line.c
  vendor/nvi/2.1.3/vi/vs_msg.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/vs_msg.c
  vendor/nvi/2.1.3/vi/vs_refresh.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/vs_refresh.c
  vendor/nvi/2.1.3/vi/vs_relative.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/vs_relative.c
  vendor/nvi/2.1.3/vi/vs_smap.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/vs_smap.c
  vendor/nvi/2.1.3/vi/vs_split.c
     - copied unchanged from r281368, vendor/nvi/dist/vi/vs_split.c
Deleted:
  vendor/nvi/2.1.3/catalog/spell.ok
  vendor/nvi/2.1.3/docs/TODO
  vendor/nvi/2.1.3/docs/USD.doc/
  vendor/nvi/2.1.3/docs/changelog
  vendor/nvi/2.1.3/docs/ev
  vendor/nvi/2.1.3/docs/features
  vendor/nvi/2.1.3/docs/help
  vendor/nvi/2.1.3/docs/internals/
  vendor/nvi/2.1.3/docs/interp/
  vendor/nvi/2.1.3/docs/spell.ok
  vendor/nvi/2.1.3/docs/tutorial/

Copied: vendor/nvi/2.1.3/README (from r281368, vendor/nvi/dist/README)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/nvi/2.1.3/README	Fri Apr 10 13:28:01 2015	(r281370, copy of r281368, vendor/nvi/dist/README)
@@ -0,0 +1,66 @@
+#	$Id: README,v 9.2 2015/04/08 17:18:56 zy Exp $
+
+This is version 2.1.3 (2015-04-08) of nex/nvi, a reimplementation of the ex/vi
+text editors originally distributed as part of the Fourth Berkeley
+Software Distribution (4BSD), by the University of California, Berkeley.
+
+The directory layout is as follows:
+
+    LICENSE ....... Copyright, use and redistribution information.
+    README ........ This file.
+    build ......... Build directory.
+    catalog ....... Message catalogs; see catalog/README.
+    cl ............ Vi interface to the curses(3) library.
+    common ........ Code shared by ex and vi.
+    docs .......... Ex/vi documentation, both current and historic.
+    ex ............ Ex source code.
+    regex ......... Modified regex library with wide character support.
+    vi ............ Vi source code.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+o Nvi was written by Keith Bostic, and the last version is 1.79.  After that,
+
+	Sven Verdoolaege added the iconv support and the DB3 locking.
+
+	Jun-ichiro itojun Hagino developed the file encoding detection
+	techniques in his nvi-m17n.
+
+The following acknowledgments were written by Keith Bostic:
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+o This software is several years old and is the product of many folks' work.  
+
+	This software was originally derived from software contributed to
+	the University of California, Berkeley by Steve Kirkendall, the
+	author of the vi clone elvis.  Without his work, this work would
+	have been far more difficult.
+
+	IEEE POSIX 1003.2 style regular expression support is courtesy of
+	Henry Spencer, for which I am *very* grateful.
+
+	Elan Amir did the original 4BSD curses work that made it possible
+	to support a full-screen editor using curses.
+
+	George Neville-Neil added the Tcl interpreter, and the initial
+	interpreter design was his.
+
+	Sven Verdoolaege added the Perl interpreter.
+
+	Rob Mayoff provided the original Cscope support.
+
+o Many, many people suggested enhancements, and provided bug reports and
+  testing, far too many to individually thank.
+
+o From the original vi acknowledgements, by William Joy and Mark Horton:
+
+	Bruce Englar encouraged the early development of this display
+	editor.  Peter Kessler helped bring sanity to version 2's
+	command layout.  Bill Joy wrote versions 1 and 2.0 through 2.7,
+	and created the framework that users see in the present editor.
+	Mark Horton added macros and other features and made the editor
+	work on a large number of terminals and Unix systems.
+
+o And...
+	The financial support of UUNET Communications Services is gratefully
+	acknowledged.

Copied: vendor/nvi/2.1.3/catalog/dump.c (from r281368, vendor/nvi/dist/catalog/dump.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/nvi/2.1.3/catalog/dump.c	Fri Apr 10 13:28:01 2015	(r281370, copy of r281368, vendor/nvi/dist/catalog/dump.c)
@@ -0,0 +1,101 @@
+/*-
+ * Copyright (c) 1992, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND 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.
+ */
+
+#ifndef lint
+static char sccsid[] = "$Id: dump.c,v 8.2 2011/07/14 00:05:25 zy Exp $";
+#endif /* not lint */
+
+#include <ctype.h>
+#include <stdio.h>
+
+static void
+parse(FILE *fp)
+{
+	int ch, s1, s2, s3;
+
+#define	TESTD(s) {							\
+	if ((s = getc(fp)) == EOF)					\
+		return;							\
+	if (!isdigit(s))						\
+		continue;						\
+}
+#define	TESTP {								\
+	if ((ch = getc(fp)) == EOF)					\
+		return;							\
+	if (ch != '|')							\
+		continue;						\
+}
+#define	MOVEC(t) {							\
+	do {								\
+		if ((ch = getc(fp)) == EOF)				\
+			return;						\
+	} while (ch != (t));						\
+}
+	for (;;) {
+		MOVEC('"');
+		TESTD(s1);
+		TESTD(s2);
+		TESTD(s3);
+		TESTP;
+		putchar('"');
+		putchar(s1);
+		putchar(s2);
+		putchar(s3);
+		putchar('|');
+		for (;;) {		/* dump to end quote. */
+			if ((ch = getc(fp)) == EOF)
+				return;
+			putchar(ch);
+			if (ch == '"')
+				break;
+			if (ch == '\\') {
+				if ((ch = getc(fp)) == EOF)
+					return;
+				putchar(ch);
+			}
+		}
+		putchar('\n');
+	}
+}
+
+int
+main(int argc, char *argv[])
+{
+	FILE *fp;
+
+	for (; *argv != NULL; ++argv) {
+		if ((fp = fopen(*argv, "r")) == NULL) {
+			perror(*argv);
+			return (1);
+		}
+		parse(fp);
+		(void)fclose(fp);
+	}
+	return (0);
+}

Copied: vendor/nvi/2.1.3/cl/cl.h (from r281368, vendor/nvi/dist/cl/cl.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/nvi/2.1.3/cl/cl.h	Fri Apr 10 13:28:01 2015	(r281370, copy of r281368, vendor/nvi/dist/cl/cl.h)
@@ -0,0 +1,83 @@
+/*-
+ * Copyright (c) 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1993, 1994, 1995, 1996
+ *	Keith Bostic.  All rights reserved.
+ *
+ * See the LICENSE file for redistribution information.
+ *
+ *	$Id: cl.h,v 10.34 2011/08/15 20:07:32 zy Exp $
+ */
+
+#ifdef USE_WIDECHAR
+#define _XOPEN_SOURCE_EXTENDED
+#endif
+#ifdef HAVE_NCURSES_H
+#include <ncurses.h>
+#else
+#include <curses.h>
+#endif
+
+typedef struct _cl_private {
+	char	 ibuf[256];	/* Input keys. */
+
+	size_t	 skip;		/* Remaining keys. */
+
+	CONVWIN	 cw;		/* Conversion buffer. */
+
+	int	 eof_count;	/* EOF count. */
+
+	struct termios orig;	/* Original terminal values. */
+	struct termios ex_enter;/* Terminal values to enter ex. */
+	struct termios vi_enter;/* Terminal values to enter vi. */
+
+	char	*el;		/* Clear to EOL terminal string. */
+	char	*cup;		/* Cursor movement terminal string. */
+	char	*cuu1;		/* Cursor up terminal string. */
+	char	*rmso, *smso;	/* Inverse video terminal strings. */
+	char	*smcup, *rmcup;	/* Terminal start/stop strings. */
+
+	char	*oname;		/* Original screen window name. */
+
+	SCR	*focus;		/* Screen that has the "focus". */
+
+	int	 killersig;	/* Killer signal. */
+#define	INDX_HUP	0
+#define	INDX_INT	1
+#define	INDX_TERM	2
+#define	INDX_WINCH	3
+#define	INDX_MAX	4	/* Original signal information. */
+	struct sigaction oact[INDX_MAX];
+
+	enum {			/* Tty group write mode. */
+	    TGW_UNKNOWN=0, TGW_SET, TGW_UNSET } tgw;
+
+	enum {			/* Terminal initialization strings. */
+	    TE_SENT=0, TI_SENT } ti_te;
+
+#define	CL_IN_EX	0x0001	/* Currently running ex. */
+#define	CL_LAYOUT	0x0002	/* Screen layout changed. */
+#define	CL_RENAME	0x0004	/* X11 xterm icon/window renamed. */
+#define	CL_RENAME_OK	0x0008	/* User wants the windows renamed. */
+#define	CL_SCR_EX_INIT	0x0010	/* Ex screen initialized. */
+#define	CL_SCR_VI_INIT	0x0020	/* Vi screen initialized. */
+#define	CL_SIGHUP	0x0040	/* SIGHUP arrived. */
+#define	CL_SIGINT	0x0080	/* SIGINT arrived. */
+#define	CL_SIGTERM	0x0100	/* SIGTERM arrived. */
+#define	CL_SIGWINCH	0x0200	/* SIGWINCH arrived. */
+#define	CL_STDIN_TTY	0x0400	/* Talking to a terminal. */
+	u_int32_t flags;
+} CL_PRIVATE;
+
+#define	CLP(sp)		((CL_PRIVATE *)((sp)->gp->cl_private))
+#define	GCLP(gp)	((CL_PRIVATE *)gp->cl_private)
+#define	CLSP(sp)	((WINDOW *)((sp)->cl_private))
+
+/* Return possibilities from the keyboard read routine. */
+typedef enum { INP_OK=0, INP_EOF, INP_ERR, INP_INTR, INP_TIMEOUT } input_t;
+
+/* The screen position relative to a specific window. */
+#define	RCNO(sp, cno)	(cno)
+#define	RLNO(sp, lno)	(lno)
+
+#include "extern.h"

Copied: vendor/nvi/2.1.3/cl/cl_funcs.c (from r281368, vendor/nvi/dist/cl/cl_funcs.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/nvi/2.1.3/cl/cl_funcs.c	Fri Apr 10 13:28:01 2015	(r281370, copy of r281368, vendor/nvi/dist/cl/cl_funcs.c)
@@ -0,0 +1,852 @@
+/*-
+ * Copyright (c) 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1993, 1994, 1995, 1996
+ *	Keith Bostic.  All rights reserved.
+ *
+ * See the LICENSE file for redistribution information.
+ */
+
+#include "config.h"
+
+#ifndef lint
+static const char sccsid[] = "$Id: cl_funcs.c,v 10.74 2012/10/11 10:30:16 zy Exp $";
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/time.h>
+
+#include <bitstring.h>
+#include <ctype.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_TERM_H
+#include <term.h>
+#endif
+#include <termios.h>
+#include <unistd.h>
+
+#include "../common/common.h"
+#include "../vi/vi.h"
+#include "cl.h"
+
+static void cl_rdiv(SCR *);
+
+static int 
+addstr4(SCR *sp, void *str, size_t len, int wide)
+{
+	CL_PRIVATE *clp;
+	WINDOW *win;
+	size_t y, x;
+	int iv;
+
+	clp = CLP(sp);
+	win = CLSP(sp) ? CLSP(sp) : stdscr;
+
+	/*
+	 * If ex isn't in control, it's the last line of the screen and
+	 * it's a split screen, use inverse video.
+	 */
+	iv = 0;
+	getyx(win, y, x);
+	if (!F_ISSET(sp, SC_SCR_EXWROTE) &&
+	    y == RLNO(sp, LASTLINE(sp)) && IS_SPLIT(sp)) {
+		iv = 1;
+		(void)wstandout(win);
+	}
+
+#ifdef USE_WIDECHAR
+	if (wide) {
+	    if (waddnwstr(win, str, len) == ERR)
+		return (1);
+	} else 
+#endif
+	    if (waddnstr(win, str, len) == ERR)
+		    return (1);
+
+	if (iv)
+		(void)wstandend(win);
+	return (0);
+}
+
+/*
+ * cl_waddstr --
+ *	Add len bytes from the string at the cursor, advancing the cursor.
+ *
+ * PUBLIC: int cl_waddstr(SCR *, const CHAR_T *, size_t);
+ */
+int
+cl_waddstr(SCR *sp, const CHAR_T *str, size_t len)
+{
+	return addstr4(sp, (void *)str, len, 1);
+}
+
+/*
+ * cl_addstr --
+ *	Add len bytes from the string at the cursor, advancing the cursor.
+ *
+ * PUBLIC: int cl_addstr(SCR *, const char *, size_t);
+ */
+int
+cl_addstr(SCR *sp, const char *str, size_t len)
+{
+	return addstr4(sp, (void *)str, len, 0);
+}
+
+/*
+ * cl_attr --
+ *	Toggle a screen attribute on/off.
+ *
+ * PUBLIC: int cl_attr(SCR *, scr_attr_t, int);
+ */
+int
+cl_attr(SCR *sp, scr_attr_t attribute, int on)
+{
+	CL_PRIVATE *clp;
+	WINDOW *win;
+
+	clp = CLP(sp);
+	win = CLSP(sp) ? CLSP(sp) : stdscr;
+
+	switch (attribute) {
+	case SA_ALTERNATE:
+	/*
+	 * !!!
+	 * There's a major layering violation here.  The problem is that the
+	 * X11 xterm screen has what's known as an "alternate" screen.  Some
+	 * xterm termcap/terminfo entries include sequences to switch to/from
+	 * that alternate screen as part of the ti/te (smcup/rmcup) strings.
+	 * Vi runs in the alternate screen, so that you are returned to the
+	 * same screen contents on exit from vi that you had when you entered
+	 * vi.  Further, when you run :shell, or :!date or similar ex commands,
+	 * you also see the original screen contents.  This wasn't deliberate
+	 * on vi's part, it's just that it historically sent terminal init/end
+	 * sequences at those times, and the addition of the alternate screen
+	 * sequences to the strings changed the behavior of vi.  The problem
+	 * caused by this is that we don't want to switch back to the alternate
+	 * screen while getting a new command from the user, when the user is
+	 * continuing to enter ex commands, e.g.:
+	 *
+	 *	:!date				<<< switch to original screen
+	 *	[Hit return to continue]	<<< prompt user to continue
+	 *	:command			<<< get command from user
+	 *
+	 * Note that the :command input is a true vi input mode, e.g., input
+	 * maps and abbreviations are being done.  So, we need to be able to
+	 * switch back into the vi screen mode, without flashing the screen. 
+	 *
+	 * To make matters worse, the curses initscr() and endwin() calls will
+	 * do this automatically -- so, this attribute isn't as controlled by
+	 * the higher level screen as closely as one might like.
+	 */
+	if (on) {
+		if (clp->ti_te != TI_SENT) {
+			clp->ti_te = TI_SENT;
+			if (clp->smcup == NULL)
+				(void)cl_getcap(sp, "smcup", &clp->smcup);
+			if (clp->smcup != NULL)
+				(void)tputs(clp->smcup, 1, cl_putchar);
+		}
+	} else
+		if (clp->ti_te != TE_SENT) {
+			clp->ti_te = TE_SENT;
+			if (clp->rmcup == NULL)
+				(void)cl_getcap(sp, "rmcup", &clp->rmcup);
+			if (clp->rmcup != NULL)
+				(void)tputs(clp->rmcup, 1, cl_putchar);
+			(void)fflush(stdout);
+		}
+		(void)fflush(stdout);
+		break;
+	case SA_INVERSE:
+		if (F_ISSET(sp, SC_EX | SC_SCR_EXWROTE)) {
+			if (clp->smso == NULL)
+				return (1);
+			if (on)
+				(void)tputs(clp->smso, 1, cl_putchar);
+			else
+				(void)tputs(clp->rmso, 1, cl_putchar);
+			(void)fflush(stdout);
+		} else {
+			if (on)
+				(void)wstandout(win);
+			else
+				(void)wstandend(win);
+		}
+		break;
+	default:
+		abort();
+	}
+	return (0);
+}
+
+/*
+ * cl_baud --
+ *	Return the baud rate.
+ *
+ * PUBLIC: int cl_baud(SCR *, u_long *);
+ */
+int
+cl_baud(SCR *sp, u_long *ratep)
+{
+	CL_PRIVATE *clp;
+
+	/*
+	 * XXX
+	 * There's no portable way to get a "baud rate" -- cfgetospeed(3)
+	 * returns the value associated with some #define, which we may
+	 * never have heard of, or which may be a purely local speed.  Vi
+	 * only cares if it's SLOW (w300), slow (w1200) or fast (w9600).
+	 * Try and detect the slow ones, and default to fast.
+	 */
+	clp = CLP(sp);
+	switch (cfgetospeed(&clp->orig)) {
+	case B50:
+	case B75:
+	case B110:
+	case B134:
+	case B150:
+	case B200:
+	case B300:
+	case B600:
+		*ratep = 600;
+		break;
+	case B1200:
+		*ratep = 1200;
+		break;
+	default:
+		*ratep = 9600;
+		break;
+	}
+	return (0);
+}
+
+/*
+ * cl_bell --
+ *	Ring the bell/flash the screen.
+ *
+ * PUBLIC: int cl_bell(SCR *);
+ */
+int
+cl_bell(SCR *sp)
+{
+	if (F_ISSET(sp, SC_EX | SC_SCR_EXWROTE | SC_SCR_EX))
+		(void)write(STDOUT_FILENO, "\07", 1);		/* \a */
+	else {
+		/*
+		 * Vi has an edit option which determines if the terminal
+		 * should be beeped or the screen flashed.
+		 */
+		if (O_ISSET(sp, O_FLASH))
+			(void)flash();
+		else
+			(void)beep();
+	}
+	return (0);
+}
+
+/*
+ * cl_clrtoeol --
+ *	Clear from the current cursor to the end of the line.
+ *
+ * PUBLIC: int cl_clrtoeol(SCR *);
+ */
+int
+cl_clrtoeol(SCR *sp)
+{
+	WINDOW *win;
+#if 0
+	size_t spcnt, y, x;
+#endif
+
+	win = CLSP(sp) ? CLSP(sp) : stdscr;
+
+#if 0
+	if (IS_VSPLIT(sp)) {
+		/* The cursor must be returned to its original position. */
+		getyx(win, y, x);
+		for (spcnt = (sp->coff + sp->cols) - x; spcnt > 0; --spcnt)
+			(void)waddch(win, ' ');
+		(void)wmove(win, y, x);
+		return (0);
+	} else
+#endif
+		return (wclrtoeol(win) == ERR);
+}
+
+/*
+ * cl_cursor --
+ *	Return the current cursor position.
+ *
+ * PUBLIC: int cl_cursor(SCR *, size_t *, size_t *);
+ */
+int
+cl_cursor(SCR *sp, size_t *yp, size_t *xp)
+{
+	WINDOW *win;
+	win = CLSP(sp) ? CLSP(sp) : stdscr;
+	/*
+	 * The curses screen support splits a single underlying curses screen
+	 * into multiple screens to support split screen semantics.  For this
+	 * reason the returned value must be adjusted to be relative to the
+	 * current screen, and not absolute.  Screens that implement the split
+	 * using physically distinct screens won't need this hack.
+	 */
+	getyx(win, *yp, *xp);
+	/*
+	*yp -= sp->roff;
+	*xp -= sp->coff;
+	*/
+	return (0);
+}
+
+/*
+ * cl_deleteln --
+ *	Delete the current line, scrolling all lines below it.
+ *
+ * PUBLIC: int cl_deleteln(SCR *);
+ */
+int
+cl_deleteln(SCR *sp)
+{
+	CL_PRIVATE *clp;
+	WINDOW *win;
+	size_t y, x;
+
+	clp = CLP(sp);
+	win = CLSP(sp) ? CLSP(sp) : stdscr;
+
+	/*
+	 * This clause is required because the curses screen uses reverse
+	 * video to delimit split screens.  If the screen does not do this,
+	 * this code won't be necessary.
+	 *
+	 * If the bottom line was in reverse video, rewrite it in normal
+	 * video before it's scrolled.
+	 */
+	if (!F_ISSET(sp, SC_SCR_EXWROTE) && IS_SPLIT(sp)) {
+		getyx(win, y, x);
+		mvwchgat(win, RLNO(sp, LASTLINE(sp)), 0, -1, A_NORMAL, 0, NULL);
+		(void)wmove(win, y, x);
+	}
+
+	/*
+	 * The bottom line is expected to be blank after this operation,
+	 * and other screens must support that semantic.
+	 */
+	return (wdeleteln(win) == ERR);
+}
+
+/* 
+ * cl_discard --
+ *	Discard a screen.
+ *
+ * PUBLIC: int cl_discard(SCR *, SCR **);
+ */
+int
+cl_discard(SCR *discardp, SCR **acquirep)
+{
+	CL_PRIVATE *clp;
+	SCR*	tsp;
+
+	if (discardp) {
+	    clp = CLP(discardp);
+	    F_SET(clp, CL_LAYOUT);
+
+	    if (CLSP(discardp)) {
+		    delwin(CLSP(discardp));
+		    discardp->cl_private = NULL;
+	    }
+	}
+
+	/* no screens got a piece; we're done */
+	if (!acquirep) 
+		return 0;
+
+	for (; (tsp = *acquirep) != NULL; ++acquirep) {
+		clp = CLP(tsp);
+		F_SET(clp, CL_LAYOUT);
+
+		if (CLSP(tsp))
+			delwin(CLSP(tsp));
+		tsp->cl_private = subwin(stdscr, tsp->rows, tsp->cols,
+					   tsp->roff, tsp->coff);
+	}
+
+	/* discardp is going away, acquirep is taking up its space. */
+	return (0);
+}
+
+/* 
+ * cl_ex_adjust --
+ *	Adjust the screen for ex.  This routine is purely for standalone
+ *	ex programs.  All special purpose, all special case.
+ *
+ * PUBLIC: int cl_ex_adjust(SCR *, exadj_t);
+ */
+int
+cl_ex_adjust(SCR *sp, exadj_t action)
+{
+	CL_PRIVATE *clp;
+	int cnt;
+
+	clp = CLP(sp);
+	switch (action) {
+	case EX_TERM_SCROLL:
+		/* Move the cursor up one line if that's possible. */
+		if (clp->cuu1 != NULL)
+			(void)tputs(clp->cuu1, 1, cl_putchar);
+		else if (clp->cup != NULL)
+			(void)tputs(tgoto(clp->cup,
+			    0, LINES - 2), 1, cl_putchar);
+		else
+			return (0);
+		/* FALLTHROUGH */
+	case EX_TERM_CE:
+		/* Clear the line. */
+		if (clp->el != NULL) {
+			(void)putchar('\r');
+			(void)tputs(clp->el, 1, cl_putchar);
+		} else {
+			/*
+			 * Historically, ex didn't erase the line, so, if the
+			 * displayed line was only a single glyph, and <eof>
+			 * was more than one glyph, the output would not fully
+			 * overwrite the user's input.  To fix this, output
+			 * the maxiumum character number of spaces.  Note,
+			 * this won't help if the user entered extra prompt
+			 * or <blank> characters before the command character.
+			 * We'd have to do a lot of work to make that work, and
+			 * it's almost certainly not worth the effort.
+			 */
+			for (cnt = 0; cnt < MAX_CHARACTER_COLUMNS; ++cnt)
+				(void)putchar('\b');
+			for (cnt = 0; cnt < MAX_CHARACTER_COLUMNS; ++cnt)
+				(void)putchar(' ');
+			(void)putchar('\r');
+			(void)fflush(stdout);
+		}
+		break;
+	default:
+		abort();
+	}
+	return (0);
+}
+
+/*
+ * cl_insertln --
+ *	Push down the current line, discarding the bottom line.
+ *
+ * PUBLIC: int cl_insertln(SCR *);
+ */
+int
+cl_insertln(SCR *sp)
+{
+	WINDOW *win;
+	win = CLSP(sp) ? CLSP(sp) : stdscr;
+	/*
+	 * The current line is expected to be blank after this operation,
+	 * and the screen must support that semantic.
+	 */
+	return (winsertln(win) == ERR);
+}
+
+/*
+ * cl_keyval --
+ *	Return the value for a special key.
+ *
+ * PUBLIC: int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *);
+ */
+int
+cl_keyval(SCR *sp, scr_keyval_t val, CHAR_T *chp, int *dnep)
+{
+	CL_PRIVATE *clp;
+
+	/*
+	 * VEOF, VERASE and VKILL are required by POSIX 1003.1-1990,
+	 * VWERASE is a 4BSD extension.
+	 */
+	clp = CLP(sp);
+	switch (val) {
+	case KEY_VEOF:
+		*dnep = (*chp = clp->orig.c_cc[VEOF]) == _POSIX_VDISABLE;
+		break;
+	case KEY_VERASE:
+		*dnep = (*chp = clp->orig.c_cc[VERASE]) == _POSIX_VDISABLE;
+		break;
+	case KEY_VKILL:
+		*dnep = (*chp = clp->orig.c_cc[VKILL]) == _POSIX_VDISABLE;
+		break;
+#ifdef VWERASE
+	case KEY_VWERASE:
+		*dnep = (*chp = clp->orig.c_cc[VWERASE]) == _POSIX_VDISABLE;
+		break;
+#endif
+	default:
+		*dnep = 1;
+		break;
+	}
+	return (0);
+}
+
+/*
+ * cl_move --
+ *	Move the cursor.
+ *
+ * PUBLIC: int cl_move(SCR *, size_t, size_t);
+ */
+int
+cl_move(SCR *sp, size_t lno, size_t cno)
+{
+	WINDOW *win;
+	win = CLSP(sp) ? CLSP(sp) : stdscr;
+	/* See the comment in cl_cursor. */
+	if (wmove(win, RLNO(sp, lno), RCNO(sp, cno)) == ERR) {
+		msgq(sp, M_ERR, "Error: move: l(%zu + %zu) c(%zu + %zu)",
+		    lno, sp->roff, cno, sp->coff);
+		return (1);
+	}
+	return (0);
+}
+
+/*
+ * cl_refresh --
+ *	Refresh the screen.
+ *
+ * PUBLIC: int cl_refresh(SCR *, int);
+ */
+int
+cl_refresh(SCR *sp, int repaint)
+{
+	GS *gp;
+	CL_PRIVATE *clp;
+	WINDOW *win;
+	SCR *psp, *tsp;
+	size_t y, x;
+
+	gp = sp->gp;
+	clp = CLP(sp);
+	win = CLSP(sp) ? CLSP(sp) : stdscr;
+
+	/*
+	 * If we received a killer signal, we're done, there's no point
+	 * in refreshing the screen.
+	 */
+	if (clp->killersig)
+		return (0);
+
+	/*
+	 * If repaint is set, the editor is telling us that we don't know
+	 * what's on the screen, so we have to repaint from scratch.
+	 *
+	 * If repaint set or the screen layout changed, we need to redraw
+	 * any lines separating vertically split screens.  If the horizontal
+	 * offsets are the same, then the split was vertical, and need to
+	 * draw a dividing line.
+	 */
+	if (repaint || F_ISSET(clp, CL_LAYOUT)) {
+		getyx(stdscr, y, x);
+		for (psp = sp; psp != NULL; psp = TAILQ_NEXT(psp, q))
+			for (tsp = TAILQ_NEXT(psp, q); tsp != NULL;
+			    tsp = TAILQ_NEXT(tsp, q))
+				if (psp->roff == tsp->roff) {
+				    if (psp->coff + psp->cols + 1 == tsp->coff)
+					cl_rdiv(psp);
+				    else 
+				    if (tsp->coff + tsp->cols + 1 == psp->coff)
+					cl_rdiv(tsp);
+				}
+		(void)wmove(stdscr, y, x);
+		F_CLR(clp, CL_LAYOUT);
+	}
+
+	/*
+	 * In the curses library, doing wrefresh(curscr) is okay, but the
+	 * screen flashes when we then apply the refresh() to bring it up
+	 * to date.  So, use clearok().
+	 */
+	if (repaint)
+		clearok(curscr, 1);
+	/*
+	 * Only do an actual refresh, when this is the focus window,
+	 * i.e. the one holding the cursor. This assumes that refresh
+	 * is called for that window after refreshing the others.
+	 * This prevents the cursor being drawn in the other windows.
+	 */
+	return (wnoutrefresh(stdscr) == ERR || 
+		wnoutrefresh(win) == ERR || 
+		(sp == clp->focus && doupdate() == ERR));
+}
+
+/*
+ * cl_rdiv --
+ *	Draw a dividing line between two vertically split screens.
+ */
+static void
+cl_rdiv(SCR *sp)
+{
+#ifdef __NetBSD__
+	mvvline(sp->roff, sp->cols + sp->coff, '|', sp->rows);
+#else
+	mvvline(sp->roff, sp->cols + sp->coff, ACS_VLINE, sp->rows);
+#endif
+}
+
+/*
+ * cl_rename --
+ *	Rename the file.
+ *
+ * PUBLIC: int cl_rename(SCR *, char *, int);
+ */
+int
+cl_rename(SCR *sp, char *name, int on)
+{
+	GS *gp;
+	CL_PRIVATE *clp;
+	FILE *pfp;
+	char buf[256], *s, *e;
+	char * wid;
+	char cmd[64];
+
+	gp = sp->gp;
+	clp = CLP(sp);
+
+	/*
+	 * XXX
+	 * We can only rename windows for xterm.
+	 */
+	if (on) {
+		clp->focus = sp;
+		if (!F_ISSET(clp, CL_RENAME_OK) ||
+		    strncmp(OG_STR(gp, GO_TERM), "xterm", 5))
+			return (0);
+
+		if (clp->oname == NULL && (wid = getenv("WINDOWID"))) {
+			snprintf(cmd, sizeof(cmd), "xprop -id %s WM_NAME", wid);
+			if ((pfp = popen(cmd, "r")) == NULL)
+				goto rename;
+			if (fgets(buf, sizeof(buf), pfp) == NULL) {
+				pclose(pfp);
+				goto rename;
+			}
+			pclose(pfp);
+			if ((s = strchr(buf, '"')) != NULL &&
+			    (e = strrchr(buf, '"')) != NULL)
+				clp->oname = strndup(s + 1, e - s - 1);
+		}
+
+rename:		cl_setname(gp, name);
+
+		F_SET(clp, CL_RENAME);
+	} else
+		if (F_ISSET(clp, CL_RENAME)) {
+			cl_setname(gp, clp->oname);
+
+			F_CLR(clp, CL_RENAME);
+		}
+	return (0);
+}
+
+/*
+ * cl_setname --
+ *	Set a X11 icon/window name.
+ *
+ * PUBLIC: void cl_setname(GS *, char *);
+ */
+void
+cl_setname(GS *gp, char *name)
+{
+/* X11 xterm escape sequence to rename the icon/window. */
+#define	XTERM_RENAME	"\033]0;%s\007"
+
+	(void)printf(XTERM_RENAME, name == NULL ? OG_STR(gp, GO_TERM) : name);
+	(void)fflush(stdout);
+#undef XTERM_RENAME
+}
+
+/* 
+ * cl_split --
+ *	Split a screen.
+ *
+ * PUBLIC: int cl_split(SCR *, SCR *);
+ */
+int
+cl_split(SCR *origp, SCR *newp)
+{
+	CL_PRIVATE *clp;
+
+	clp = CLP(origp);
+	F_SET(clp, CL_LAYOUT);
+
+	if (CLSP(origp))
+		delwin(CLSP(origp));
+
+	origp->cl_private = subwin(stdscr, origp->rows, origp->cols,
+				     origp->roff, origp->coff);
+	newp->cl_private = subwin(stdscr, newp->rows, newp->cols,
+				     newp->roff, newp->coff);
+
+	/* origp is the original screen, giving up space to newp. */
+	return (0);
+}
+
+/*
+ * cl_suspend --
+ *	Suspend a screen.
+ *
+ * PUBLIC: int cl_suspend(SCR *, int *);
+ */
+int
+cl_suspend(SCR *sp, int *allowedp)
+{
+	struct termios t;
+	CL_PRIVATE *clp;
+	WINDOW *win;
+	GS *gp;
+	size_t y, x;
+	int changed;
+
+	gp = sp->gp;
+	clp = CLP(sp);
+	win = CLSP(sp) ? CLSP(sp) : stdscr;
+	*allowedp = 1;
+
+	/*
+	 * The ex implementation of this function isn't needed by screens not
+	 * supporting ex commands that require full terminal canonical mode
+	 * (e.g. :suspend).
+	 *
+	 * The vi implementation of this function isn't needed by screens not
+	 * supporting vi process suspension, i.e. any screen that isn't backed
+	 * by a UNIX shell.
+	 *
+	 * Setting allowedp to 0 will cause the editor to reject the command.
+	 */
+	if (F_ISSET(sp, SC_EX)) { 
+		/* Save the terminal settings, and restore the original ones. */
+		if (F_ISSET(clp, CL_STDIN_TTY)) {
+			(void)tcgetattr(STDIN_FILENO, &t);
+			(void)tcsetattr(STDIN_FILENO,
+			    TCSASOFT | TCSADRAIN, &clp->orig);
+		}
+
+		/* Stop the process group. */
+		(void)kill(0, SIGTSTP);
+

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

From owner-svn-src-vendor@FreeBSD.ORG  Fri Apr 10 13:49:44 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2B92D614;
 Fri, 10 Apr 2015 13:49:44 +0000 (UTC)
Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 62566A7D;
 Fri, 10 Apr 2015 13:49:43 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
 by woozle.rinet.ru (8.14.5/8.14.5) with ESMTP id t3ADgA2j000415;
 Fri, 10 Apr 2015 16:43:10 +0300 (MSK) (envelope-from marck@rinet.ru)
Date: Fri, 10 Apr 2015 16:42:10 +0300 (MSK)
From: Dmitry Morozovsky <marck@rinet.ru>
To: Baptiste Daroussin <bapt@freebsd.org>
Subject: Re: svn commit: r281368 - in vendor/nvi/dist: . catalog cl common
 docs docs/USD.doc docs/internals docs/interp docs/man docs/tutorial ex regex
 vi
In-Reply-To: <201504101326.t3ADQ6X2098127@svn.freebsd.org>
Message-ID: <alpine.BSF.2.00.1504101641300.97168@woozle.rinet.ru>
References: <201504101326.t3ADQ6X2098127@svn.freebsd.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
X-NCC-RegID: ru.rinet
X-OpenPGP-Key-ID: 6B691B03
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3
 (woozle.rinet.ru [0.0.0.0]); Fri, 10 Apr 2015 16:43:17 +0300 (MSK)
Cc: svn-src-all@freebsd.org, src-committers@freebsd.org,
 svn-src-vendor@freebsd.org
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2015 13:49:44 -0000

On Fri, 10 Apr 2015, Baptiste Daroussin wrote:

> Author: bapt
> Date: Fri Apr 10 13:26:05 2015
> New Revision: 281368
> URL: https://svnweb.freebsd.org/changeset/base/281368
> 
> Log:
>   Import nvi 2.1.3

Wow! Was this import provoked by glebius/lsw hot discussion? ;-P


-- 
Sincerely,
D.Marck                                     [DM5020, MCK-RIPE, DM3-RIPN]
[ FreeBSD committer:                                 marck@FreeBSD.org ]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru ***
------------------------------------------------------------------------

From owner-svn-src-vendor@FreeBSD.ORG  Fri Apr 10 17:54:55 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 53973380;
 Fri, 10 Apr 2015 17:54:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3DDC7C6E;
 Fri, 10 Apr 2015 17:54:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3AHstod027950;
 Fri, 10 Apr 2015 17:54:55 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3AHssYx027944;
 Fri, 10 Apr 2015 17:54:54 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201504101754.t3AHssYx027944@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org
 using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 10 Apr 2015 17:54:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r281374 - in vendor-sys/acpica/dist: .
 source/components/disassembler source/include
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2015 17:54:55 -0000

Author: jkim
Date: Fri Apr 10 17:54:53 2015
New Revision: 281374
URL: https://svnweb.freebsd.org/changeset/base/281374

Log:
  Import ACPICA 20150410.

Modified:
  vendor-sys/acpica/dist/changes.txt
  vendor-sys/acpica/dist/source/components/disassembler/dmcstyle.c
  vendor-sys/acpica/dist/source/include/acpixf.h

Modified: vendor-sys/acpica/dist/changes.txt
==============================================================================
--- vendor-sys/acpica/dist/changes.txt	Fri Apr 10 17:50:28 2015	(r281373)
+++ vendor-sys/acpica/dist/changes.txt	Fri Apr 10 17:54:53 2015	(r281374)
@@ -1,4 +1,11 @@
 ----------------------------------------
+10 April 2015. Summary of changes for version 20150410:
+
+Reverted a change introduced in version 20150408 that caused
+a regression in the disassembler where incorrect operator
+symbols could be emitted.
+
+----------------------------------------
 08 April 2015. Summary of changes for version 20150408:
 
 

Modified: vendor-sys/acpica/dist/source/components/disassembler/dmcstyle.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/disassembler/dmcstyle.c	Fri Apr 10 17:50:28 2015	(r281373)
+++ vendor-sys/acpica/dist/source/components/disassembler/dmcstyle.c	Fri Apr 10 17:54:53 2015	(r281374)
@@ -114,20 +114,12 @@ AcpiDmCheckForSymbolicOpcode (
     Child1 = AcpiPsGetArg (Op, 0);
     if (!Child1)
     {
-        /* Parse tree may be confused or corrupted */
-
         return (FALSE);
     }
 
     /* Get the second operand */
 
     Child2 = Child1->Common.Next;
-    if (!Child2)
-    {
-        /* Parse tree may be confused or corrupted */
-
-        return (FALSE);
-    }
 
     /* Setup the operator string for this opcode */
 
@@ -307,16 +299,8 @@ AcpiDmCheckForSymbolicOpcode (
         /* Target is 3rd operand */
 
         Target = Child2->Common.Next;
-
         if (Op->Common.AmlOpcode == AML_DIVIDE_OP)
         {
-            if (!Target)
-            {
-                /* Parse tree may be confused or corrupted */
-
-                return (FALSE);
-            }
-
             /*
              * Divide has an extra target operand (Remainder).
              * If this extra target is specified, it cannot be converted
@@ -419,13 +403,6 @@ AcpiDmCheckForSymbolicOpcode (
         /* Target is optional, 3rd operand */
 
         Target = Child2->Common.Next;
-        if (!Target)
-        {
-            /* Parse tree may be confused or corrupted */
-
-            return (FALSE);
-        }
-
         if (AcpiDmIsValidTarget (Target))
         {
             AcpiDmPromoteTarget (Op, Target);
@@ -446,13 +423,6 @@ AcpiDmCheckForSymbolicOpcode (
          * source so that the target is processed first.
          */
         Target = Child1->Common.Next;
-        if (!Target)
-        {
-            /* Parse tree may be confused or corrupted */
-
-            return (FALSE);
-        }
-
         AcpiDmPromoteTarget (Op, Target);
 
         if (!Target->Common.OperatorSymbol)

Modified: vendor-sys/acpica/dist/source/include/acpixf.h
==============================================================================
--- vendor-sys/acpica/dist/source/include/acpixf.h	Fri Apr 10 17:50:28 2015	(r281373)
+++ vendor-sys/acpica/dist/source/include/acpixf.h	Fri Apr 10 17:54:53 2015	(r281374)
@@ -46,7 +46,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20150408
+#define ACPI_CA_VERSION                 0x20150410
 
 #include "acconfig.h"
 #include "actypes.h"

From owner-svn-src-vendor@FreeBSD.ORG  Fri Apr 10 17:55:46 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ADB744AB;
 Fri, 10 Apr 2015 17:55:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7F007C74;
 Fri, 10 Apr 2015 17:55:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3AHtk4O028155;
 Fri, 10 Apr 2015 17:55:46 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3AHtkrC028154;
 Fri, 10 Apr 2015 17:55:46 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201504101755.t3AHtkrC028154@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org
 using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 10 Apr 2015 17:55:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r281375 - vendor-sys/acpica/20150410
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2015 17:55:46 -0000

Author: jkim
Date: Fri Apr 10 17:55:45 2015
New Revision: 281375
URL: https://svnweb.freebsd.org/changeset/base/281375

Log:
  Tag ACPICA 20150410.

Added:
  vendor-sys/acpica/20150410/
     - copied from r281374, vendor-sys/acpica/dist/