]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
add support for building sphinx documentation
authorEvan Hunt <each@isc.org>
Wed, 13 May 2020 22:10:20 +0000 (15:10 -0700)
committerOndřej Surý <ondrej@isc.org>
Mon, 1 Jun 2020 07:54:46 +0000 (09:54 +0200)
70 files changed:
Makefile.in
bin/check/Makefile.in
bin/confgen/Makefile.in
bin/delv/Makefile.in
bin/dig/Makefile.in
bin/dnssec/Makefile.in
bin/named/Makefile.in
bin/nsupdate/Makefile.in
bin/pkcs11/Makefile.in
bin/plugins/Makefile.in
bin/python/Makefile.in
bin/rndc/Makefile.in
bin/tools/Makefile.in
configure
configure.ac
contrib/dlz/bin/dlzbdb/Makefile.in
doc/Makefile.in
doc/arm/.gitignore
doc/arm/Makefile.in
doc/arm/notes-eol.xml [deleted file]
doc/arm/notes-intro.xml [deleted file]
doc/arm/notes-numbering.xml [deleted file]
doc/man/Makefile.in [new file with mode: 0644]
doc/man/arpaname.1in
doc/man/conf.py
doc/man/ddns-confgen.8in
doc/man/delv.1in
doc/man/dig.1in
doc/man/dnssec-cds.8in
doc/man/dnssec-checkds.8in [new file with mode: 0644]
doc/man/dnssec-checkds.rst
doc/man/dnssec-coverage.8in [new file with mode: 0644]
doc/man/dnssec-coverage.rst
doc/man/dnssec-dsfromkey.8in
doc/man/dnssec-importkey.8in
doc/man/dnssec-keyfromlabel.8in
doc/man/dnssec-keygen.8in
doc/man/dnssec-keymgr.8in [new file with mode: 0644]
doc/man/dnssec-keymgr.rst
doc/man/dnssec-revoke.8in
doc/man/dnssec-settime.8in
doc/man/dnssec-signzone.8in
doc/man/dnssec-verify.8in
doc/man/dnstap-read.1in
doc/man/filter-aaaa.8in
doc/man/host.1in
doc/man/mdig.1in
doc/man/named-checkconf.8in
doc/man/named-checkzone.8in
doc/man/named-journalprint.8in
doc/man/named-nzd2nzf.8in
doc/man/named-rrchecker.1in
doc/man/named.8in
doc/man/named.conf.5in
doc/man/nsec3hash.8in
doc/man/nslookup.1in
doc/man/nsupdate.1in
doc/man/pkcs11-destroy.8in
doc/man/pkcs11-keygen.8in
doc/man/pkcs11-list.8in
doc/man/pkcs11-tokens.8in
doc/man/rndc-confgen.8in
doc/man/rndc.8in
doc/man/rndc.conf.5in
doc/tex/Makefile.in [deleted file]
doc/xsl/Makefile.in [deleted file]
lib/samples/Makefile.in
make/rules.in
util/copyrights
util/update_copyrights

index 5f31d643e28ec2eb6b96cc4678b9796db6d1f5e1..ef4a857f5f38a732663090589c8b9c03dd457a0b 100644 (file)
@@ -18,8 +18,7 @@ SUBDIRS =     make lib fuzz bin doc
 TARGETS =
 PREREQS =      bind.keys.h
 
-MANOBJS =      README HISTORY OPTIONS CONTRIBUTING PLATFORMS CODE_OF_CONDUCT \
-               ${MANPAGES} ${HTMLPAGES}
+MANOBJS =      README HISTORY OPTIONS CONTRIBUTING PLATFORMS CODE_OF_CONDUCT
 
 @BIND9_MAKE_RULES@
 
index 8d97d99cecab11562a5d0b3e32e1b045fdd28cf3..8a58f9bf8db1e0f96de18c71190df3723b3051b1 100644 (file)
@@ -46,12 +46,6 @@ TARGETS =    named-checkconf@EXEEXT@ named-checkzone@EXEEXT@
 # Alphabetically
 SRCS =         named-checkconf.c named-checkzone.c check-tool.c
 
-MANPAGES =     named-checkconf.8 named-checkzone.8
-
-HTMLPAGES =    named-checkconf.html named-checkzone.html
-
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 named-checkconf.@O@: named-checkconf.c
@@ -76,25 +70,15 @@ named-checkzone@EXEEXT@: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} \
        export LIBS0="${NSLIBS} ${ISCCFGLIBS} ${DNSLIBS}"; \
        ${FINALBUILDCMD}
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install:: named-checkconf@EXEEXT@ named-checkzone@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkconf@EXEEXT@ ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkzone@EXEEXT@ ${DESTDIR}${sbindir}
        (cd ${DESTDIR}${sbindir}; rm -f named-compilezone@EXEEXT@; ${LINK_PROGRAM} named-checkzone@EXEEXT@ named-compilezone@EXEEXT@)
-       for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8 || exit 1; done
-       (cd ${DESTDIR}${mandir}/man8; rm -f named-compilezone.8; ${LINK_PROGRAM} named-checkzone.8 named-compilezone.8)
 
 uninstall::
-       rm -f ${DESTDIR}${mandir}/man8/named-compilezone.8
-       for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m || exit 1; done
        rm -f ${DESTDIR}${sbindir}/named-compilezone@EXEEXT@
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-checkconf@EXEEXT@
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-checkzone@EXEEXT@
index fbeccbe9b9bf4e8d7fa8e9c1ba24ff08ea71636e..1b7512d6a2819fcf3302a35c2112d385aeddaf0e 100644 (file)
@@ -53,12 +53,6 @@ SUBDIRS =    unix
 
 TARGETS =      rndc-confgen@EXEEXT@ ddns-confgen@EXEEXT@ tsig-keygen@EXEEXT@
 
-MANPAGES =     rndc-confgen.8 ddns-confgen.8
-
-HTMLPAGES =    rndc-confgen.html ddns-confgen.html
-
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 UOBJS =                unix/os.@O@
 
 @BIND9_MAKE_RULES@
@@ -84,28 +78,16 @@ tsig-keygen@EXEEXT@: ddns-confgen@EXEEXT@
        rm -f tsig-keygen@EXEEXT@
        ${LINK_PROGRAM} ddns-confgen@EXEEXT@ tsig-keygen@EXEEXT@
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install:: rndc-confgen@EXEEXT@ ddns-confgen@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} rndc-confgen@EXEEXT@ ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ddns-confgen@EXEEXT@ ${DESTDIR}${sbindir}
-       ${INSTALL_DATA} ${srcdir}/rndc-confgen.8 ${DESTDIR}${mandir}/man8
-       ${INSTALL_DATA} ${srcdir}/ddns-confgen.8 ${DESTDIR}${mandir}/man8
        (cd ${DESTDIR}${sbindir}; rm -f tsig-keygen@EXEEXT@; ${LINK_PROGRAM} ddns-confgen@EXEEXT@ tsig-keygen@EXEEXT@)
-       (cd ${DESTDIR}${mandir}/man8; rm -f tsig-keygen.8; ${LINK_PROGRAM} ddns-confgen.8 tsig-keygen.8)
 
 uninstall::
-       rm -f ${DESTDIR}${mandir}/man8/tsig-keygen.8
        rm -f ${DESTDIR}${sbindir}/tsig-keygen@EXEEXT@
-       rm -f ${DESTDIR}${mandir}/man8/ddns-confgen.8
-       rm -f ${DESTDIR}${mandir}/man8/rndc-confgen.8
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/ddns-confgen@EXEEXT@
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/rndc-confgen@EXEEXT@
 
index 14e2623f64dbb9a57edd4923393685f3309d3aef..d966df887ec9f5fb5e8a999d066616535916a154 100644 (file)
@@ -47,12 +47,6 @@ OBJS =               delv.@O@
 
 SRCS =         delv.c
 
-MANPAGES =     delv.1
-
-HTMLPAGES =    delv.html
-
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 delv@EXEEXT@: delv.@O@ ${DEPLIBS}
@@ -62,21 +56,13 @@ delv@EXEEXT@: delv.@O@ ${DEPLIBS}
 
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
 
 install:: delv@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
                delv@EXEEXT@ ${DESTDIR}${bindir}
-       ${INSTALL_DATA} ${srcdir}/delv.1 ${DESTDIR}${mandir}/man1
 
 uninstall::
-       rm -f ${DESTDIR}${mandir}/man1/delv.1
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/delv@EXEEXT@
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 clean distclean maintainer-clean::
        rm -f ${TARGETS}
index c5752e508495281c8bbb0fa345d5f5a8ab93f0a9..330cd45b434c45fc5ccfe271c28a97802183911c 100644 (file)
@@ -57,12 +57,6 @@ UOBJS =
 
 SRCS =         dig.c dighost.c host.c nslookup.c
 
-MANPAGES =     dig.1 host.1 nslookup.1
-
-HTMLPAGES =    dig.html host.html nslookup.html
-
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 LDFLAGS =      @LDFLAGS@ @LIBIDN2_LDFLAGS@
@@ -82,17 +76,11 @@ nslookup@EXEEXT@: nslookup.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
        export LIBS0="${DNSLIBS} ${IRSLIBS}"; \
        ${FINALBUILDCMD}
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 clean distclean maintainer-clean::
        rm -f ${TARGETS}
 
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
 
 install:: dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
