Merge branch 'generate-notes-txt' into 'v9_11'

use w3m to generate notes.txt as part of the doc build

See merge request !310

CHANGES

@@ -24,7 +24,7 @@
 			argument processing. [GL #206]
 
 4922.	[bug]		dnstap: Log the destination address of client
-			packets rather than the interface address. 
+			packets rather than the interface address.
 			[GL #197]
 
 4921.	[cleanup]	Add dns_fixedname_initname() and refactor the caller

bin/dig/dig.c

@@ -1100,7 +1100,7 @@ plus_option(const char *option, isc_boolean_t is_batchfile,
 					FULLCHECK("idnin");
 #ifndef WITH_IDN_SUPPORT
 					fprintf(stderr, ";; IDN input support"
-					        " not enabled\n");
+						" not enabled\n");
 #else
 					lookup->idnin = state;
 #endif
@@ -1109,7 +1109,7 @@ plus_option(const char *option, isc_boolean_t is_batchfile,
 					FULLCHECK("idnout");
 #ifndef WITH_IDN_OUT_SUPPORT
 					fprintf(stderr, ";; IDN output support"
-					        " not enabled\n");
+						" not enabled\n");
 #else
 					lookup->idnout = state;
 #endif

bin/dig/dig.docbook

@@ -1286,7 +1286,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
       <command>dig</command> appropriately converts character encoding of
       domain name before sending a request to DNS server or displaying a
       reply from the server.
-      If you'd like to turn off the IDN support for some reason, use 
+      If you'd like to turn off the IDN support for some reason, use
       parameters <parameter>+noidnin</parameter> and
       <parameter>+noidnout</parameter>.
     </para>

bin/dig/dighost.c

@@ -4719,12 +4719,12 @@ idn_locale_to_ace(const char *from, char *to, size_t tolen) {
 	idn_result_t result;
 
 	result = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, from,
-	                        utf8_textname, sizeof(utf8_textname));
+				utf8_textname, sizeof(utf8_textname));
 	idnkit_check_result(result, "idnkit idn_encodename to utf8 failed");
 
 	result = idn_encodename(idnoptions | IDN_LOCALMAP | IDN_NAMEPREP |
-		                IDN_IDNCONV | IDN_LENCHECK,
-		                utf8_textname, to, tolen);
+				IDN_IDNCONV | IDN_LENCHECK,
+				utf8_textname, to, tolen);
 	idnkit_check_result(result, "idnkit idn_encodename to idn failed");
 	return (ISC_R_SUCCESS);
 }

doc/arm/Makefile.in

@@ -15,9 +15,11 @@ top_srcdir =	@top_srcdir@
 
 MANOBJS = Bv9ARM.html notes.html
 
+TXTOBJS = notes.txt
+
 PDFOBJS = Bv9ARM.pdf notes.pdf
 
-doc man:: ${MANOBJS} ${PDFOBJS}
+doc man:: ${MANOBJS} ${TXTOBJS} ${PDFOBJS}
 
 clean::
 	rm -f Bv9ARM.aux Bv9ARM.brf Bv9ARM.glo Bv9ARM.idx Bv9ARM.toc
@@ -42,6 +44,11 @@ notes.pdf: notes-wrapper.xml notes.xml releaseinfo.xml pkgversion.xml noteversio
 	${XSLTPROC} ${top_srcdir}/doc/xsl/pre-latex.xsl notes-wrapper.xml | \
 	${DBLATEX} -c notes.conf -Pdoc.layout="mainmatter" -o notes.pdf -
 
+notes.txt: notes.html
+	${W3M} -dump -cols 75 -O ascii -T text/html < notes.html | \
+		sed 's/  *$$//' | \
+		sed -e :a -e '/^\n*$$/{$$d;N;};/\n$$/ba' > notes.txt
+
 # use xmllint to process include
 Bv9ARM.html: Bv9ARM-book.xml releaseinfo.xml pkgversion.xml noteversion.xml
 	expand Bv9ARM-book.xml | ${XMLLINT} --xinclude - | \

doc/arm/notes.txt

