New upstream version 1.3.0

8 files changed, 88 insertions, 65 deletions

diff --git a/man/Makefile.in b/man/Makefile.in
index 6a193fb..352d837 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,10 +78,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = man
-DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/kdig.1.in $(srcdir)/khost.1.in \
-	$(srcdir)/knot.conf.5.in $(srcdir)/knotc.8.in \
-	$(srcdir)/knotd.8.in $(srcdir)/knsupdate.1.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/khost.1.in $(srcdir)/knotc.8.in $(srcdir)/knotd.8.in \
+	$(srcdir)/kdig.1.in $(srcdir)/knsupdate.1.in \
+	$(srcdir)/knot.conf.5.in $(dist_man_MANS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_ext.m4 \
@@ -122,6 +150,7 @@ man5dir = $(mandir)/man5
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(dist_man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -440,29 +469,14 @@ uninstall-man8:
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
 cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -600,17 +614,18 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-man1 \
-	install-man5 install-man8 install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-man5 install-man8 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-man uninstall-man1 uninstall-man5 uninstall-man8
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-man uninstall-man1 uninstall-man5 \
+	uninstall-man8
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/man/kdig.1 b/man/kdig.1
index 840b350..2fd8b48 100644
--- a/man/kdig.1
+++ b/man/kdig.1
@@ -1,4 +1,4 @@
-.TH "kdig" "1" "29 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc5"
+.TH "kdig" "1" "5 August 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0"
 .SH NAME
 .TP 5
 .B kdig
diff --git a/man/khost.1 b/man/khost.1
index a3d0728..f6d7a2b 100644
--- a/man/khost.1
+++ b/man/khost.1
@@ -1,4 +1,4 @@
-.TH "khost" "1" "29 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc5"
+.TH "khost" "1" "5 August 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0"
 .SH NAME
 .TP 6
 .B khost
diff --git a/man/knot.conf.5 b/man/knot.conf.5
index 02db6f3..c617fc4 100644
--- a/man/knot.conf.5
+++ b/man/knot.conf.5
@@ -1,4 +1,4 @@
-.TH "knot.conf" "5" "29 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc5"
+.TH "knot.conf" "5" "5 August 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0"
 .SH "NAME"
 .LP
 .B knot.conf
@@ -21,18 +21,22 @@ serves as an example of the configuration for knotc(8) and knotd(8).
  system {
 
   # Identity of the server (see RFC 4892).
-  identity "I have no mouth and must scream";
+  # Used for answer to CH TXT 'id.server' or 'hostname.bind'
+  # Use string format "text"
+  # Or on|off. When 'on', FQDN hostname will be used as default.
+  identity off;
 
   # Version of the server (see RFC 4892).
-  version "1.3";
-
-  # Host name of the server (see RFC 4892).
-  hostname "myserver0.ns.example.com";
+  # Used for answer to CH TXT 'version.server' or 'version.bind'
+  # Use string format "text"
+  # Or on|off. When 'on', current server version will be used as default.
+  version off;
 
   # Server identifier
   # Use string format "text"
   # Or hexstring 0x01ab00
-  nsid "myserver0";
+  # Or on|off. When 'on', FQDN hostname will be used as default.
+  nsid off;
 
   # This is a default directory to place slave zone files, journals etc.
   # default: ${localstatedir}/lib/knot, configured with --with-storage
diff --git a/man/knot.conf.5.in b/man/knot.conf.5.in
index 7f85bba..e6bffcd 100644
--- a/man/knot.conf.5.in
+++ b/man/knot.conf.5.in
@@ -21,18 +21,22 @@ serves as an example of the configuration for knotc(8) and knotd(8).
  system {
 
   # Identity of the server (see RFC 4892).
-  identity "I have no mouth and must scream";
+  # Used for answer to CH TXT 'id.server' or 'hostname.bind'
+  # Use string format "text"
+  # Or on|off. When 'on', FQDN hostname will be used as default.
+  identity off;
 
   # Version of the server (see RFC 4892).
-  version "1.3";
-
-  # Host name of the server (see RFC 4892).
-  hostname "myserver0.ns.example.com";
+  # Used for answer to CH TXT 'version.server' or 'version.bind'
+  # Use string format "text"
+  # Or on|off. When 'on', current server version will be used as default.
+  version off;
 
   # Server identifier
   # Use string format "text"
   # Or hexstring 0x01ab00
-  nsid "myserver0";
+  # Or on|off. When 'on', FQDN hostname will be used as default.
+  nsid off;
 
   # This is a default directory to place slave zone files, journals etc.
   # default: ${localstatedir}/lib/knot, configured with --with-storage
diff --git a/man/knotc.8 b/man/knotc.8
index b50afbf..30ea473 100644
--- a/man/knotc.8
+++ b/man/knotc.8
@@ -1,4 +1,4 @@
-.TH knotc "8" "29 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc5"
+.TH knotc "8" "5 August 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0"
 .SH NAME
 .B knotc
 \- Knot DNS control utility
diff --git a/man/knotd.8 b/man/knotd.8
index 105974a..c74fcb5 100644
--- a/man/knotd.8
+++ b/man/knotd.8
@@ -1,4 +1,4 @@
-.TH "knotd" "8" "29 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc5"
+.TH "knotd" "8" "5 August 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0"
 .SH NAME
 .B knotd
 \- Knot DNS daemon
diff --git a/man/knsupdate.1 b/man/knsupdate.1
index 1c90320..f41d06c 100644
--- a/man/knsupdate.1
+++ b/man/knsupdate.1
@@ -1,4 +1,4 @@
-.TH "knsupdate" "1" "29 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc5"
+.TH "knsupdate" "1" "5 August 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0"
 .SH NAME
 .TP 10
 .B knsupdate