@@ -101,14 +89,8 @@ install:: dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@ installdirs
                host@EXEEXT@ ${DESTDIR}${bindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
                nslookup@EXEEXT@ ${DESTDIR}${bindir}
-       for m in ${MANPAGES}; do \
-               ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man1 || exit 1; \
-       done
 
 uninstall::
-       for m in ${MANPAGES}; do \
-               rm -f ${DESTDIR}${mandir}/man1/$$m || exit 1; \
-       done
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/nslookup@EXEEXT@
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/host@EXEEXT@
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/dig@EXEEXT@
index e6c8a9907b362e9264088b2b35e744f67bfaa0a1..ace0e5aae5133a02a1023af65d361bbe5c939a28 100644 (file)
@@ -50,18 +50,6 @@ SRCS =               dnssec-cds.c dnssec-dsfromkey.c dnssec-importkey.c \
                dnssec-settime.c dnssec-signzone.c dnssec-verify.c \
                dnssectool.c
 
-MANPAGES =     dnssec-cds.8 dnssec-dsfromkey.8 dnssec-importkey.8 \
-               dnssec-keyfromlabel.8 dnssec-keygen.8 dnssec-revoke.8 \
-               dnssec-settime.8 dnssec-signzone.8 dnssec-verify.8
-
-HTMLPAGES =    dnssec-cds.html dnssec-dsfromkey.html \
-               dnssec-importkey.html dnssec-keyfromlabel.html \
-               dnssec-keygen.html dnssec-revoke.html \
-               dnssec-settime.html dnssec-signzone.html \
-               dnssec-verify.html
-
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 dnssec-cds@EXEEXT@: dnssec-cds.@O@ ${OBJS} ${DEPLIBS}
@@ -108,21 +96,14 @@ dnssec-importkey@EXEEXT@: dnssec-importkey.@O@ ${OBJS} ${DEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
        dnssec-importkey.@O@ ${OBJS} ${LIBS}
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install:: ${TARGETS} installdirs
        for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir} || exit 1; done
-       for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8 || exit 1; done
 
 uninstall::
-       for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m || exit 1; done
        for t in ${TARGETS}; do ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/$$t || exit 1; done
 
 clean distclean::
index ba842283cc4d0501431899451394d05104392278..eb622d18326e8fb7bb12d763eb5a7a3a5d33568d 100644 (file)
@@ -117,12 +117,6 @@ SRCS =             builtin.c config.c control.c \
                tkeyconf.c tsigconf.c zoneconf.c \
                ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
 
-MANPAGES =     named.8 named.conf.5
-
-HTMLPAGES =    named.html named.conf.html
-
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 main.@O@: main.c
@@ -156,11 +150,6 @@ named@EXEEXT@: ${OBJS} ${DEPLIBS}
        export BASEOBJS="${OBJS} ${UOBJS}"; \
        ${FINALBUILDCMD}
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 clean distclean maintainer-clean::
        rm -f ${TARGETS} ${OBJS}
 
@@ -174,17 +163,11 @@ statschannel.@O@: bind9.xsl.h
 
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install:: named@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
-       ${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
-       ${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
 
 uninstall::
-       rm -f ${DESTDIR}${mandir}/man5/named.conf.5
-       rm -f ${DESTDIR}${mandir}/man8/named.8
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
 
 @DLZ_DRIVER_RULES@
index 30c22c00f1960c8199edbddd1903847a1d872a9d..b94759300b9fba5776d8f59c047439b0a0ac7e39 100644 (file)
@@ -59,12 +59,6 @@ UOBJS =
 
 SRCS =         nsupdate.c
 
-MANPAGES =     nsupdate.1
-
-HTMLPAGES =    nsupdate.html
-
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 nsupdate.@O@: nsupdate.c
@@ -77,22 +71,14 @@ nsupdate@EXEEXT@: nsupdate.@O@ ${UOBJS} ${DEPLIBS}
        export LIBS0="${DNSLIBS} ${IRSLIBS}"; \
        ${FINALBUILDCMD}
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 clean distclean::
        rm -f ${TARGETS}
 
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
 
 install:: nsupdate@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} nsupdate@EXEEXT@ ${DESTDIR}${bindir}
-       ${INSTALL_DATA} ${srcdir}/nsupdate.1 ${DESTDIR}${mandir}/man1
 
 uninstall::
-       rm -f ${DESTDIR}${mandir}/man1/nsupdate.1
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/nsupdate@EXEEXT@
index 039d5386f098baed000ebd461124c8312d022eca..b2892d5848b8591c306d046f209d45a8e5de8785 100644 (file)
@@ -35,13 +35,6 @@ SRCS =               pkcs11-list.c pkcs11-destroy.c \
 OBJS =         pkcs11-list.@O@ pkcs11-destroy.@O@ \
                pkcs11-keygen.@O@ pkcs11-tokens.@O@
 
-
-MANPAGES =     pkcs11-list.8 pkcs11-destroy.8 \
-               pkcs11-keygen.8 pkcs11-tokens.8
-HTMLPAGES =    pkcs11-list.html pkcs11-destroy.html \
-               pkcs11-keygen.html pkcs11-tokens.html
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 pkcs11-list@EXEEXT@: pkcs11-list.@O@ ${DEPLIBS}
@@ -60,14 +53,8 @@ pkcs11-tokens@EXEEXT@: pkcs11-tokens.@O@ ${DEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} \
                -o $@ pkcs11-tokens.@O@ ${LIBS}
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install:: ${TARGETS} installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-list@EXEEXT@ \
@@ -78,16 +65,8 @@ install:: ${TARGETS} installdirs
                ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-tokens@EXEEXT@ \
                ${DESTDIR}${sbindir}
-       ${INSTALL_DATA} ${srcdir}/pkcs11-list.8 ${DESTDIR}${mandir}/man8
-       ${INSTALL_DATA} ${srcdir}/pkcs11-destroy.8 ${DESTDIR}${mandir}/man8
-       ${INSTALL_DATA} ${srcdir}/pkcs11-keygen.8 ${DESTDIR}${mandir}/man8
-       ${INSTALL_DATA} ${srcdir}/pkcs11-tokens.8 ${DESTDIR}${mandir}/man8
 
 uninstall::
-       rm -f ${DESTDIR}${mandir}/man8/pkcs11-tokens.8
-       rm -f ${DESTDIR}${mandir}/man8/pkcs11-keygen.8
-       rm -f ${DESTDIR}${mandir}/man8/pkcs11-destroy.8
-       rm -f ${DESTDIR}${mandir}/man8/pkcs11-list.8
        ${LIBTOOL_MODE_UNINSTALL} rm -f /
                ${DESTDIR}${sbindir}/pkcs11-tokens@EXEEXT@
        ${LIBTOOL_MODE_UNINSTALL} rm -f /
index 14a0b7590fbbce5f9cf78c324586571d14af2180..dd29f9dd0f8da27730c7fc3b77ee6c5ca91c4c16 100644 (file)
@@ -34,12 +34,6 @@ SO_SRCS =    filter-aaaa.c
 CFLAGS =       @CFLAGS@ @SO_CFLAGS@
 SO_LDFLAGS =   @LDFLAGS@ @SO_LDFLAGS@
 
-MANPAGES =     filter-aaaa.8
-
-HTMLPAGES =    filter-aaaa.html
-
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 lib/filter-aaaa.@SO@: filter-aaaa.@SO@
@@ -50,18 +44,12 @@ filter-aaaa.@SO@: filter-aaaa.@O@
        ${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} -o $@ \
                filter-aaaa.@O@ ${LIBS}
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 clean distclean::
        rm -f filter-aaaa.so
        rm -f ${TARGETS} ${OBJS}
 
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${plugindir}
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install:: @SO_TARGETS@ installdirs
        for i in ${SO_INSTALL} ; \
@@ -72,8 +60,6 @@ install:: @SO_TARGETS@ installdirs
                                 ${DESTDIR}${plugindir}; \
                fi \
        done
-       ${INSTALL_DATA} ${srcdir}/filter-aaaa.8 ${DESTDIR}${mandir}/man8
 
 uninstall::
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${plugindir}/filter-aaaa.@SO@
-       rm -f ${DESTDIR}${mandir}/man8/filter-aaaa.8
index aa678d47abbdd31daeb29cae940f8347d67c964c..3f35d39ed46a9098e9bc45fa5c9e08826c97cf64 100644 (file)
@@ -20,10 +20,6 @@ SUBDIRS      =       isc
 TARGETS =      dnssec-checkds dnssec-coverage dnssec-keymgr
 PYSRCS =       dnssec-checkds.py dnssec-coverage.py dnssec-keymgr.py
 
-MANPAGES =     dnssec-checkds.8 dnssec-coverage.8 dnssec-keymgr.8
-HTMLPAGES =    dnssec-checkds.html dnssec-coverage.html dnssec-keymgr.html
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 dnssec-checkds: dnssec-checkds.py
@@ -38,22 +34,13 @@ dnssec-keymgr: dnssec-keymgr.py
        cp -f dnssec-keymgr.py dnssec-keymgr
        chmod +x dnssec-keymgr
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install:: ${TARGETS} installdirs
        ${INSTALL_SCRIPT} dnssec-checkds ${DESTDIR}${sbindir}
        ${INSTALL_SCRIPT} dnssec-coverage ${DESTDIR}${sbindir}
        ${INSTALL_SCRIPT} dnssec-keymgr ${DESTDIR}${sbindir}
-       ${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8
-       ${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8
-       ${INSTALL_DATA} ${srcdir}/dnssec-keymgr.8 ${DESTDIR}${mandir}/man8
        if test -n "${PYTHON}" ; then \
                if test -n "${DESTDIR}" ; then \
                        ${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} @PYTHON_INSTALL_LIB@ ; \
@@ -64,9 +51,6 @@ install:: ${TARGETS} installdirs
        fi
 
 uninstall::
-       rm -f ${DESTDIR}${mandir}/man8/dnssec-keymgr.8
-       rm -f ${DESTDIR}${mandir}/man8/dnssec-coverage.8
-       rm -f ${DESTDIR}${mandir}/man8/dnssec-checkds.8
        rm -f ${DESTDIR}${sbindir}/dnssec-keymgr
        rm -f ${DESTDIR}${sbindir}/dnssec-coverage
        rm -f ${DESTDIR}${sbindir}/dnssec-checkds
index ae63d105b7b68c29118eed809238c8d60b625711..90381badb8861243675413ac617284be9a2b1480 100644 (file)
@@ -45,12 +45,6 @@ SRCS=                rndc.c
 
 TARGETS =      rndc@EXEEXT@
 
-MANPAGES =     rndc.8 rndc.conf.5
-
-HTMLPAGES =    rndc.html rndc.conf.html
-
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 rndc.@O@: rndc.c
@@ -65,24 +59,13 @@ rndc@EXEEXT@: rndc.@O@ util.@O@ ${RNDCDEPLIBS}
        export LIBS0="${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS} ${ISCLIBS}"; \
        ${FINALBUILDCMD}
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
 
 install:: rndc@EXEEXT@ installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} rndc@EXEEXT@ ${DESTDIR}${sbindir}
-       ${INSTALL_DATA} ${srcdir}/rndc.8 ${DESTDIR}${mandir}/man8
-       ${INSTALL_DATA} ${srcdir}/rndc.conf.5 ${DESTDIR}${mandir}/man5
 
 uninstall::
-       rm -f ${DESTDIR}${mandir}/man5/rndc.conf.5
-       rm -f ${DESTDIR}${mandir}/man8/rndc.8
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/rndc@EXEEXT@
 
 clean distclean maintainer-clean::
index a1510f847ca1ab70922055186407e3b744bdeae5..c0999154289f75f3221ecbd4ed8dda8b00e28ec4 100644 (file)
@@ -54,16 +54,6 @@ SRCS =               arpaname.c named-journalprint.c named-rrchecker.c \
                nsec3hash.c mdig.c \
                @DNSTAPSRCS@ @NZDSRCS@
 
-MANPAGES =     arpaname.1 dnstap-read.1 \
-               mdig.1 named-journalprint.8 \
-               named-nzd2nzf.8 named-rrchecker.1 nsec3hash.8
-
-HTMLPAGES =    arpaname.html dnstap-read.html \
-               mdig.html named-journalprint.html \
-               named-nzd2nzf.html named-rrchecker.html nsec3hash.html
-
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 arpaname@EXEEXT@: arpaname.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
@@ -100,26 +90,17 @@ named-nzd2nzf@EXEEXT@: named-nzd2nzf.@O@ ${NZDDEPLIBS}
        export LIBS0="${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS} ${LMDB_LIBS}"; \
        ${FINALBUILDCMD}
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 nzd:
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-nzd2nzf@EXEEXT@ \
                ${DESTDIR}${sbindir}
-       ${INSTALL_DATA} ${srcdir}/named-nzd2nzf.8 ${DESTDIR}${mandir}/man8
 
 dnstap:
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} dnstap-read@EXEEXT@ \
                ${DESTDIR}${bindir}
-       ${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1
 
 install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \
@@ -132,18 +113,8 @@ install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
                ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} mdig@EXEEXT@ \
                ${DESTDIR}${bindir}
-       ${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1
-       ${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8
-       ${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1
-       ${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8
-       ${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1
 
 uninstall::
-       rm -f ${DESTDIR}${mandir}/man1/mdig.1
-       rm -f ${DESTDIR}${mandir}/man8/nsec3hash.8
-       rm -f ${DESTDIR}${mandir}/man1/named-rrchecker.1
-       rm -f ${DESTDIR}${mandir}/man8/named-journalprint.8
-       rm -f ${DESTDIR}${mandir}/man1/arpaname.1
        ${LIBTOOL_MODE_UNINSTALL} rm -f \
                ${DESTDIR}${bindir}/mdig@EXEEXT@
        ${LIBTOOL_MODE_UNINSTALL} rm -f \
@@ -154,10 +125,8 @@ uninstall::
                ${DESTDIR}${sbindir}/named-journalprint@EXEEXT@
        ${LIBTOOL_MODE_UNINSTALL} rm -f \
                ${DESTDIR}${bindir}/arpaname@EXEEXT@
-       rm -f ${DESTDIR}${mandir}/man1/dnstap-read.1
        ${LIBTOOL_MODE_UNINSTALL} rm -f \
                ${DESTDIR}${bindir}/dnstap-read@EXEEXT@
-       rm -f ${DESTDIR}${mandir}/man8/named-nzd2nzf.8
        ${LIBTOOL_MODE_UNINSTALL} rm -f \
                ${DESTDIR}${sbindir}/named-nzd2nzf@EXEEXT@
 
index 0aa2f557b7d6a23dab9fb1b8715e19fc623e1920..9f2a50ec74041574eaf122ef34539f4f709d1c2f 100755 (executable)
--- a/configure
+++ b/configure
@@ -679,17 +679,12 @@ CMOCKA_CFLAGS
 LIBIDN2_LDFLAGS
 LIBIDN2_LIBS
 LIBIDN2_CFLAGS
-XSLT_DOCBOOK_MAKETOC_XHTML
-XSLT_DOCBOOK_MAKETOC_HTML
-XSLT_DOCBOOK_CHUNKTOC_XHTML
-XSLT_DOCBOOK_CHUNKTOC_HTML
-XSLT_DOCBOOK_CHUNK_XHTML
-XSLT_DOCBOOK_CHUNK_HTML
-XSLT_DOCBOOK_STYLE_MAN
-XSLT_DOCBOOK_STYLE_XHTML
-XSLT_DOCBOOK_STYLE_HTML
 CURL
 DOXYGEN
+MANSRCS
+PDFTARGET
+HTMLTARGET
+PDFLATEX
 RELEASE_DATE
 HAVE_XELATEX_FALSE
 HAVE_XELATEX_TRUE
@@ -751,6 +746,7 @@ ISC_PLATFORM_GSSAPIHEADER
 ISC_PLATFORM_HAVEGSSAPI
 KRB5_CONFIG
 CRYPTO
+PKCS11_MANS
 PKCS11_TOOLS
 PKCS11_TEST
 OPENSSL_LIBS
@@ -947,7 +943,6 @@ enable_fixed_rrset
 enable_dnstap
 with_protobuf_c
 with_libfstrm
-with_docbook_xsl
 with_libidn2
 with_cmocka
 with_tuning
@@ -1710,7 +1705,6 @@ Optional Packages:
   --with-readline=LIBSPEC specify readline library [default auto]
   --with-protobuf-c=path  Path where protobuf-c is installed, for dnstap
   --with-libfstrm=path    Path where libfstrm is installed, for dnstap
-  --with-docbook-xsl=PATH specify path for Docbook-XSL stylesheets
   --with-libidn2=PATH     enable IDN support using GNU libidn2
                           [yes|no(default)|path]
   --with-cmocka=detect    enable CMocka based tests (default is detect)
@@ -17173,6 +17167,7 @@ esac
 
 PKCS11_TOOLS=
 PKCS11_TEST=
+PKCS11_MANS=
 #
 # was --enable-native-pkcs11 specified?
 #
@@ -17193,6 +17188,7 @@ $as_echo "no" >&6; } ;; #(
   yes) :
     PKCS11_TOOLS=pkcs11
               PKCS11_TEST=pkcs11
+              PKCS11_MANS='${pkcs11_man8_MANS}'
               CRYPTO=pkcs11
               if $use_threads; then :
   :
@@ -17220,6 +17216,7 @@ esac
 
 
 
+
 case $CRYPTO in #(
   pkcs11) :
 
@@ -21069,6 +21066,115 @@ release_date=`date -r CHANGES +%Y-%m-%d`
 RELEASE_DATE=$release_date
 
 
+# Don't build the documentation if the sphinx-build is not present
+PDFTARGET=
+HTMLTARGET=
+MANSRCS=
+if test -n "$SPHINX_BUILD"; then :
+
+         MANSRCS='$(MANPAGES_IN)'
+         HTMLTARGET='html dirhtml'
+         for ac_prog in pdflatex
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PDFLATEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PDFLATEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PDFLATEX="$PDFLATEX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PDFLATEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PDFLATEX=$ac_cv_path_PDFLATEX
+if test -n "$PDFLATEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDFLATEX" >&5
+$as_echo "$PDFLATEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PDFLATEX" && break
+done
+
+         for ac_prog in latexmk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_LATEXMK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $LATEXMK in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LATEXMK="$LATEXMK" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_LATEXMK="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+LATEXMK=$ac_cv_path_LATEXMK
+if test -n "$LATEXMK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LATEXMK" >&5
+$as_echo "$LATEXMK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$LATEXMK" && break
+done
+
+         if test -n "$PDFLATEX" && test -n "$LATEXMK"; then :
+
+                   PDFTARGET='pdf'
+
+fi
+
+fi
+
+
+
+
 #
 # Look for Doxygen
 #
 
 
 
-#
-# Subroutine for searching for an ordinary file (e.g., a stylesheet)
-# in a number of directories:
-#
-#   NOM_PATH_FILE(VARIABLE, FILENAME, DIRECTORIES)
-#
-# If the file FILENAME is found in one of the DIRECTORIES, the shell
-# variable VARIABLE is defined to its absolute pathname.  Otherwise,
-# it is set to FILENAME, with no directory prefix (that's not terribly
-# useful, but looks less confusing in substitutions than leaving it
-# empty).  The variable VARIABLE will be substituted into output files.
-#
-
-
-
-#
-# Look for Docbook-XSL stylesheets.  Location probably varies by system.
-# If it's not explicitly specified, guess where it might be found, based on
-# where SGML stuff lives on some systems (FreeBSD is the only one we're sure
-# of at the moment).
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Docbook-XSL path" >&5
-$as_echo_n "checking for Docbook-XSL path... " >&6; }
-
-# Check whether --with-docbook-xsl was given.
-if test "${with_docbook_xsl+set}" = set; then :
-  withval=$with_docbook_xsl; docbook_path="$withval"
-else
-  docbook_path="auto"
-fi
-
-case "$docbook_path" in
-auto)
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto" >&5
-$as_echo "auto" >&6; }
-       docbook_xsl_trees="/usr/pkg/share/xsl/docbook /usr/local/share/xsl/docbook-ns /usr/local/share/xsl/docbook /usr/share/xsl/docbook /usr/share/sgml/docbook/xsl-stylesheets /opt/local/share/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl-nons /usr/share/xml/docbook/stylesheet/docbook-xsl"
-       ;;
-*)
-       docbook_xsl_trees="$withval"
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $docbook_xsl_trees" >&5
-$as_echo "$docbook_xsl_trees" >&6; }
-       ;;
-esac
-
-#
-# Look for stylesheets we need.
-#
-
-
-XSLT_DOCBOOK_STYLE_HTML=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for html/docbook.xsl" >&5
-$as_echo_n "checking for html/docbook.xsl... " >&6; }
-for d in $docbook_xsl_trees
-do
-       f=$d/html/docbook.xsl
-       if test -f $f
-       then
-               XSLT_DOCBOOK_STYLE_HTML=$f
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $f" >&5
-$as_echo "$f" >&6; }
-               break
-       fi
-done
-if test "X$XSLT_DOCBOOK_STYLE_HTML" = "X"
-then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
-$as_echo "\"not found\"" >&6; };
-       XSLT_DOCBOOK_STYLE_HTML=html/docbook.xsl
-fi
-
-
-
-XSLT_DOCBOOK_STYLE_XHTML=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xhtml/docbook.xsl" >&5
-$as_echo_n "checking for xhtml/docbook.xsl... " >&6; }
-for d in $docbook_xsl_trees
-do
-       f=$d/xhtml/docbook.xsl
-       if test -f $f
-       then
-               XSLT_DOCBOOK_STYLE_XHTML=$f
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $f" >&5
-$as_echo "$f" >&6; }
-               break
-       fi
-done
-if test "X$XSLT_DOCBOOK_STYLE_XHTML" = "X"
-then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
-$as_echo "\"not found\"" >&6; };
-       XSLT_DOCBOOK_STYLE_XHTML=xhtml/docbook.xsl
-fi
-
-
-
-XSLT_DOCBOOK_STYLE_MAN=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for manpages/docbook.xsl" >&5
-$as_echo_n "checking for manpages/docbook.xsl... " >&6; }
-for d in $docbook_xsl_trees
-do
-       f=$d/manpages/docbook.xsl
-       if test -f $f
-       then
-               XSLT_DOCBOOK_STYLE_MAN=$f
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $f" >&5
-$as_echo "$f" >&6; }
-               break
-       fi
-done
-if test "X$XSLT_DOCBOOK_STYLE_MAN" = "X"
-then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
-$as_echo "\"not found\"" >&6; };
-       XSLT_DOCBOOK_STYLE_MAN=manpages/docbook.xsl
-fi
-
-
-
-XSLT_DOCBOOK_CHUNK_HTML=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for html/chunk.xsl" >&5
-$as_echo_n "checking for html/chunk.xsl... " >&6; }
-for d in $docbook_xsl_trees
-do
-       f=$d/html/chunk.xsl
-       if test -f $f
-       then
-               XSLT_DOCBOOK_CHUNK_HTML=$f
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $f" >&5
-$as_echo "$f" >&6; }
-               break
-       fi
-done
-if test "X$XSLT_DOCBOOK_CHUNK_HTML" = "X"
-then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
-$as_echo "\"not found\"" >&6; };
-       XSLT_DOCBOOK_CHUNK_HTML=html/chunk.xsl
-fi
-
-
-
-XSLT_DOCBOOK_CHUNK_XHTML=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xhtml/chunk.xsl" >&5
-$as_echo_n "checking for xhtml/chunk.xsl... " >&6; }
-for d in $docbook_xsl_trees
-do
-       f=$d/xhtml/chunk.xsl
-       if test -f $f
-       then
-               XSLT_DOCBOOK_CHUNK_XHTML=$f
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $f" >&5
-$as_echo "$f" >&6; }
-               break
-       fi
-done
-if test "X$XSLT_DOCBOOK_CHUNK_XHTML" = "X"
-then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
-$as_echo "\"not found\"" >&6; };
-       XSLT_DOCBOOK_CHUNK_XHTML=xhtml/chunk.xsl
-fi
-
-
-
-XSLT_DOCBOOK_CHUNKTOC_HTML=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for html/chunktoc.xsl" >&5
-$as_echo_n "checking for html/chunktoc.xsl... " >&6; }
-for d in $docbook_xsl_trees
-do
-       f=$d/html/chunktoc.xsl
-       if test -f $f
-       then
-               XSLT_DOCBOOK_CHUNKTOC_HTML=$f
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $f" >&5
-$as_echo "$f" >&6; }
-               break
-       fi
-done
-if test "X$XSLT_DOCBOOK_CHUNKTOC_HTML" = "X"
-then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
-$as_echo "\"not found\"" >&6; };
-       XSLT_DOCBOOK_CHUNKTOC_HTML=html/chunktoc.xsl
-fi
-
-
-
-XSLT_DOCBOOK_CHUNKTOC_XHTML=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xhtml/chunktoc.xsl" >&5
-$as_echo_n "checking for xhtml/chunktoc.xsl... " >&6; }
-for d in $docbook_xsl_trees
-do
-       f=$d/xhtml/chunktoc.xsl
-       if test -f $f
-       then
-               XSLT_DOCBOOK_CHUNKTOC_XHTML=$f
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $f" >&5
-$as_echo "$f" >&6; }
-               break
-       fi
-done
-if test "X$XSLT_DOCBOOK_CHUNKTOC_XHTML" = "X"
-then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
-$as_echo "\"not found\"" >&6; };
-       XSLT_DOCBOOK_CHUNKTOC_XHTML=xhtml/chunktoc.xsl
-fi
-
-
-
-XSLT_DOCBOOK_MAKETOC_HTML=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for html/maketoc.xsl" >&5
-$as_echo_n "checking for html/maketoc.xsl... " >&6; }
-for d in $docbook_xsl_trees
-do
-       f=$d/html/maketoc.xsl
-       if test -f $f
-       then
-               XSLT_DOCBOOK_MAKETOC_HTML=$f
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $f" >&5
-$as_echo "$f" >&6; }
-               break
-       fi
-done
-if test "X$XSLT_DOCBOOK_MAKETOC_HTML" = "X"
-then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
-$as_echo "\"not found\"" >&6; };
-       XSLT_DOCBOOK_MAKETOC_HTML=html/maketoc.xsl
-fi
-
-
-
-XSLT_DOCBOOK_MAKETOC_XHTML=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xhtml/maketoc.xsl" >&5
-$as_echo_n "checking for xhtml/maketoc.xsl... " >&6; }
-for d in $docbook_xsl_trees
-do
-       f=$d/xhtml/maketoc.xsl
-       if test -f $f
-       then
-               XSLT_DOCBOOK_MAKETOC_XHTML=$f
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $f" >&5
-$as_echo "$f" >&6; }
-               break
-       fi
-done
-if test "X$XSLT_DOCBOOK_MAKETOC_XHTML" = "X"
-then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
-$as_echo "\"not found\"" >&6; };
-       XSLT_DOCBOOK_MAKETOC_XHTML=xhtml/maketoc.xsl
-fi
-
-
-
 #
 # IDN support using libidn2
 #