+Release Notes for BIND Version 9.13.0
+
+Introduction
+
+BIND 9.13 is an unstable development release of BIND. This document
+summarizes new features and functional changes that have been introduced
+on this branch. With each development release leading up to the stable
+BIND 9.14 release, this document will be updated with additional features
+added and bugs fixed.
+
+Note on Version Numbering
+
+Prior to BIND 9.13, new feature development releases were tagged as
+"alpha" and "beta", leading up to the first stable release for a given
+development branch, which always ended in ".0".
+
+Now, however, BIND has adopted the "odd-unstable/even-stable" release
+numbering convention. There will be no "alpha" or "beta" releases in the
+9.13 branch, only increasing version numbers. So, for example, what would
+previously have been called 9.13.0a1, 9.13.0a2, 9.13.0b1, and so on, will
+instead be called 9.13.0, 9.13.1, 9.13.2, etc.
+
+The first stable release from this development branch will be renamed as
+9.14.0. Thereafter, maintenance releases will continue on the 9.14 branch,
+while unstable feature development proceeds in 9.15.
+
+Download
+
+The latest versions of BIND 9 software can always be found at http://
+www.isc.org/downloads/. There you will find additional information about
+each release, source code, and pre-compiled versions for Microsoft Windows
+operating systems.
+
+Security Fixes
+
+  * None.
+
+New Features
+
+  * BIND now can be compiled against the libidn2 library to add IDNA2008
+    support. Previously, BIND supported IDNA2003 using the (now obsolete
+    and unsupported) idnkit-1 library.
+
+  * named now supports the "root key sentinel" mechanism. This enables
+    validating resolvers to indicate to which trust anchors are configured
+    for the root, so that information about root key rollover status can
+    be gathered. To disable this feature, add root-key-sentinel no; to
+    named.conf.
+
+  * The dnskey-sig-validity option allows the sig-validity-interval to be
+    overriden for signatures covering DNSKEY RRsets. [GL #145]
+
+Removed Features
+
+  * dnssec-keygen can no longer generate HMAC keys for TSIG
+    authentication. Use tsig-keygen to generate these keys. [RT #46404]
+
+  * Support for OpenSSL 0.9.x has been removed. OpenSSL version 1.0.0 or
+    greater, or LibreSSL is now required.
+
+  * The configure --enable-seccomp option, which formerly turned on
+    system-call filtering on Linux, has been removed. [GL #93]
+
+  * IPv4 addresses in forms other than dotted-quad are no longer accepted
+    in master files. [GL #13] [GL #56]
+
+  * IDNA2003 support via (bundled) idnkit-1.0 has been removed.
+
+  * The "rbtdb64" database implementation (a parallel implementation of
+    "rbt") has been removed. [GL #217]
+
+  * The -r randomdev option to explicitly select random device has been
+    removed from the ddns-confgen, rndc-confgen, nsupdate, dnssec-confgen,
+    and dnssec-signzone commands.
+
+    The -p option to use pseudo-random data has been removed from the
+    dnssec-signzone command.
+
+Feature Changes
+
+  * BIND will now always use the best CSPRNG (cryptographically-secure
+    pseudo-random number generator) available on the platform where it is
+    compiled. It will use arc4random() family of functions on BSD
+    operating systems, getrandom() on Linux and Solaris, CryptGenRandom on
+    Windows, and the selected cryptography provider library (OpenSSL or
+    PKCS#11) as the last resort. [GL #221]
+
+  * BIND can no longer be built without DNSSEC support. A cryptography
+    provder (i.e., OpenSSL or a hardware service module with PKCS#11
+    support) must be available. [GL #244]
+
+  * Zone types primary and secondary are now available as synonyms for
+    master and slave, respectively, in named.conf.
+
+  * named will now log a warning if the old root DNSSEC key is explicitly
+    configured and has not been updated. [RT #43670]
+
+  * dig +nssearch will now list name servers that have timed out, in
+    addition to those that respond. [GL #64]
+
+  * dig +noidnin can be used to disable IDN processing on the input domain
+    name, when BIND is compiled with IDN support.
+
+  * Up to 64 response-policy zones are now supported by default;
+    previously the limit was 32. [GL #123]
+
+  * Several configuration options for time periods can now use TTL value
+    suffixes (for example, 2h or 1d) in addition to an integer number of
+    seconds. These include fstrm-set-reopen-interval, interface-interval,
+    max-cache-ttl, max-ncache-ttl, max-policy-ttl, and min-update-interval
+    . [GL #203]
+
+Bug Fixes
+
+  * None.
+
+License
+
+BIND is open source software licenced under the terms of the Mozilla
+Public License, version 2.0 (see the LICENSE file for the full text).
+
+The license requires that if you make changes to BIND and distribute them
+outside your organization, those changes must be published under the same
+license. It does not require that you publish or disclose anything other
+than the changes you have made to our software. This requirement does not
+affect anyone who is using BIND, with or without modifications, without
+redistributing it, nor anyone redistributing BIND without changes.
+
+Those wishing to discuss license compliance may contact ISC at https://
+www.isc.org/mission/contact/.
+
+End of Life
+
+BIND 9.13 is an unstable development branch. When its development is
+complete, it will be renamed to BIND 9.14, which will be a stable branch.
+
+The end of life date for BIND 9.14 has not yet been determined. For those
+needing long term support, the current Extended Support Version (ESV) is
+BIND 9.11, which will be supported until at least December 2021. See
+https://www.isc.org/downloads/software-support-policy/ for details of
+ISC's software support policy.
+
+Thank You
+
+Thank you to everyone who assisted us in making this release possible. If
+you would like to contribute to ISC to assist us in continuing to make
+quality open source software, please visit our donations page at http://
+www.isc.org/donate/.

doc/design/db_rules

@@ -6,7 +6,6 @@ Here is a more formal statement of the important database design
 rules.  Each rule has a 5 character mnemonic, for use in source code
 comments.
 
-
 Reference Safety						[DBREF]
 
 	1)	Any node reference retrieved from the database shall remain

doc/dev/tests

@@ -5,7 +5,6 @@ See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 We do hourly test builds of the bind9 tree.  This is an attempt to
 document how they work.
 
-
 * How things work
 
 The scripts driving the build system are in ~wpk/b9t.  They are now

lib/dns/tests/sigs_test.c

@@ -460,11 +460,11 @@ ATF_TC_BODY(updatesigs, tc) {
 #else
 ATF_TC(untested);
 ATF_TC_HEAD(untested, tc) {
-        atf_tc_set_md_var(tc, "descr", "skipping dns__zone_updatesigs() test");
+	atf_tc_set_md_var(tc, "descr", "skipping dns__zone_updatesigs() test");
 }
 ATF_TC_BODY(untested, tc) {
-        UNUSED(tc);
-        atf_tc_skip("DNSSEC support not compiled in");
+	UNUSED(tc);
+	atf_tc_skip("DNSSEC support not compiled in");
 }
 #endif
 

util/copyrights

@@ -1447,10 +1447,8 @@
 ./bin/tests/system/gost/setup.sh		SH	2010,2012,2014,2016,2018
 ./bin/tests/system/gost/tests.sh		SH	2010,2012,2013,2016,2018
 ./bin/tests/system/idna/clean.sh		SH	2018
-./bin/tests/system/idna/ns1/named.conf		CONF-C	2018
 ./bin/tests/system/idna/ns1/named.conf.in	CONF-C	2018
 ./bin/tests/system/idna/ns1/root.db		ZONE	2018
-./bin/tests/system/idna/prereq.sh		SH	2018
 ./bin/tests/system/idna/setup.sh		SH	2018
 ./bin/tests/system/idna/tests.sh		SH	2018
 ./bin/tests/system/ifconfig.bat			BAT	2016,2018
@@ -3069,6 +3067,7 @@
 ./doc/arm/notes.conf				X	2015,2018
 ./doc/arm/notes.html				X	2014,2015,2016,2017,2018
 ./doc/arm/notes.pdf				X	2014,2015,2016,2017,2018
+./doc/arm/notes.txt				X	2018
 ./doc/arm/notes.xml				SGML	2014,2015,2016,2017,2018
 ./doc/arm/noteversion.xml.in			SGML	2015,2016,2018
 ./doc/arm/options.grammar.xml			SGML	2018
@@ -3770,7 +3769,6 @@
 ./lib/isc/bind9.c				C	2013,2016,2018
 ./lib/isc/buffer.c				C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2012,2014,2015,2016,2017,2018
 ./lib/isc/bufferlist.c				C	1999,2000,2001,2004,2005,2007,2016,2018
-./lib/isc/chacha_private.h			X	2014,2018
 ./lib/isc/commandline.c				C.PORTION	1999,2000,2001,2004,2005,2007,2008,2014,2015,2016,2018
 ./lib/isc/counter.c				C	2014,2016,2018
 ./lib/isc/crc64.c				C	2013,2016,2018