@@ -23987,7 +23837,7 @@ ac_config_commands="$ac_config_commands chmod"
 # elsewhere if there's a good reason for doing so.
 #
 
-ac_config_files="$ac_config_files Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/plugins/Makefile bin/python/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/Makefile bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/Makefile bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/python/isc/utils.py bin/rndc/Makefile bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl fuzz/Makefile lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/netmgr/Makefile lib/isc/pthreads/Makefile lib/isc/pthreads/include/Makefile lib/isc/pthreads/include/isc/Makefile lib/isc/tests/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccc/tests/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall make/Makefile make/mkdep unit/unittest.sh util/check-make-install"
+ac_config_files="$ac_config_files Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/plugins/Makefile bin/python/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/Makefile bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/Makefile bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/python/isc/utils.py bin/rndc/Makefile bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/man/Makefile doc/misc/Makefile fuzz/Makefile lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/netmgr/Makefile lib/isc/pthreads/Makefile lib/isc/pthreads/include/Makefile lib/isc/pthreads/include/isc/Makefile lib/isc/tests/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccc/tests/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall make/Makefile make/mkdep unit/unittest.sh util/check-make-install"
 
 
 #
     "contrib/scripts/zone-edit.sh") CONFIG_FILES="$CONFIG_FILES contrib/scripts/zone-edit.sh" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "doc/arm/Makefile") CONFIG_FILES="$CONFIG_FILES doc/arm/Makefile" ;;
-    "doc/arm/noteversion.xml") CONFIG_FILES="$CONFIG_FILES doc/arm/noteversion.xml" ;;
-    "doc/arm/pkgversion.xml") CONFIG_FILES="$CONFIG_FILES doc/arm/pkgversion.xml" ;;
-    "doc/arm/releaseinfo.xml") CONFIG_FILES="$CONFIG_FILES doc/arm/releaseinfo.xml" ;;
     "doc/doxygen/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/doxygen/Doxyfile" ;;
     "doc/doxygen/Makefile") CONFIG_FILES="$CONFIG_FILES doc/doxygen/Makefile" ;;
     "doc/doxygen/doxygen-input-filter") CONFIG_FILES="$CONFIG_FILES doc/doxygen/doxygen-input-filter" ;;
+    "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
     "doc/misc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/misc/Makefile" ;;
-    "doc/tex/Makefile") CONFIG_FILES="$CONFIG_FILES doc/tex/Makefile" ;;
-    "doc/tex/armstyle.sty") CONFIG_FILES="$CONFIG_FILES doc/tex/armstyle.sty" ;;
-    "doc/xsl/Makefile") CONFIG_FILES="$CONFIG_FILES doc/xsl/Makefile" ;;
-    "doc/xsl/isc-docbook-chunk.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-docbook-chunk.xsl" ;;
-    "doc/xsl/isc-docbook-html.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-docbook-html.xsl" ;;
-    "doc/xsl/isc-manpage.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-manpage.xsl" ;;
-    "doc/xsl/isc-notes-html.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-notes-html.xsl" ;;
     "fuzz/Makefile") CONFIG_FILES="$CONFIG_FILES fuzz/Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "lib/bind9/Makefile") CONFIG_FILES="$CONFIG_FILES lib/bind9/Makefile" ;;
index 75d4c1596fbb1f2d1eb90ce04096cf5d5900ff60..eaa6b12ecda0b7694288d385da46869c6e29a4e2 100644 (file)
@@ -874,6 +874,7 @@ AC_SUBST([OPENSSL_LIBS])
 
 PKCS11_TOOLS=
 PKCS11_TEST=
+PKCS11_MANS=
 #
 # was --enable-native-pkcs11 specified?
 #
@@ -887,6 +888,7 @@ AS_CASE([$enable_native_pkcs11],
        [no],[AC_MSG_RESULT([no])],
        [yes],[PKCS11_TOOLS=pkcs11
               PKCS11_TEST=pkcs11
+              PKCS11_MANS='${pkcs11_man8_MANS}'
               CRYPTO=pkcs11
               AS_IF([$use_threads],
                     [:],
@@ -896,6 +898,7 @@ AS_CASE([$enable_native_pkcs11],
              ])
 AC_SUBST([PKCS11_TEST])
 AC_SUBST([PKCS11_TOOLS])
+AC_SUBST([PKCS11_MANS])
 
 AC_SUBST([CRYPTO])
 AS_CASE([$CRYPTO],
@@ -2073,6 +2076,23 @@ AM_CONDITIONAL([HAVE_XELATEX], [test "$XELATEX" != ":" && test "$LATEXMK" != ":"
 release_date=`date -r CHANGES +%Y-%m-%d`
 AC_SUBST([RELEASE_DATE], $release_date)
 
+# Don't build the documentation if the sphinx-build is not present
+PDFTARGET=
+HTMLTARGET=
+MANSRCS=
+AS_IF([test -n "$SPHINX_BUILD"],[
+         MANSRCS='$(MANPAGES_IN)'
+         HTMLTARGET='html dirhtml'
+         AC_PATH_PROGS([PDFLATEX], [pdflatex], [])
+         AC_PATH_PROGS([LATEXMK], [latexmk], [])
+         AS_IF([test -n "$PDFLATEX" && test -n "$LATEXMK"],[
+                   PDFTARGET='pdf'
+               ])
+      ])
+AC_SUBST([HTMLTARGET])
+AC_SUBST([PDFTARGET])
+AC_SUBST([MANSRCS])
+
 #
 # Look for Doxygen
 #
@@ -2086,76 +2106,6 @@ AC_SUBST(DOXYGEN)
 AC_PATH_PROG(CURL, curl, curl)
 AC_SUBST(CURL)
 
-#
-# Subroutine for searching for an ordinary file (e.g., a stylesheet)
-# in a number of directories:
-#
-#   NOM_PATH_FILE(VARIABLE, FILENAME, DIRECTORIES)
-#
-# If the file FILENAME is found in one of the DIRECTORIES, the shell
-# variable VARIABLE is defined to its absolute pathname.  Otherwise,
-# it is set to FILENAME, with no directory prefix (that's not terribly
-# useful, but looks less confusing in substitutions than leaving it
-# empty).  The variable VARIABLE will be substituted into output files.
-#
-
-AC_DEFUN([NOM_PATH_FILE], [
-$1=""
-AC_MSG_CHECKING(for $2)
-for d in $3
-do
-       f=$d/$2
-       if test -f $f
-       then
-               $1=$f
-               AC_MSG_RESULT($f)
-               break
-       fi
-done
-if test "X[$]$1" = "X"
-then
-       AC_MSG_RESULT("not found");
-       $1=$2
-fi
-AC_SUBST($1)
-])
-
-#
-# Look for Docbook-XSL stylesheets.  Location probably varies by system.
-# If it's not explicitly specified, guess where it might be found, based on
-# where SGML stuff lives on some systems (FreeBSD is the only one we're sure
-# of at the moment).
-#
-AC_MSG_CHECKING(for Docbook-XSL path)
-AC_ARG_WITH(docbook-xsl,
-           AS_HELP_STRING([--with-docbook-xsl[=PATH]],
-                          [specify path for Docbook-XSL stylesheets]),
-   docbook_path="$withval", docbook_path="auto")
-case "$docbook_path" in
-auto)
-       AC_MSG_RESULT(auto)
-       docbook_xsl_trees="/usr/pkg/share/xsl/docbook /usr/local/share/xsl/docbook-ns /usr/local/share/xsl/docbook /usr/share/xsl/docbook /usr/share/sgml/docbook/xsl-stylesheets /opt/local/share/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl-nons /usr/share/xml/docbook/stylesheet/docbook-xsl"
-       ;;
-*)
-       docbook_xsl_trees="$withval"
-       AC_MSG_RESULT($docbook_xsl_trees)
-       ;;
-esac
-
-#
-# Look for stylesheets we need.
-#
-
-NOM_PATH_FILE(XSLT_DOCBOOK_STYLE_HTML, html/docbook.xsl, $docbook_xsl_trees)
-NOM_PATH_FILE(XSLT_DOCBOOK_STYLE_XHTML, xhtml/docbook.xsl, $docbook_xsl_trees)
-NOM_PATH_FILE(XSLT_DOCBOOK_STYLE_MAN, manpages/docbook.xsl, $docbook_xsl_trees)
-NOM_PATH_FILE(XSLT_DOCBOOK_CHUNK_HTML, html/chunk.xsl, $docbook_xsl_trees)
-NOM_PATH_FILE(XSLT_DOCBOOK_CHUNK_XHTML, xhtml/chunk.xsl, $docbook_xsl_trees)
-NOM_PATH_FILE(XSLT_DOCBOOK_CHUNKTOC_HTML, html/chunktoc.xsl, $docbook_xsl_trees)
-NOM_PATH_FILE(XSLT_DOCBOOK_CHUNKTOC_XHTML, xhtml/chunktoc.xsl, $docbook_xsl_trees)
-NOM_PATH_FILE(XSLT_DOCBOOK_MAKETOC_HTML, html/maketoc.xsl, $docbook_xsl_trees)
-NOM_PATH_FILE(XSLT_DOCBOOK_MAKETOC_XHTML, xhtml/maketoc.xsl, $docbook_xsl_trees)
-
 #
 # IDN support using libidn2
 #
@@ -2851,20 +2801,11 @@ AC_CONFIG_FILES([
        contrib/scripts/zone-edit.sh
        doc/Makefile
        doc/arm/Makefile
-       doc/arm/noteversion.xml
-       doc/arm/pkgversion.xml
-       doc/arm/releaseinfo.xml
        doc/doxygen/Doxyfile
        doc/doxygen/Makefile
        doc/doxygen/doxygen-input-filter
+       doc/man/Makefile
        doc/misc/Makefile
-       doc/tex/Makefile
-       doc/tex/armstyle.sty
-       doc/xsl/Makefile
-       doc/xsl/isc-docbook-chunk.xsl
-       doc/xsl/isc-docbook-html.xsl
-       doc/xsl/isc-manpage.xsl
-       doc/xsl/isc-notes-html.xsl
        fuzz/Makefile
        lib/Makefile
        lib/bind9/Makefile
index 9cf33727b2023f684717d37419fbf6c345f9dad4..3100e8c8f63a55eb4ed4d7c816de323e2edcae54 100644 (file)
@@ -31,12 +31,6 @@ TARGETS =    dlzbdb
 
 SRCS =         dlzbdb.c
 
-#MANPAGES =    
-
-#HTMLPAGES =   
-
-#MANOBJS =     ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 dlzbdb.@O@: dlzbdb.c
@@ -46,17 +40,11 @@ dlzbdb.@O@: dlzbdb.c
 dlzbdb: dlzbdb.@O@ ${DEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} -o $@ dlzbdb.@O@ ${LIBS}
 
-doc man:: ${MANOBJS}
-
-#docclean manclean maintainer-clean::
-#      rm -f ${MANOBJS}
-
 clean distclean maintainer-clean::
        rm -f ${TARGETS}
 
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-#      $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install:: dlzbdb installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} dlzbdb ${DESTDIR}${sbindir}
index 760dde41da944607cda77f46efd3c5282aa264f4..23d282768625386979319c1bd99de427d24c5d88 100644 (file)
@@ -15,7 +15,7 @@ srcdir =      @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
 
-SUBDIRS = arm misc xsl doxygen tex
+SUBDIRS = man arm misc doxygen
 TARGETS =
 
 @BIND9_MAKE_RULES@
index ba65b13af5ea2386f0e5a279f93bd5064181b7ed..1f85bdf269e739facbfad62ffd4210bd152a0ddd 100644 (file)
@@ -1 +1,6 @@
 /_build/
+/man/*.1
+/man/*.5
+/man/*.8
+/Bv9ARM.pdf
+/notes.pdf
index 560eaa0f121208e2e74118dfb41096936709385d..8070b1c7032593f275e0a276d3f0155526282168 100644 (file)
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
+abs_srcdir =   @abs_srcdir@
+builddir =     @builddir@
+top_builddir = @top_builddir@
 
 @BIND9_MAKE_RULES@
 
-MANOBJS = Bv9ARM.html notes.html
-
-TXTOBJS = notes.txt
-
-PDFOBJS = Bv9ARM.pdf notes.pdf
-
-NOTESXML = notes-download.xml notes-eol.xml notes-intro.xml notes-license.xml \
-          notes-numbering.xml notes-platforms.xml notes-thankyou.xml \
-          notes-9.16.0.xml notes-9.16.1.xml notes-9.16.2.xml notes-9.16.3.xml \
-          notes-9.16.4.xml notes.xml
-
-doc man:: ${MANOBJS} ${TXTOBJS} ${PDFOBJS}
-
-clean::
-       rm -f Bv9ARM.aux Bv9ARM.brf Bv9ARM.glo Bv9ARM.idx Bv9ARM.toc
-       rm -f Bv9ARM.log Bv9ARM.out
-       rm -f notes.aux notes.brf notes.glo notes.idx notes.toc
-       rm -f notes.log notes.out
-
-docclean manclean maintainer-clean:: clean
-       rm -f *.html ${PDFOBJS}
-
-maintainer-clean distclean::
-       rm -f releaseinfo.xml
-       rm -f pkgversion.xml
-       rm -f noteversion.xml
-
-# use xmllint to process include
-notes.html: notes-wrapper.xml ${NOTESXML} releaseinfo.xml pkgversion.xml noteversion.xml
-       expand notes-wrapper.xml | ${XMLLINT} --xinclude - | \
-       ${XSLTPROC} --stringparam generate.toc "" ../xsl/isc-notes-html.xsl - > notes.html
-
-notes.pdf: notes-wrapper.xml ${NOTESXML} releaseinfo.xml pkgversion.xml noteversion.xml
-       ${XSLTPROC} ${top_srcdir}/doc/xsl/pre-latex.xsl notes-wrapper.xml | \
-       ${DBLATEX} -c notes.conf -Pdoc.layout="mainmatter" -o notes.pdf -
-
-# Produce notes.txt from notes.html using w3m, with some post-processing:
-#
-#  - remove trailing spaces from every line,
-#  - remove empty lines from the end of the document,
-#  - prevent GitLab issue/MR identifiers from being split across two lines.
-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' | \
-               sed '/ [!#]$$/{N;s| \([!#]\)\(\n[[:space:]]*\)\([0-9][0-9]*\)|\2\1\3|;};' > notes.txt
-
-# use xmllint to process include
-Bv9ARM.html: Bv9ARM-book.xml ${NOTESXML} releaseinfo.xml pkgversion.xml noteversion.xml
-       expand Bv9ARM-book.xml | ${XMLLINT} --xinclude - | \
-       ${XSLTPROC} --stringparam root.filename Bv9ARM \
-               ${top_srcdir}/doc/xsl/isc-docbook-chunk.xsl -
-
-# use xmllint to process include
-Bv9ARM-all.html: Bv9ARM-book.xml ${NOTESXML} releaseinfo.xml pkgversion.xml noteversion.xml
-       expand Bv9ARM-book.xml | ${XMLLINT} --xinclude - |\
-       ${XSLTPROC} -o Bv9ARM-all.html ../xsl/isc-docbook-html.xsl -
-
-Bv9ARM.pdf: Bv9ARM-book.xml ${NOTESXML} releaseinfo.xml pkgversion.xml noteversion.xml
-       expand Bv9ARM-book.xml | \
-       ${XSLTPROC} ${top_srcdir}/doc/xsl/pre-latex.xsl - | \
-       ${DBLATEX} -c Bv9ARM.conf -o Bv9ARM.pdf -
+MKDIR_P=@MKDIR_P@
+
+BIND9_VERSION=@BIND9_VERSION@
+RELEASE_DATE=@RELEASE_DATE@
+BIND9_VERSIONSTRING=@BIND9_VERSIONSTRING@
+
+# You can set these variables from the command line.
+SPHINXBUILD = @SPHINX_BUILD@
+SPHINXBUILDDIR = ${builddir}/_build
+
+common_SPHINXOPTS =    \
+       -a              \
+       -v              \
+       -c "${abs_srcdir}"
+
+ALLSPHINXOPTS =                                \
+       $(common_SPHINXOPTS)                    \
+       -D version="${BIND9_VERSION}"           \
+       -D today="${RELEASE_DATE}"              \
+       -D release="${BIND9_VERSIONSTRING}"     \
+       $(SPHINXOPTS)                           \
+       ${srcdir}
+
+man_SPHINXOPTS =                               \
+       $(common_SPHINXOPTS)                    \
+       -D version="@""BIND9_VERSION""@"        \
+       -D today="@""RELEASE_DATE""@"           \
+       -D release="@""BIND9_VERSIONSTRING""@"  \
+       $(SPHINXOPTS)                           \
+       ${srcdir}
+
+# Put it first so that "make" without argument just builds manpages
+all: man
+       @:
+
+man:: $(man1_MANS) $(man5_MANS) $(man8_MANS) @PKCS11_MANS@
+
+doc:: @HTMLTARGET@ @PDFTARGET@
+
+html dirhtml:
+       $(SPHINXBUILD) -b $@ $(ALLSPHINXOPTS) "$(SPHINXBUILDDIR)"/$@
+
+pdf:
+       $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) "$(SPHINXBUILDDIR)"/latex
+       make -C "$(SPHINXBUILDDIR)"/latex
+       cp "$(SPHINXBUILDDIR)"/latex/Bv9ARM.pdf "${builddir}"
+       cp "$(SPHINXBUILDDIR)"/latex/notes.pdf "${builddir}"
+
+.PHONY: help Makefile doc pdf man
+
+installdirs:
+       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
+       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
+       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
+
+install:: installdirs
+       for m in $(man1_MANPAGES); do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man1/; done
+       for m in $(man5_MANPAGES); do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man5/; done
+       for m in $(man8_MANPAGES); do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man8/; done
+       for m in @PKCS11_MANS@; do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man8/; done
+
+uninstall::
+       for m in $(man1_MANPAGES); do rm -f ${DESTDIR}${mandir}/man1/$$m; done
+       for m in $(man5_MANPAGES); do rm -f ${DESTDIR}${mandir}/man5/$$m; done
+       for m in $(man8_MANPAGES); do rm -f ${DESTDIR}${mandir}/man8/$$m; done
+       for m in @PKCS11_MANS@; do rm -f ${DESTDIR}${mandir}/man8/$$m; done
+
+clean docclean manclean maintainer-clean::
+       rm -rf $(SPHINXBUILDDIR)
+       rm -f notes.pdf Bv9ARM.pdf
diff --git a/doc/arm/notes-eol.xml b/doc/arm/notes-eol.xml
deleted file mode 100644 (file)
index 5cc68f5..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- -
- - This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/.
- -
- - See the COPYRIGHT file distributed with this work for additional
- - information regarding copyright ownership.
--->
-
-<section xml:id="end_of_life"><info><title>End of Life</title></info>
-  <para>
-    The end of life date for BIND 9.16 has not yet been determined.
-    At some point in the future BIND 9.16 will be designated as an
-    Extended Support Version (ESV).  Until then, the current ESV is
-    BIND 9.11, which will be supported until at least December 2021.
-  </para>
-  <para>
-    See
-    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://kb.isc.org/docs/aa-00896">https://kb.isc.org/docs/aa-00896</link>
-    for details of ISC's software support policy.
-  </para>
-</section>
diff --git a/doc/arm/notes-intro.xml b/doc/arm/notes-intro.xml
deleted file mode 100644 (file)
index 24bfe10..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- -
- - This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/.
- -
- - See the COPYRIGHT file distributed with this work for additional
- - information regarding copyright ownership.
--->
-
-<section xml:id="relnotes_intro"><info><title>Introduction</title></info>
-  <para>
-    BIND 9.16 is a stable branch of BIND.
-    This document summarizes significant changes since the last
-    production release on that branch.
-  </para>
-  <para>
-    Please see the file <filename>CHANGES</filename> for a more
-    detailed list of changes and bug fixes.
-  </para>
-</section>
diff --git a/doc/arm/notes-numbering.xml b/doc/arm/notes-numbering.xml
deleted file mode 100644 (file)
index d91e9be..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
- - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- -
- - This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/.
- -
- - See the COPYRIGHT file distributed with this work for additional
- - information regarding copyright ownership.
--->
-
-<section xml:id="relnotes_versions"><info><title>Note on Version Numbering</title></info>
-  <para>
-    As of BIND 9.13/9.14, BIND has adopted the "odd-unstable/even-stable"
-    release numbering convention.  BIND 9.16 contains new features added
-    during the BIND 9.15 development process. Henceforth, the 9.16 branch
-    will be limited to bug fixes and new feature development will proceed
-    in the unstable 9.17 branch.
-  </para>
-</section>
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
new file mode 100644 (file)
index 0000000..e0677ee
--- /dev/null
@@ -0,0 +1,247 @@
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+srcdir =       @srcdir@
+VPATH =                @srcdir@
+top_srcdir =   @top_srcdir@
+abs_srcdir =   @abs_srcdir@
+builddir =     @builddir@
+top_builddir = @top_builddir@
+
+@BIND9_MAKE_RULES@
+
+man1_MANS =                    \
+       arpaname.1              \
+       delv.1                  \
+       dig.1                   \
+       dnstap-read.1           \
+       host.1                  \
+       mdig.1                  \
+       named-rrchecker.1       \
+       nslookup.1              \
+       nsupdate.1
+
+man5_MANS =                    \
+       named.conf.5            \
+       rndc.conf.5
+
+man8_MANS =                    \
+       ddns-confgen.8          \
+       dnssec-cds.8            \
+       dnssec-checkds.8        \
+       dnssec-coverage.8       \
+       dnssec-dsfromkey.8      \
+       dnssec-importkey.8      \
+       dnssec-keyfromlabel.8   \
+       dnssec-keygen.8         \
+       dnssec-keymgr.8         \
+       dnssec-revoke.8         \
+       dnssec-settime.8        \
+       dnssec-signzone.8       \
+       dnssec-verify.8         \
+       filter-aaaa.8           \
+       named-checkconf.8       \
+       named-checkzone.8       \
+       named-journalprint.8    \
+       named-nzd2nzf.8         \
+       named.8                 \
+       nsec3hash.8             \
+       rndc-confgen.8          \
+       rndc.8
+
+MANPAGES_RST =                 \
+       arpaname.rst            \
+       ddns-confgen.rst        \
+       delv.rst                \
+       dig.rst                 \
+       dnssec-cds.rst          \
+       dnssec-checkds.rst      \
+       dnssec-coverage.rst     \
+       dnssec-dsfromkey.rst    \
+       dnssec-importkey.rst    \
+       dnssec-keyfromlabel.rst \
+       dnssec-keygen.rst       \
+       dnssec-keymgr.rst       \
+       dnssec-revoke.rst       \
+       dnssec-settime.rst      \
+       dnssec-signzone.rst     \
+       dnssec-verify.rst       \
+       dnstap-read.rst         \
+       filter-aaaa.rst         \
+       host.rst                \
+       mdig.rst                \
+       named-checkconf.rst     \
+       named-checkzone.rst     \
+       named-journalprint.rst  \
+       named-nzd2nzf.rst       \
+       named-rrchecker.rst     \
+       named.conf.rst          \
+       named.rst               \
+       nsec3hash.rst           \
+       nslookup.rst            \
+       nsupdate.rst            \
+       rndc-confgen.rst        \
+       rndc.conf.rst           \
+       rndc.rst                \
+       pkcs11-destroy.rst      \
+       pkcs11-keygen.rst       \
+       pkcs11-list.rst         \
+       pkcs11-tokens.rst
+
+MANPAGES_IN = \
+       arpaname.1in            \
+       ddns-confgen.8in        \
+       delv.1in                \
+       dig.1in                 \
+       dnssec-cds.8in          \
+       dnssec-checkds.8in      \
+       dnssec-coverage.8in     \
+       dnssec-dsfromkey.8in    \
+       dnssec-importkey.8in    \
+       dnssec-keyfromlabel.8in \
+       dnssec-keygen.8in       \
+       dnssec-keymgr.8in       \
+       dnssec-revoke.8in       \
+       dnssec-settime.8in      \
+       dnssec-signzone.8in     \
+       dnssec-verify.8in       \
+       dnstap-read.1in         \
+       filter-aaaa.8in         \
+       host.1in                \
+       mdig.1in                \
+       named-checkconf.8in     \
+       named-checkzone.8in     \
+       named-journalprint.8in  \
+       named-nzd2nzf.8in       \
+       named-rrchecker.1in     \
+       named.conf.5in          \
+       named.8in               \
+       nsec3hash.8in           \
+       nslookup.1in            \
+       nsupdate.1in            \
+       rndc-confgen.8in        \
+       rndc.conf.5in           \
+       rndc.8in                \
+       pkcs11-destroy.8in      \
+       pkcs11-keygen.8in       \
+       pkcs11-list.8in         \
+       pkcs11-tokens.8in
+
+pkcs11_man8_MANS =             \
+       pkcs11-destroy.8        \
+       pkcs11-keygen.8         \
+       pkcs11-list.8           \
+       pkcs11-tokens.8
+
+BIND9_VERSION=@BIND9_VERSION@
+RELEASE_DATE=@RELEASE_DATE@
+BIND9_VERSIONSTRING=@BIND9_VERSIONSTRING@
+
+# You can set these variables from the command line.
+SPHINXBUILD = @SPHINX_BUILD@
+SPHINXBUILDDIR = ${builddir}/_build
+
+common_SPHINXOPTS =            \
+       -a                      \
+       -v                      \
+       -c "${abs_srcdir}"
+
+ALLSPHINXOPTS =                                        \
+       $(common_SPHINXOPTS)                    \
+       -D version="${BIND9_VERSION}"           \
+       -D today="${RELEASE_DATE}"              \
+       -D release="${BIND9_VERSIONSTRING}"     \
+       $(SPHINXOPTS)                           \
+       ${srcdir}
+
+man_SPHINXOPTS =                               \
+       $(common_SPHINXOPTS)                    \
+       -D version="@""BIND9_VERSION""@"        \
+       -D today="@""RELEASE_DATE""@"           \
+       -D release="@""BIND9_VERSIONSTRING""@"  \
+       $(SPHINXOPTS)                           \
+       ${srcdir}
+
+# Put it first so that "make" without argument just builds manpages
+all: man
+       @:
+
+man:: ootsetup $(man1_MANS) $(man5_MANS) $(man8_MANS) @PKCS11_MANS@
+
+doc:: @HTMLTARGET@ @PDFTARGET@
+
+html dirhtml:
+       $(SPHINXBUILD) -b $@ $(ALLSPHINXOPTS) "$(SPHINXBUILDDIR)"/$@
+
+# copy in out-of-tree files in case sphinx-build isn't available
+.NOTPARALLEL:
+ootsetup:
+       for man in $(MANPAGES_IN); do \
+         [ -e "$$man" ] || cp -f ${srcdir}/"$$man" .; \
+       done
+
+$(MANPAGES_IN): $(MANPAGES_RST)
+       $(SPHINXBUILD) -b man $(man_SPHINXOPTS) "$(SPHINXBUILDDIR)"/man
+       -for man in $(MANPAGES_IN); do \
+         [ -e "$(SPHINXBUILDDIR)"/man/"$$(basename $$man in)" ] && \
+           cp -f "$(SPHINXBUILDDIR)"/man/"$$(basename $$man in)" "$$man"; \
+       done
+
+man_SUBST = sed                                                        \
+       -e 's,[@]BIND9_VERSION[@],$(BIND9_VERSION),'                    \
+       -e 's,[@]RELEASE_DATE[@],$(RELEASE_DATE),'                      \
+       -e 's,[@]BIND9_VERSION_STRING[@],$(BIND9_VERSION_STRING),'      \
+       -e 's,[@]sysconfdir[@],$(sysconfdir),'                          \
+       -e 's,[@]plugindir[@],$(plugindir),'
+
+$(man1_MANS): @MANSRCS@
+       for m in $(man1_MANS); do \
+               $(man_SUBST) $${m}in > $$m; \
+       done
+
+$(man5_MANS): @MANSRCS@
+       for m in $(man5_MANS); do \
+               $(man_SUBST) $${m}in > $$m; \
+       done
+
+$(man8_MANS): @MANSRCS@
+       for m in $(man8_MANS); do \
+               $(man_SUBST) $${m}in > $$m; \
+       done
+
+$(pkcs11_man8_MANS): @MANSRCS@
+       for m in $(pkcs11_man8_MANS); do \
+               $(man_SUBST) $${m}in > $$m; \
+       done
+
+.PHONY: help Makefile doc pdf man
+
+installdirs:
+       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
+       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
+       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
+
+install:: installdirs
+       for m in $(man1_MANS); do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man1/; done
+       for m in $(man5_MANS); do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man5/; done
+       for m in $(man8_MANS); do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man8/; done
+       for m in @PKCS11_MANS@; do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man8/; done
+
+uninstall::
+       for m in $(man1_MANS); do rm -f ${DESTDIR}${mandir}/man1/$$m; done
+       for m in $(man5_MANS); do rm -f ${DESTDIR}${mandir}/man5/$$m; done
+       for m in $(man8_MANS); do rm -f ${DESTDIR}${mandir}/man8/$$m; done
+       for m in @PKCS11_MANS@; do rm -f ${DESTDIR}${mandir}/man8/$$m; done
+
+docclean manclean maintainer-clean::
+       rm -f $(MANPAGES_IN)
+
+clean::
+       -rm -rf $(SPHINXBUILDDIR)
+       -rm -f $(man1_MANS) $(man5_MANS) $(man8_MANS) @PKCS11_MANS@
index bec27b1de5e8c8e5f80a55b9e134f0f50d4a5244..bd055ac5d717e4492d5ae8f5523a39c63b0eea98 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "ARPANAME" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "ARPANAME" "1" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 arpaname \- translate IP addresses to the corresponding ARPA names
 .
index 0f56c8647ba4f3d83876ebdb8c13c062ae34a249..dfd001c67e2829f59fe6e16b27d27e284e2163b9 100644 (file)
@@ -64,10 +64,13 @@ man_pages = [
     ('delv', 'delv', 'DNS lookup and validation utility', author, 1),
     ('dig', 'dig', 'DNS lookup utility', author, 1),
     ('dnssec-cds', 'dnssec-cds', 'change DS records for a child zone based on CDS/CDNSKEY', author, 8),
+    ('dnssec-checkds', 'dnssec-checkds', 'DNSSEC delegation consistency checking tool', author, 8),
+    ('dnssec-coverage', 'dnssec-coverage', 'checks future DNSKEY coverage for a zone', author, 8),
     ('dnssec-dsfromkey', 'dnssec-dsfromkey', 'DNSSEC DS RR generation tool', author, 8),
     ('dnssec-importkey', 'dnssec-importkey', 'import DNSKEY records from external systems so they can be managed', author, 8),
     ('dnssec-keyfromlabel', 'dnssec-keyfromlabel', 'DNSSEC key generation tool', author, 8),
     ('dnssec-keygen', 'dnssec-keygen', 'DNSSEC key generation tool', author, 8),
+    ('dnssec-keymgr', 'dnssec-keymgr', 'ensure correct DNSKEY coverage based on a defined policy', author, 8),
     ('dnssec-revoke', 'dnssec-revoke', 'set the REVOKED bit on a DNSSEC key', author, 8),
     ('dnssec-settime', 'dnssec-settime', 'set the key timing metadata for a DNSSEC key', author, 8),
     ('dnssec-signzone', 'dnssec-signzone', 'DNSSEC zone signing tool', author, 8),
index a87a1abb6abd85ec38686047196f97bc0756814e..05ae390faff21835e905a1dd04a8b3df73374482 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DDNS-CONFGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DDNS-CONFGEN" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 ddns-confgen \- ddns key generation tool
 .
index 2fa3a22968e48d964689425fcaf77fcf988a2d63..5d1636955a0f02937ebcc9e6989d8375b1ffea5b 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DELV" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DELV" "1" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 delv \- DNS lookup and validation utility
 .
index 38ab166e9246bb48e7e58f70064e115682f7fb4f..713d0e4d748df2d4f1f3f0fe6a10f98820ee7559 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DIG" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DIG" "1" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 dig \- DNS lookup utility
 .
index a254fb99f7f8aa81dc2c8c6ed7693186734bee80..d6e6c927d5a0e0d85e045962dffc6fcd0aef56dd 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-CDS" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-CDS" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 dnssec-cds \- change DS records for a child zone based on CDS/CDNSKEY
 .
diff --git a/doc/man/dnssec-checkds.8in b/doc/man/dnssec-checkds.8in
new file mode 100644 (file)
index 0000000..3c89752
--- /dev/null
@@ -0,0 +1,96 @@
+.\" Man page generated from reStructuredText.
+.
+.TH "DNSSEC-CHECKDS" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
+.SH NAME
+dnssec-checkds \- DNSSEC delegation consistency checking tool
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+\fBdnssec\-checkds\fP [\fB\-d\fP\fIdig path\fP] [\fB\-D\fP\fIdsfromkey path\fP]
+[\fB\-f\fP\fIfile\fP] [\fB\-l\fP\fIdomain\fP] [\fB\-s\fP\fIfile\fP] {zone}
+.SH DESCRIPTION
+.sp
+\fBdnssec\-checkds\fP verifies the correctness of Delegation Signer (DS)
+resource records for keys in a specified zone.
+.SH OPTIONS
+.sp
+\fB\-a\fP \fIalgorithm\fP
+.INDENT 0.0
+.INDENT 3.5
+Specify a digest algorithm to use when converting the zones DNSKEY
+records to expected DS records. This option can be repeated, so that
+multiple records are checked for each DNSKEY record.
+.sp
+The \fIalgorithm\fP must be one of SHA\-1, SHA\-256, or SHA\-384. These
+values are case insensitive, and the hyphen may be omitted. If no
+algorithm is specified, the default is SHA\-256.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-f\fP \fIfile\fP
+.INDENT 0.0
+.INDENT 3.5
+If a \fBfile\fP is specified, then the zone is read from that file to
+find the DNSKEY records. If not, then the DNSKEY records for the zone
+are looked up in the DNS.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-s\fP \fIfile\fP
+.INDENT 0.0
+.INDENT 3.5
+Specifies a prepared dsset file, such as would be generated by
+\fBdnssec\-signzone\fP, to use as a source for the DS RRset instead of
+querying the parent.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-d\fP \fIdig path\fP
+.INDENT 0.0
+.INDENT 3.5
+Specifies a path to a \fBdig\fP binary. Used for testing.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-D\fP \fIdsfromkey path\fP
+.INDENT 0.0
+.INDENT 3.5
+Specifies a path to a \fBdnssec\-dsfromkey\fP binary. Used for testing.
+.UNINDENT
+.UNINDENT
+.SH SEE ALSO
+.sp
+\fBdnssec\-dsfromkey\fP(8), \fBdnssec\-keygen\fP(8),
+\fBdnssec\-signzone\fP(8),
+.SH AUTHOR
+Internet Systems Consortium
+.SH COPYRIGHT
+2020, Internet Systems Consortium
+.\" Generated by docutils manpage writer.
+.
index 666b4fb76c651b24a0d7cba3a9f2df49c5776c09..7a60bc44a1cd15eaf468de8501fb3543370a19e8 100644 (file)
@@ -10,4 +10,4 @@
 
 :orphan:
 
-.. include:: ../../bin/python/dnssec-checkds.rst
+.. include:: ../../bin/python/dnssec-checkds.rst
\ No newline at end of file
diff --git a/doc/man/dnssec-coverage.8in b/doc/man/dnssec-coverage.8in
new file mode 100644 (file)
index 0000000..55adfdf
--- /dev/null
@@ -0,0 +1,192 @@
+.\" Man page generated from reStructuredText.
+.
+.TH "DNSSEC-COVERAGE" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
+.SH NAME
+dnssec-coverage \- checks future DNSKEY coverage for a zone
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+\fBdnssec\-coverage\fP [\fB\-K\fP\fIdirectory\fP] [\fB\-l\fP\fIlength\fP]
+[\fB\-f\fP\fIfile\fP] [\fB\-d\fP\fIDNSKEY TTL\fP] [\fB\-m\fP\fImax TTL\fP]
+[\fB\-r\fP\fIinterval\fP] [\fB\-c\fP\fIcompilezone path\fP] [\fB\-k\fP] [\fB\-z\fP]
+[zone...]
+.SH DESCRIPTION
+.sp
+\fBdnssec\-coverage\fP verifies that the DNSSEC keys for a given zone or a
+set of zones have timing metadata set properly to ensure no future
+lapses in DNSSEC coverage.
+.sp
+If \fBzone\fP is specified, then keys found in the key repository matching
+that zone are scanned, and an ordered list is generated of the events
+scheduled for that key (i.e., publication, activation, inactivation,
+deletion). The list of events is walked in order of occurrence. Warnings
+are generated if any event is scheduled which could cause the zone to
+enter a state in which validation failures might occur: for example, if
+the number of published or active keys for a given algorithm drops to
+zero, or if a key is deleted from the zone too soon after a new key is
+rolled, and cached data signed by the prior key has not had time to
+expire from resolver caches.
+.sp
+If \fBzone\fP is not specified, then all keys in the key repository will
+be scanned, and all zones for which there are keys will be analyzed.
+(Note: This method of reporting is only accurate if all the zones that
+have keys in a given repository share the same TTL parameters.)
+.SH OPTIONS
+.sp
+\fB\-K\fP \fIdirectory\fP
+.INDENT 0.0
+.INDENT 3.5
+Sets the directory in which keys can be found. Defaults to the
+current working directory.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-f\fP \fIfile\fP
+.INDENT 0.0
+.INDENT 3.5
+If a \fBfile\fP is specified, then the zone is read from that file; the
+largest TTL and the DNSKEY TTL are determined directly from the zone
+data, and the \fB\-m\fP and \fB\-d\fP options do not need to be specified
+on the command line.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-l\fP \fIduration\fP
+.INDENT 0.0
+.INDENT 3.5
+The length of time to check for DNSSEC coverage. Key events scheduled
+further into the future than \fBduration\fP will be ignored, and
+assumed to be correct.
+.sp
+The value of \fBduration\fP can be set in seconds, or in larger units
+of time by adding a suffix: mi for minutes, h for hours, d for days,
+w for weeks, mo for months, y for years.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-m\fP \fImaximum TTL\fP
+.INDENT 0.0
+.INDENT 3.5
+Sets the value to be used as the maximum TTL for the zone or zones
+being analyzed when determining whether there is a possibility of
+validation failure. When a zone\-signing key is deactivated, there
+must be enough time for the record in the zone with the longest TTL
+to have expired from resolver caches before that key can be purged
+from the DNSKEY RRset. If that condition does not apply, a warning
+will be generated.
+.sp
+The length of the TTL can be set in seconds, or in larger units of
+time by adding a suffix: mi for minutes, h for hours, d for days, w
+for weeks, mo for months, y for years.
+.sp
+This option is not necessary if the \fB\-f\fP has been used to specify a
+zone file. If \fB\-f\fP has been specified, this option may still be
+used; it will override the value found in the file.
+.sp
+If this option is not used and the maximum TTL cannot be retrieved
+from a zone file, a warning is generated and a default value of 1
+week is used.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-d\fP \fIDNSKEY TTL\fP
+.INDENT 0.0
+.INDENT 3.5
+Sets the value to be used as the DNSKEY TTL for the zone or zones
+being analyzed when determining whether there is a possibility of
+validation failure. When a key is rolled (that is, replaced with a
+new key), there must be enough time for the old DNSKEY RRset to have
+expired from resolver caches before the new key is activated and
+begins generating signatures. If that condition does not apply, a
+warning will be generated.
+.sp
+The length of the TTL can be set in seconds, or in larger units of
+time by adding a suffix: mi for minutes, h for hours, d for days, w
+for weeks, mo for months, y for years.
+.sp
+This option is not necessary if \fB\-f\fP has been used to specify a
+zone file from which the TTL of the DNSKEY RRset can be read, or if a
+default key TTL was set using ith the \fB\-L\fP to \fBdnssec\-keygen\fP\&. If
+either of those is true, this option may still be used; it will
+override the values found in the zone file or the key file.
+.sp
+If this option is not used and the key TTL cannot be retrieved from
+the zone file or the key file, then a warning is generated and a
+default value of 1 day is used.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-r\fP \fIresign interval\fP
+.INDENT 0.0
+.INDENT 3.5
+Sets the value to be used as the resign interval for the zone or
+zones being analyzed when determining whether there is a possibility
+of validation failure. This value defaults to 22.5 days, which is
+also the default in \fBnamed\fP\&. However, if it has been changed by the
+\fBsig\-validity\-interval\fP option in named.conf, then it should also
+be changed here.
+.sp
+The length of the interval can be set in seconds, or in larger units
+of time by adding a suffix: mi for minutes, h for hours, d for days,
+w for weeks, mo for months, y for years.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-k\fP
+.INDENT 0.0
+.INDENT 3.5
+Only check KSK coverage; ignore ZSK events. Cannot be used with
+\fB\-z\fP\&.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-z\fP
+.INDENT 0.0
+.INDENT 3.5
+Only check ZSK coverage; ignore KSK events. Cannot be used with
+\fB\-k\fP\&.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-c\fP \fIcompilezone path\fP
+.INDENT 0.0
+.INDENT 3.5
+Specifies a path to a \fBnamed\-compilezone\fP binary. Used for testing.
+.UNINDENT
+.UNINDENT
+.SH SEE ALSO
+.sp
+\fBdnssec\-checkds\fP(8), \fBdnssec\-dsfromkey\fP(8),
+\fBdnssec\-keygen\fP(8), \fBdnssec\-signzone\fP(8)
+.SH AUTHOR
+Internet Systems Consortium
+.SH COPYRIGHT
+2020, Internet Systems Consortium
+.\" Generated by docutils manpage writer.
+.
index 0885d3a9d6f303eadd83fd8f919760fd8af84b9c..7fce0f3ea69148d53137dfb0be42c1176cba8e06 100644 (file)
@@ -10,4 +10,4 @@
 
 :orphan:
 
-.. include:: ../../bin/python/dnssec-coverage.rst
+.. include:: ../../bin/python/dnssec-coverage.rst
\ No newline at end of file
index aa708b45a89d5ac268ba3ca3aaf03e85e13a38cb..455a3b1f48d6ea3ddc76bc855554e8df041ed203 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-DSFROMKEY" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-DSFROMKEY" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 dnssec-dsfromkey \- DNSSEC DS RR generation tool
 .
index 73f0d10af4d1080e55796c8a0dc92923e6e63613..6144e3cace08159fc1dcbd882f5e2334ea07b651 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-IMPORTKEY" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-IMPORTKEY" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 dnssec-importkey \- import DNSKEY records from external systems so they can be managed
 .
@@ -39,7 +39,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .sp
 \fBdnssec\-importkey\fP reads a public DNSKEY record and generates a pair
 of .key/.private files. The DNSKEY record may be read from an existing
-\&.key file, in which case a corresponding .private file will be
+.key file, in which case a corresponding .private file will be
 generated, or it may be read from any other file or from the standard
 input, in which case both .key and .private files will be generated.
 .sp
index 7943796541f4f914c5797acc94644dea0448c27d..f820c6eca54544187fd3110a0eae3b53c39d07aa 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-KEYFROMLABEL" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-KEYFROMLABEL" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 dnssec-keyfromlabel \- DNSSEC key generation tool
 .
index b6e16efded1b13f0d42b172b03d1b671f06ad67c..645db9fcb7e80124900216b1a17011eb530a9022 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-KEYGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-KEYGEN" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 dnssec-keygen \- DNSSEC key generation tool
 .
@@ -43,6 +43,12 @@ Key) as defined in \fI\%RFC 2930\fP\&.
 The \fBname\fP of the key is specified on the command line. For DNSSEC
 keys, this must match the name of the zone for which the key is being
 generated.
+.sp
+The \fBdnssec\-keymgr\fP command acts as a wrapper
+around \fBdnssec\-keygen\fP, generating and updating keys
+as needed to enforce defined security policies such as key rollover
+scheduling. Using \fBdnssec\-keymgr\fP may be preferable
+to direct use of \fBdnssec\-keygen\fP\&.
 .SH OPTIONS
 .INDENT 0.0
 .TP
diff --git a/doc/man/dnssec-keymgr.8in b/doc/man/dnssec-keymgr.8in
new file mode 100644 (file)
index 0000000..eb0b11b
--- /dev/null
@@ -0,0 +1,299 @@
+.\" Man page generated from reStructuredText.
+.
+.TH "DNSSEC-KEYMGR" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
+.SH NAME
+dnssec-keymgr \- ensure correct DNSKEY coverage based on a defined policy
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+:program:\fBdnssec\-keymgr\fP [\fB\-K\fP\fIdirectory\fP] [\fB\-c\fP\fIfile\fP] [\fB\-f\fP]
+[\fB\-k\fP] [\fB\-q\fP] [\fB\-v\fP] [\fB\-z\fP] [\fB\-g\fP\fIpath\fP] [\fB\-s\fP\fIpath\fP]
+[zone...]
+.SH DESCRIPTION
+.sp
+\fBdnssec\-keymgr\fP is a high level Python wrapper to facilitate the key
+rollover process for zones handled by BIND. It uses the BIND commands
+for manipulating DNSSEC key metadata: \fBdnssec\-keygen\fP and
+\fBdnssec\-settime\fP\&.
+.sp
+DNSSEC policy can be read from a configuration file (default
+/etc/dnssec\-policy.conf), from which the key parameters, publication and
+rollover schedule, and desired coverage duration for any given zone can
+be determined. This file may be used to define individual DNSSEC
+policies on a per\-zone basis, or to set a "default" policy used for all
+zones.
+.sp
+When \fBdnssec\-keymgr\fP runs, it examines the DNSSEC keys for one or more
+zones, comparing their timing metadata against the policies for those
+zones. If key settings do not conform to the DNSSEC policy (for example,
+because the policy has been changed), they are automatically corrected.
+.sp
+A zone policy can specify a duration for which we want to ensure the key
+correctness (\fBcoverage\fP). It can also specify a rollover period
+(\fBroll\-period\fP). If policy indicates that a key should roll over
+before the coverage period ends, then a successor key will automatically
+be created and added to the end of the key series.
+.sp
+If zones are specified on the command line, \fBdnssec\-keymgr\fP will
+examine only those zones. If a specified zone does not already have keys
+in place, then keys will be generated for it according to policy.
+.sp
+If zones are \fInot\fP specified on the command line, then \fBdnssec\-keymgr\fP
+will search the key directory (either the current working directory or
+the directory set by the \fB\-K\fP option), and check the keys for all the
+zones represented in the directory.
+.sp
+Key times that are in the past will not be updated unless the \fB\-f\fP is
+used (see below). Key inactivation and deletion times that are less than
+five minutes in the future will be delayed by five minutes.
+.sp
+It is expected that this tool will be run automatically and unattended
+(for example, by \fBcron\fP).
+.SH OPTIONS
+.sp
+\fB\-c\fP \fIfile\fP
+.INDENT 0.0
+.INDENT 3.5
+If \fB\-c\fP is specified, then the DNSSEC policy is read from \fBfile\fP\&.
+(If not specified, then the policy is read from
+/etc/dnssec\-policy.conf; if that file doesnt exist, a built\-in global
+default policy is used.)
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-f\fP
+.INDENT 0.0
+.INDENT 3.5
+Force: allow updating of key events even if they are already in the
+past. This is not recommended for use with zones in which keys have
+already been published. However, if a set of keys has been generated
+all of which have publication and activation dates in the past, but
+the keys have not been published in a zone as yet, then this option
+can be used to clean them up and turn them into a proper series of
+keys with appropriate rollover intervals.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-g\fP \fIkeygen\-path\fP
+.INDENT 0.0
+.INDENT 3.5
+Specifies a path to a \fBdnssec\-keygen\fP binary. Used for testing. See
+also the \fB\-s\fP option.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-h\fP
+.INDENT 0.0
+.INDENT 3.5
+Print the \fBdnssec\-keymgr\fP help summary and exit.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-K\fP \fIdirectory\fP
+.INDENT 0.0
+.INDENT 3.5
+Sets the directory in which keys can be found. Defaults to the
+current working directory.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-k\fP
+.INDENT 0.0
+.INDENT 3.5
+Only apply policies to KSK keys. See also the \fB\-z\fP option.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-q\fP
+.INDENT 0.0
+.INDENT 3.5
+Quiet: suppress printing of \fBdnssec\-keygen\fP and \fBdnssec\-settime\fP\&.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-s\fP \fIsettime\-path\fP
+.INDENT 0.0
+.INDENT 3.5
+Specifies a path to a \fBdnssec\-settime\fP binary. Used for testing.
+See also the \fB\-g\fP option.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-v\fP
+.INDENT 0.0
+.INDENT 3.5
+Print the \fBdnssec\-keymgr\fP version and exit.
+.UNINDENT
+.UNINDENT
+.sp
+\fB\-z\fP
+.INDENT 0.0
+.INDENT 3.5
+Only apply policies to ZSK keys. See also the \fB\-k\fP option.
+.UNINDENT
+.UNINDENT
+.SH POLICY CONFIGURATION
+.sp
+The dnssec\-policy.conf file can specify three kinds of policies:
+.INDENT 0.0
+.INDENT 3.5
+· \fIPolicy classes\fP (\fBpolicy\fP\fIname\fP\fB{ ... };\fP) can be
+inherited by zone policies or other policy classes; these can be used
+to create sets of different security profiles. For example, a policy
+class \fBnormal\fP might specify 1024\-bit key sizes, but a class
+\fBextra\fP might specify 2048 bits instead; \fBextra\fP would be used
+for zones that had unusually high security needs.
+.UNINDENT
+.UNINDENT
+.INDENT 0.0
+.INDENT 3.5
+· \fIAlgorithm policies:\fP (\fBalgorithm\-policy\fP\fIalgorithm\fP\fB{ ...
+};\fP ) override default per\-algorithm settings. For example, by
+default, RSASHA256 keys use 2048\-bit key sizes for both KSK and ZSK.
+This can be modified using \fBalgorithm\-policy\fP, and the new key
+sizes would then be used for any key of type RSASHA256.
+.sp
+· \fIZone policies:\fP (\fBzone\fP\fIname\fP\fB{ ... };\fP ) set policy for a
+single zone by name. A zone policy can inherit a policy class by
+including a \fBpolicy\fP option. Zone names beginning with digits
+(i.e., 0\-9) must be quoted. If a zone does not have its own policy
+then the "default" policy applies.
+.UNINDENT
+.UNINDENT
+.sp
+Options that can be specified in policies:
+.sp
+\fBalgorithm\fP \fIname\fP;
+.INDENT 0.0
+.INDENT 3.5
+The key algorithm. If no policy is defined, the default is RSASHA256.
+.UNINDENT
+.UNINDENT
+.sp
+\fBcoverage\fP \fIduration\fP;
+.INDENT 0.0
+.INDENT 3.5
+The length of time to ensure that keys will be correct; no action
+will be taken to create new keys to be activated after this time.
+This can be represented as a number of seconds, or as a duration
+using human\-readable units (examples: "1y" or "6 months"). A default
+value for this option can be set in algorithm policies as well as in
+policy classes or zone policies. If no policy is configured, the
+default is six months.
+.UNINDENT
+.UNINDENT
+.sp
+\fBdirectory\fP \fIpath\fP;
+.INDENT 0.0
+.INDENT 3.5
+Specifies the directory in which keys should be stored.
+.UNINDENT
+.UNINDENT
+.sp
+\fBkey\-size\fP \fIkeytype\fP \fIsize\fP;
+.INDENT 0.0
+.INDENT 3.5
+Specifies the number of bits to use in creating keys. The keytype is
+either "zsk" or "ksk". A default value for this option can be set in
+algorithm policies as well as in policy classes or zone policies. If
+no policy is configured, the default is 2048 bits for RSA keys.
+.UNINDENT
+.UNINDENT
+.sp
+\fBkeyttl\fP \fIduration\fP;
+.INDENT 0.0
+.INDENT 3.5
+The key TTL. If no policy is defined, the default is one hour.
+.UNINDENT
+.UNINDENT
+.sp
+\fBpost\-publish\fP \fIkeytype\fP \fIduration\fP;
+.INDENT 0.0
+.INDENT 3.5
+How long after inactivation a key should be deleted from the zone.
+Note: If \fBroll\-period\fP is not set, this value is ignored. The
+keytype is either "zsk" or "ksk". A default duration for this option
+can be set in algorithm policies as well as in policy classes or zone
+policies. The default is one month.
+.UNINDENT
+.UNINDENT
+.sp
+\fBpre\-publish\fP \fIkeytype\fP \fIduration\fP;
+.INDENT 0.0
+.INDENT 3.5
+How long before activation a key should be published. Note: If
+\fBroll\-period\fP is not set, this value is ignored. The keytype is
+either "zsk" or "ksk". A default duration for this option can be set
+in algorithm policies as well as in policy classes or zone policies.
+The default is one month.
+.UNINDENT
+.UNINDENT
+.sp
+\fBroll\-period\fP \fIkeytype\fP \fIduration\fP;
+.INDENT 0.0
+.INDENT 3.5
+How frequently keys should be rolled over. The keytype is either
+"zsk" or "ksk". A default duration for this option can be set in
+algorithm policies as well as in policy classes or zone policies. If
+no policy is configured, the default is one year for ZSKs. KSKs do
+not roll over by default.
+.UNINDENT
+.UNINDENT
+.sp
+\fBstandby\fP \fIkeytype\fP \fInumber\fP;
+.INDENT 0.0
+.INDENT 3.5
+Not yet implemented.
+.UNINDENT
+.UNINDENT
+.SH REMAINING WORK
+.INDENT 0.0
+.INDENT 3.5
+· Enable scheduling of KSK rollovers using the \fB\-P sync\fP and \fB\-D
+sync\fP options to \fBdnssec\-keygen\fP and \fBdnssec\-settime\fP\&. Check the
+parent zone (as in \fBdnssec\-checkds\fP) to determine when its safe for
+the key to roll.
+.UNINDENT
+.UNINDENT
+.INDENT 0.0
+.INDENT 3.5
+· Allow configuration of standby keys and use of the REVOKE bit, for
+keys that use RFC 5011 semantics.
+.UNINDENT
+.UNINDENT
+.SH SEE ALSO
+.sp
+\fBdnssec\-coverage\fP(8), \fBdnssec\-keygen\fP(8),
+\fBdnssec\-settime\fP(8), \fBdnssec\-checkds\fP(8)
+.SH AUTHOR
+Internet Systems Consortium
+.SH COPYRIGHT
+2020, Internet Systems Consortium
+.\" Generated by docutils manpage writer.
+.
index 597b70c0cd11fa2c58073a5750d13d649bdb8314..54c317a6add18058082502165ca420268af418b0 100644 (file)
@@ -10,4 +10,4 @@
 
 :orphan:
 
-.. include:: ../../bin/python/dnssec-keymgr.rst
+.. include:: ../../bin/python/dnssec-keymgr.rst
\ No newline at end of file
index 15c30c52029b60dc5f9b67337dddeaf9bb9977c2..f5e0f630177d30d779ebd2c0f3b74715e0a11f8f 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-REVOKE" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-REVOKE" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 dnssec-revoke \- set the REVOKED bit on a DNSSEC key
 .
index b1d84ed9a027dda5a4e60779c1994b5e9d3d92d0..fa8200c5421d021ac9010a772f7236f92c5087fd 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-SETTIME" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-SETTIME" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 dnssec-settime \- set the key timing metadata for a DNSSEC key
 .
index 9b6cfdb2ee35661af4c8c54168c571132d6bd5de..7eaad271a319b1422509bb9bb3f2bed598966e72 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-SIGNZONE" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-SIGNZONE" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 dnssec-signzone \- DNSSEC zone signing tool
 .
index 3d07560edbe935d17c66c90ed2ea4c13bd73cec4..de4bd0cee22b570b413f8ebb7165a7787257495c 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-VERIFY" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-VERIFY" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 dnssec-verify \- DNSSEC zone verification tool
 .
index 2ea914cc1e5c8b77b8b565b567d9672dd5308887..1d7cdb1e2ff7022d6c8b7f83202f85f96b84f3de 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSTAP-READ" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSTAP-READ" "1" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 dnstap-read \- print dnstap data in human-readable form
 .
index 799fb5249d61929da872a697cf9256a10ac8d951..69206d35b400acbce55ff7a68d766f893ddbbe48 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "FILTER-AAAA" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "FILTER-AAAA" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 filter-aaaa \- filter AAAA in DNS responses when A is present
 .
index 00bc543e9b43de7d3b5b5f21546436d92b2c072a..c8d5a9506c2fd5490bd96a360e8eac64ffaf397a 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "HOST" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "HOST" "1" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 host \- DNS lookup utility
 .
index 2129cdd311dc30f4562151b6db72eee24b96b7c0..f061ee2ba0ca4ec93d6b0b7929b176d43c9a0712 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "MDIG" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "MDIG" "1" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 mdig \- DNS pipelined lookup utility
 .
index 40a947dd53561e6b5f8a92bdb42cac72b9fe7975..98157885193a53e1651da89533d82d6c857b0671 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NAMED-CHECKCONF" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NAMED-CHECKCONF" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 named-checkconf \- named configuration file syntax checking tool
 .
index 9ac647b4ce70e28ad4e5d099fd76ef2eb6e8727a..4303a6d9e38650cae36c60dc827bb5be119051af 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NAMED-CHECKZONE" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NAMED-CHECKZONE" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 named-checkzone \- zone file validity checking or converting tool
 .
index 5feea4aa0738850f91c49a181ea3d467ac05c015..ff86ccb5f4f207641e5ea3d32e9654f95bf0aa86 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NAMED-JOURNALPRINT" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NAMED-JOURNALPRINT" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 named-journalprint \- print zone journal in human-readable form
 .
index 56757e8a47f9307cd4207f9c715be870a729fb65..5815f89e610ce9ec4386f714e7db5cc91a61aa23 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NAMED-NZD2NZF" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NAMED-NZD2NZF" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 named-nzd2nzf \- convert an NZD database to NZF text format
 .
index b25a60596490d0daed9b31b1ccdf1a32370705cd..165e5814a59a0568e0b0fa142baec6174d8d9eca 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NAMED-RRCHECKER" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NAMED-RRCHECKER" "1" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 named-rrchecker \- syntax checker for individual DNS resource records
 .
index a52d14f0e23584bf275e1cc9f6e2190dcaf59467..aae798b9272de3bafe6b236f1f63f49015f3bb58 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NAMED" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NAMED" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 named \- Internet domain name server
 .
index 512d2fc59a50b72e6cca60cd8fc3d5d74c13467c..4ddf4e0176cc0718196f161bf1f8f5391809af0b 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NAMED.CONF" "5" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NAMED.CONF" "5" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 named.conf \- configuration file for **named**
 .
@@ -349,7 +349,6 @@ options {
       max\-cache\-size ( default | unlimited | sizeval | percentage );
       max\-cache\-ttl duration;
       max\-clients\-per\-query integer;
-      max\-ixfr\-ratio ( unlimited | percentage );
       max\-journal\-size ( default | unlimited | sizeval );
       max\-ncache\-ttl duration;
       max\-records integer;
@@ -441,11 +440,10 @@ options {
           nsdname\-enable boolean ]; ... } [ add\-soa boolean ] [
           break\-dnssec boolean ] [ max\-policy\-ttl duration ] [
           min\-update\-interval duration ] [ min\-ns\-dots integer ] [
-          nsip\-wait\-recurse boolean ] [ nsdname\-wait\-recurse boolean
-          ] [ qname\-wait\-recurse boolean ] [ recursive\-only boolean ]
-          [ nsip\-enable boolean ] [ nsdname\-enable boolean ] [
-          dnsrps\-enable boolean ] [ dnsrps\-options { unspecified\-text
-          } ];
+          nsip\-wait\-recurse boolean ] [ qname\-wait\-recurse boolean ]
+          [ recursive\-only boolean ] [ nsip\-enable boolean ] [
+          nsdname\-enable boolean ] [ dnsrps\-enable boolean ] [
+          dnsrps\-options { unspecified\-text } ];
       root\-delegation\-only [ exclude { string; ... } ];
       root\-key\-sentinel boolean;
       rrset\-order { [ class string ] [ type string ] [ name
@@ -730,7 +728,6 @@ view string [ class ] {
       max\-cache\-size ( default | unlimited | sizeval | percentage );
       max\-cache\-ttl duration;
       max\-clients\-per\-query integer;
-      max\-ixfr\-ratio ( unlimited | percentage );
       max\-journal\-size ( default | unlimited | sizeval );
       max\-ncache\-ttl duration;
       max\-records integer;
@@ -813,11 +810,10 @@ view string [ class ] {
           nsdname\-enable boolean ]; ... } [ add\-soa boolean ] [
           break\-dnssec boolean ] [ max\-policy\-ttl duration ] [
           min\-update\-interval duration ] [ min\-ns\-dots integer ] [
-          nsip\-wait\-recurse boolean ] [ nsdname\-wait\-recurse boolean
-          ] [ qname\-wait\-recurse boolean ] [ recursive\-only boolean ]
-          [ nsip\-enable boolean ] [ nsdname\-enable boolean ] [
-          dnsrps\-enable boolean ] [ dnsrps\-options { unspecified\-text
-          } ];
+          nsip\-wait\-recurse boolean ] [ qname\-wait\-recurse boolean ]
+          [ recursive\-only boolean ] [ nsip\-enable boolean ] [
+          nsdname\-enable boolean ] [ dnsrps\-enable boolean ] [
+          dnsrps\-options { unspecified\-text } ];
       root\-delegation\-only [ exclude { string; ... } ];
       root\-key\-sentinel boolean;
       rrset\-order { [ class string ] [ type string ] [ name
@@ -939,7 +935,6 @@ view string [ class ] {
               masters [ port integer ] [ dscp integer ] { ( masters
                   | ipv4_address [ port integer ] | ipv6_address [
                   port integer ] ) [ key string ]; ... };
-              max\-ixfr\-ratio ( unlimited | percentage );
               max\-journal\-size ( default | unlimited | sizeval );
               max\-records integer;
               max\-refresh\-time integer;
@@ -1046,7 +1041,6 @@ zone string [ class ] {
       masters [ port integer ] [ dscp integer ] { ( masters |
           ipv4_address [ port integer ] | ipv6_address [ port
           integer ] ) [ key string ]; ... };
-      max\-ixfr\-ratio ( unlimited | percentage );
       max\-journal\-size ( default | unlimited | sizeval );
       max\-records integer;
       max\-refresh\-time integer;
index 860f8bcf3a40e3ebe6194b44029b2a19ad6d1f6a..a3dbec4cb3563cd09ddd6107067bd25cff32184c 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NSEC3HASH" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NSEC3HASH" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 nsec3hash \- generate NSEC3 hash
 .
index a6d02b10ee3232359b0b9dc11bfc922e1a1b3e92..400e4a5209a1b80ca842fce070057651aa34d360 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NSLOOKUP" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NSLOOKUP" "1" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 nslookup \- query Internet name servers interactively
 .
index 494280ec35780c06d5d104dd0bdc7e14259e9f4f..7dc9270c4c6c089629bfb74b5da0c6a4d46b6f57 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NSUPDATE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NSUPDATE" "1" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 nsupdate \- dynamic DNS update utility
 .
index 063c0ff8d5bf3c914d87ba8d77349b210697da7e..2dd029fc7b912aeec2941ea21f48e9a7eeae7aa5 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PKCS11-DESTROY" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "PKCS11-DESTROY" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 pkcs11-destroy \- destroy PKCS#11 objects
 .
index 2f3e7c5a541c6b79f0499902af0c8401a55583aa..42073b4100e979381d8b667fc814a7aa012219dc 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PKCS11-KEYGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "PKCS11-KEYGEN" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 pkcs11-keygen \- generate keys on a PKCS#11 device
 .
index 6a0a3d3368639b1b5c059db88e89428da3680289..72386791435b59d16a4631bc6deffc4362dd822d 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PKCS11-LIST" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "PKCS11-LIST" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 pkcs11-list \- list PKCS#11 objects
 .
index 805a0120ec6904ec1e154698c40ca929fdbfae0f..1fbfc1851d088b173e8a2c2b7790ebdcc8bb0e98 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PKCS11-TOKENS" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "PKCS11-TOKENS" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 pkcs11-tokens \- list PKCS#11 available tokens
 .
index 92cc16f0c235c358e74029a07e5710f7ed3bd40b..98d94677c266070947a1b882835d454c1fa22826 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "RNDC-CONFGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "RNDC-CONFGEN" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 rndc-confgen \- rndc key generation tool
 .
index 43079e8435e5e9265720a8d9ba663e42d3d844a7..d534cf56e3b5a0aa502ff1b57bcd309dfaddf60a 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "RNDC" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "RNDC" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 rndc \- name server control utility
 .
index 4dd2191fa038a5179c032fdea7204274c15e0c71..64e49e60dfd3a2ec85da2c5a64f49cb2504a2726 100644 (file)
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "RNDC.CONF" "5" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "RNDC.CONF" "5" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 rndc.conf \- rndc configuration file
 .
diff --git a/doc/tex/Makefile.in b/doc/tex/Makefile.in
deleted file mode 100644 (file)
index c4bb603..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-srcdir =       @srcdir@
-VPATH =                @srcdir@
-top_srcdir =   @top_srcdir@
-
-SUBDIRS =
-TARGETS =
-
-@BIND9_MAKE_RULES@
-
-distclean::
-       rm -f armstyle.sty
diff --git a/doc/xsl/Makefile.in b/doc/xsl/Makefile.in
deleted file mode 100644 (file)
index 3138c29..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-srcdir =       @srcdir@
-VPATH =                @srcdir@
-top_srcdir =   @top_srcdir@
-
-SUBDIRS =
-TARGETS =
-
-@BIND9_MAKE_RULES@
-
-distclean::
-       rm -f isc-docbook-chunk.xsl isc-docbook-html.xsl \
-             isc-manpage.xsl isc-notes-html.xsl
index c5e1c9b0a792a7eda27bc27d6541a34c079de2e9..17f758392126dcb63eb3b6547f5f112a2d863afc 100644 (file)
@@ -55,12 +55,6 @@ SRCS =               resolve.c \
                sample-async.c sample-gai.c sample-update.c \
                sample-request.c nsprobe.c
 
-MANPAGES =
-
-HTMLPAGES =
-
-MANOBJS =      ${MANPAGES} ${HTMLPAGES}
-
 @BIND9_MAKE_RULES@
 
 resolve@EXEEXT@: resolve.@O@ ${IRSDEPLIBS} ${DEPLIBS}
@@ -87,11 +81,6 @@ nsprobe@EXEEXT@: nsprobe.@O@ ${DEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
        nsprobe.@O@ ${LIBS}
 
-doc man:: ${MANOBJS}
-
-docclean manclean maintainer-clean::
-       rm -f ${MANOBJS}
-
 clean distclean maintainer-clean::
        rm -f ${TARGETS}
        rm -f sample.key
index c5d34044f71ff1df21212d9a427806709e9c5c0a..cb87912d752bf5964830e95d5beb6decb3833639 100644 (file)
@@ -336,19 +336,7 @@ INSTALL_SCRIPT =   @INSTALL_SCRIPT@
 INSTALL_DATA =         @INSTALL_DATA@
 INSTALL_LIBRARY =      @INSTALL_LIBRARY@
 
-###
-### Programs used when generating documentation.  It's ok for these
-### not to exist when not generating documentation.
-###
-
-XSLTPROC =             @XSLTPROC@ --novalid --xinclude --nonet
-XMLLINT =              @XMLLINT@
 PERL =                 @PERL@
-LATEX =                        @LATEX@
-PDFLATEX =             @PDFLATEX@
-DBLATEX =              @DBLATEX@
-W3M =                  @W3M@
-PANDOC =               @PANDOC@
 
 ###
 ### Script language program used to create internal symbol tables
index dbfcbce601970d13938ad855d5ec87cdec4ea045..374aa6ed93ea77e4008bd22ff48b2b1238701d3c 100644 (file)
 ./bin/pkcs11/win32/pk11tokens.vcxproj.user     X       2014,2018,2019,2020
 ./bin/plugins/filter-aaaa.c                    C       2018,2019,2020
 ./bin/plugins/filter-aaaa.rst                  RST     2020
-./bin/python/dnssec-checkds.8                  MAN     DOCBOOK
-./bin/python/dnssec-checkds.docbook            SGML    2012,2013,2014,2015,2016,2017,2018,2019,2020
-./bin/python/dnssec-checkds.html               HTML    DOCBOOK
 ./bin/python/dnssec-checkds.py.in              PYTHON-BIN      2012,2013,2014,2015,2016,2017,2018,2019,2020
-./bin/python/dnssec-coverage.8                 MAN     DOCBOOK
-./bin/python/dnssec-coverage.docbook           SGML    2013,2014,2015,2016,2018,2019,2020
-./bin/python/dnssec-coverage.html              HTML    DOCBOOK
+./bin/python/dnssec-checkds.rst                        RST     2020
 ./bin/python/dnssec-coverage.py.in             PYTHON-BIN      2013,2014,2015,2016,2017,2018,2019,2020
-./bin/python/dnssec-keymgr.8                   MAN     DOCBOOK
-./bin/python/dnssec-keymgr.docbook             SGML    2016,2017,2018,2019,2020
-./bin/python/dnssec-keymgr.html                        HTML    DOCBOOK
+./bin/python/dnssec-coverage.rst               RST     2020
 ./bin/python/dnssec-keymgr.py.in               PYTHON-BIN      2016,2017,2018,2019,2020
+./bin/python/dnssec-keymgr.rst                 RST     2020
 ./bin/python/isc/__init__.py.in                        PYTHON  2016,2018,2019,2020
 ./bin/python/isc/checkds.py.in                 PYTHON  2012,2013,2014,2015,2016,2017,2018,2019,2020
 ./bin/python/isc/coverage.py.in                        PYTHON  2013,2014,2015,2016,2017,2018,2019,2020
 ./bin/tests/bigtest/rndc.key                   X       2013,2018,2019,2020
 ./bin/tests/bigtest/tests.sh                   SH      2013,2016,2018,2019,2020
 ./bin/tests/bigtest/zones                      X       2013,2018,2019,2020
+./bin/tests/cfg_test.c                         C       2020
 ./bin/tests/fromhex.pl                         PERL    2015,2016,2018,2019,2020
 ./bin/tests/headerdep_test.sh.in               SH      2000,2001,2004,2007,2012,2016,2018,2019,2020
 ./bin/tests/makejournal.c                      C       2013,2015,2016,2017,2018,2019,2020
 ./doc/arm/notes-9.16.2.xml                     SGML    2020
 ./doc/arm/notes-9.16.3.xml                     SGML    2020
 ./doc/arm/notes-9.16.4.xml                     SGML    2020
-./doc/arm/notes-eol.xml                                SGML    2020
-./doc/arm/notes-intro.xml                      SGML    2020
-./doc/arm/notes-numbering.xml                  SGML    2020
 ./doc/arm/notes.rst                            RST     2020
 ./doc/arm/pkcs11.rst                           RST     2020
 ./doc/arm/plugins.rst                          RST     2020
 ./doc/man/delv.rst                             RST     2020
 ./doc/man/dig.rst                              RST     2020
 ./doc/man/dnssec-cds.rst                       RST     2020
+./doc/man/dnssec-checkds.rst                   RST     2020
+./doc/man/dnssec-coverage.rst                  RST     2020
 ./doc/man/dnssec-dsfromkey.rst                 RST     2020
 ./doc/man/dnssec-importkey.rst                 RST     2020
 ./doc/man/dnssec-keyfromlabel.rst              RST     2020
 ./doc/man/dnssec-keygen.rst                    RST     2020
+./doc/man/dnssec-keymgr.rst                    RST     2020
 ./doc/man/dnssec-revoke.rst                    RST     2020
 ./doc/man/dnssec-settime.rst                   RST     2020
 ./doc/man/dnssec-signzone.rst                  RST     2020
 ./doc/man/rndc-confgen.rst                     RST     2020
 ./doc/man/rndc.conf.rst                                RST     2020
 ./doc/man/rndc.rst                             RST     2020
-./doc/misc/cfg_test.c                          C       2001,2002,2004,2005,2007,2009,2010,2011,2015,2016,2018,2019,2020
 ./doc/misc/delegation-only.zoneopt             X       2018,2019,2020
 ./doc/misc/format-options.pl                   PERL    2001,2004,2007,2012,2016,2018,2019,2020
 ./doc/misc/forward.zoneopt                     X       2018,2019,2020
index 71b508051ebedbf59d11de1c465be54177195057..c83b5f77d6f56ba9d7e8be543d2758962071e397 100644 (file)
@@ -178,7 +178,7 @@ foreach $file (keys %file_types) {
         $sgml_comment = 0;
         $mkd_comment = 0;
         $man_comment = 0;
-       $rst_comment = 0;
+        $rst_comment = 0;
         $python_comment = 0;
         $python_bin_comment = 0;
         $start_comment = "";
@@ -340,7 +340,7 @@ foreach $file (keys %file_types) {
                        if (/^<!DOCTYPE.*\[$/) {
                                while (!eof(SOURCE)) {
                                        $_ = <SOURCE>;
-                                       next if (eof(SOURCE));
+                                       next if (eof(SOURCE));
                                        $before_copyright =
                                                 "$before_copyright$_";
                                        if (/]>$/) {