Knot DNS 2.0.1 (2015-09-02)

===========================

Bugfixes:
---------
 - Do not reload expired zones on 'knotc reload' and server startup
 - Fix rare race-condition in event scheduling causing delayed event execution
 - Fix skipping of non-authoritative nodes in NSEC proofs
 - Fix TC flag setting in RRL slipped answers
 - Disable domain name compression for root label
 - Log via journald only when running under systemd
 - Fix CNAME following when quering for NSEC RR type
 - Fix refreshing of DNSSEC signatures for zone keys
 - Fix binding an unavailable IPv6 address on Linux (IP_FREEBIND)
 - Fix infinite loop in knotc zonestatus and memstats
 - Fix memory leak in configuration on server shutdown
 - Fix broken dnsproxy module
 - Fix DNSSEC KASP timestamps parsing in strict POSIX environment
 - fix multi value parsing on big-endian
 - Adapt to Nettle 3 API break causing base64 decoding failures on big-endian

Features:
---------
 - Add 'keymgr zone key ds' to show key's DS record
 - Add 'keymgr tsig generate' to generate TSIG keys
 - Add query module scoping to process either all queries or zone queries only
 - Add support for file name globbing in config file includes
 - Add 'request-edns-option' config option to add custom EDNS0 option into
   server initiated queries

Improvements:
-------------
 - Send minimal responses (remove NS from Authority section for NOERROR)
 - Update persistent timers only on shutdown for better performance
 - Allow change of RR TTL over DDNS
 - Documentation fixes, updates, and improvements in formatting
 - Install yparser and zscanner header files
 - Improve lookup of libsystemd build dependencies
 - Fix compilation warnings in endian conversion functions on OpenBSD

Knot DNS 2.0.0 (2015-06-26)
===========================

Bugfixes:
---------
 - Fix lost NOTIFY message if received during zone transfer
 - Disable fast zone parser when compiled in Clang (workaround for Clang bug)
 - kdig: Record correct dnstap SocketProtocol when retrying over TCP
 - kdig: Hide TSIG section with +noall
 - Do not set AA flag for AXFR/IXFR queries

Features:
---------
 - DNSSEC: separate library, switch to GnuTLS, new utilities
 - DNSSEC: basic KASP support (generate initial keys, ZSK rollover)
 - Configuration: New text format in YAML, binary store in LMDB
 - Zone parser: Split long TXT/SPF strings into multiple strings
 - kdig: Add generic dump style option (+generic)
 - Try all master servers in multi-master environment
 - Improved remotes and ACLs (multiple addresses, multiple keys)
 - Basic support for zone file patterns (%s to substitute zone name)
 - Disable zone file synchronization by setting 'zonefile_sync' to '-1'
 - knsupdate: Add input prompt in interactive mode and 'quit' command
 - knsupdate: Allow TSIG algorithm specification in interactive prompt

Improvements:
-------------
 - Zone dump: Do not write class for SOA record (unified with other RR types)
 - Zone dump: Do not write master server address into the zone file
 - Documentation: Manual pages are included in HTML and PDF

6 files changed, 125 insertions, 48 deletions

diff --git a/net/knot/Makefile b/net/knot/Makefile
index a1b47eb0e4e..7385a18ae04 100644
--- a/net/knot/Makefile
+++ b/net/knot/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2015/06/30 13:17:10 pettai Exp $
+# $NetBSD: Makefile,v 1.25 2015/10/26 19:23:08 pettai Exp $
 
-DISTNAME=	knot-1.5.3
+DISTNAME=	knot-2.0.1
 CATEGORIES=	net
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pettai@NetBSD.org
 HOMEPAGE=	http://www.knot-dns.cz/
@@ -17,9 +18,16 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/knot
 CONFIGURE_ARGS+=	--with-rundir=${VARBASE}/run/knot
 CONFIGURE_ARGS+=	--with-storage=${VARBASE}/knot/lib
+CONFIGURE_ARGS+=	--with-urcu=${BUILDLINK_PREFIX.userspace-rcu}
+CONFIGURE_ARGS+=	--with-libidn=${BUILDLINK_PREFIX.libidn}
 
 USE_LIBTOOL=	yes
-USE_TOOLS+=	bison flex gmake
+USE_TOOLS+=	bison flex gmake pkg-config
+
+PKGCONFIG_OVERRIDE=	src/dnssec/libdnssec.pc.in
+PKGCONFIG_OVERRIDE+=	src/libknot.pc.in
+PKGCONFIG_OVERRIDE+=	src/zscanner/libzscanner.pc.in
+
 RCD_SCRIPTS=	knot
 
 EGDIR=			${PREFIX}/share/examples/knot
@@ -39,6 +47,8 @@ INSTALLATION_DIRS=	${EGDIR} ${KNOT_SYSCONFDIR}
 OWN_DIRS+=		${VARBASE}/knot
 
 .include "../../devel/userspace-rcu/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../textproc/jansson/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/knot/PLIST b/net/knot/PLIST
index d9e57c229e5..87a0c94743b 100644
--- a/net/knot/PLIST
+++ b/net/knot/PLIST
@@ -1,19 +1,106 @@
-@comment $NetBSD: PLIST,v 1.6 2014/11/10 21:20:32 pettai Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/10/26 19:23:08 pettai Exp $
 bin/kdig
 bin/khost
 bin/knsec3hash
 bin/knsupdate
+include/dnssec/binary.h
+include/dnssec/crypto.h
+include/dnssec/dnssec.h
+include/dnssec/error.h
+include/dnssec/event.h
+include/dnssec/kasp.h
+include/dnssec/key.h
+include/dnssec/keyid.h
+include/dnssec/keystore.h
+include/dnssec/keytag.h
+include/dnssec/list.h
+include/dnssec/nsec.h
+include/dnssec/random.h
+include/dnssec/sign.h
+include/dnssec/tsig.h
+include/libknot/binary.h
+include/libknot/consts.h
+include/libknot/descriptor.h
+include/libknot/dname.h
+include/libknot/errcode.h
+include/libknot/internal/array-sort.h
+include/libknot/internal/base32hex.h
+include/libknot/internal/base64.h
+include/libknot/internal/binsearch.h
+include/libknot/internal/consts.h
+include/libknot/internal/endian.h
+include/libknot/internal/errcode.h
+include/libknot/internal/getline.h
+include/libknot/internal/heap.h
+include/libknot/internal/hhash.h
+include/libknot/internal/lists.h
+include/libknot/internal/macros.h
+include/libknot/internal/mem.h
+include/libknot/internal/mempattern.h
+include/libknot/internal/mempool.h
+include/libknot/internal/namedb/namedb.h
+include/libknot/internal/namedb/namedb_lmdb.h
+include/libknot/internal/namedb/namedb_trie.h
+include/libknot/internal/net.h
+include/libknot/internal/print.h
+include/libknot/internal/sockaddr.h
+include/libknot/internal/strlcat.h
+include/libknot/internal/strlcpy.h
+include/libknot/internal/tolower.h
+include/libknot/internal/trie/hat-trie.h
+include/libknot/internal/trie/murmurhash3.h
+include/libknot/internal/utils.h
+include/libknot/internal/wire_ctx.h
+include/libknot/libknot.h
+include/libknot/packet/compr.h
+include/libknot/packet/pkt.h
+include/libknot/packet/rrset-wire.h
+include/libknot/packet/wire.h
+include/libknot/processing/layer.h
+include/libknot/processing/overlay.h
+include/libknot/processing/requestor.h
+include/libknot/rdata.h
+include/libknot/rdataset.h
+include/libknot/rrset-dump.h
+include/libknot/rrset.h
+include/libknot/rrtype/aaaa.h
+include/libknot/rrtype/dnskey.h
+include/libknot/rrtype/naptr.h
+include/libknot/rrtype/nsec.h
+include/libknot/rrtype/nsec3.h
+include/libknot/rrtype/nsec3param.h
+include/libknot/rrtype/opt.h
+include/libknot/rrtype/rdname.h
+include/libknot/rrtype/rrsig.h
+include/libknot/rrtype/soa.h
+include/libknot/rrtype/tsig.h
+include/libknot/rrtype/txt.h
+include/libknot/tsig-op.h
+include/libknot/tsig.h
+include/libknot/yparser/yparser.h
+include/libknot/yparser/ypformat.h
+include/libknot/yparser/ypscheme.h
+include/libknot/yparser/yptrafo.h
+include/zscanner/error.h
+include/zscanner/scanner.h
+lib/libdnssec.la
 lib/libknot.la
 lib/libzscanner.la
+lib/pkgconfig/libdnssec.pc
+lib/pkgconfig/libknot.pc
+lib/pkgconfig/libzscanner.pc
+libexec/knot1to2
 man/man1/kdig.1
 man/man1/khost.1
+man/man1/knot1to2.1
 man/man1/knsec3hash.1
 man/man1/knsupdate.1
 man/man5/knot.conf.5
+man/man8/keymgr.8
 man/man8/knotc.8
 man/man8/knotd.8
+sbin/keymgr
 sbin/knotc
 sbin/knotd
 share/examples/knot/example.com.zone
 share/examples/knot/knot.sample.conf
-@pkgdir etc/knot
diff --git a/net/knot/distinfo b/net/knot/distinfo
index 25487348bf0..32276781731 100644
--- a/net/knot/distinfo
+++ b/net/knot/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2014/11/10 21:20:32 pettai Exp $
+$NetBSD: distinfo,v 1.15 2015/10/26 19:23:08 pettai Exp $
 
-SHA1 (knot-1.5.3.tar.gz) = 4692c5001472443d07ac088592b349793a968706
-RMD160 (knot-1.5.3.tar.gz) = 72442dff1c138ed0ad0300e395c524f318baa123
-Size (knot-1.5.3.tar.gz) = 1175445 bytes
-SHA1 (patch-Makefile.in) = b24790f99d791ac184eff66db563a0a314f8370c
-SHA1 (patch-samples_Makefile.in) = 7a2cc5b1eebc7483ffcefc565d200d9a203d49ff
+SHA1 (knot-2.0.1.tar.xz) = 155a9aa3e7e6f12b70ec8e079ef6c8e137b0f8cf
+RMD160 (knot-2.0.1.tar.xz) = 5fa3ed2da1fb673d329a0d5ade8a4284675c0a63
+SHA512 (knot-2.0.1.tar.xz) = b74069a6da4eb0f456a3bd38318712f467f736af1712a14772f7e539b009c02f8e447c2fcd21f5005a2a4906466294ab6b46e7782aac3b88619063aed14cddb5
+Size (knot-2.0.1.tar.xz) = 958560 bytes
+SHA1 (patch-samples_Makefile.in) = be60c4bfb4ed49dbe8c55dc5d453c8733fb4fb61
diff --git a/net/knot/files/knot.sh b/net/knot/files/knot.sh
index 19be76e954c..e946d553f91 100755
--- a/net/knot/files/knot.sh
+++ b/net/knot/files/knot.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: knot.sh,v 1.2 2015/06/30 13:17:10 pettai Exp $
+# $NetBSD: knot.sh,v 1.3 2015/10/26 19:23:08 pettai Exp $
 #
 # PROVIDE: knot
 # REQUIRE: NETWORKING syslogd
@@ -17,10 +17,9 @@ knotd="@PREFIX@/sbin/knotd"
 command_args=""
 pidfile="@VARBASE@/knot/${name}.pid"
 start_precmd="knot_precmd"
-extra_commands="restart reload"
+extra_commands="reload"
 start_cmd="$knotd -d"
 stop_cmd="$command stop"
-restart_cmd="$command restart"
 reload_cmd="$command reload"
 status_cmd="$command status"
 
diff --git a/net/knot/patches/patch-Makefile.in b/net/knot/patches/patch-Makefile.in
deleted file mode 100644
index 4a418ea11c3..00000000000
--- a/net/knot/patches/patch-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.4 2014/11/10 21:20:32 pettai Exp $
-
-Ignore .texi docs, as NetBSDs makeinfo isn't UTF-8 compatible
-
---- Makefile.in.orig	2014-09-15 14:32:42.000000000 +0000
-+++ Makefile.in
-@@ -341,7 +341,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = libtap src tests samples doc man patches
-+SUBDIRS = libtap src tests samples man patches
- AM_DISTCHECK_CONFIGURE_FLAGS = \
- 	--disable-code-coverage
- 
diff --git a/net/knot/patches/patch-samples_Makefile.in b/net/knot/patches/patch-samples_Makefile.in
index e50ed177026..29de588246d 100644
--- a/net/knot/patches/patch-samples_Makefile.in
+++ b/net/knot/patches/patch-samples_Makefile.in
@@ -1,10 +1,8 @@
-$NetBSD: patch-samples_Makefile.in,v 1.3 2014/11/10 21:20:32 pettai Exp $
+$NetBSD: patch-samples_Makefile.in,v 1.4 2015/10/26 19:23:08 pettai Exp $
 
-Fix sysconfdir + sample conf snippet
-
---- samples/Makefile.in.orig	2014-09-15 14:32:42.000000000 +0000
+--- samples/Makefile.in.orig	2015-10-26 16:12:16.000000000 +0000
 +++ samples/Makefile.in
-@@ -252,6 +252,7 @@ sharedstatedir = @sharedstatedir@
+@@ -264,6 +264,7 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  storage_dir = @storage_dir@
  sysconfdir = @sysconfdir@
@@ -12,18 +10,16 @@ Fix sysconfdir + sample conf snippet
  systemd_CFLAGS = @systemd_CFLAGS@
  systemd_LIBS = @systemd_LIBS@
  target_alias = @target_alias@
-@@ -469,10 +470,10 @@ knot.sample.conf: knot.sample.conf.in
+@@ -483,9 +484,9 @@ knot.sample.conf: knot.sample.conf.in
  	mv $@.tmp $@
  
- install-data-local: knot.sample.conf
--	[ -d $(DESTDIR)/$(config_dir) ] || \
--	  $(INSTALL) -d $(DESTDIR)/$(config_dir)
--	[ -f $(DESTDIR)/$(config_dir)/knot.sample.conf ] || \
--	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir)
-+	[ -d $(DESTDIR)/$(EGDIR) ] || \
-+	  $(INSTALL) -d $(DESTDIR)/$(EGDIR)
-+	[ -f $(DESTDIR)/$(EGDIR)/knot.sample.conf ] || \
-+	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(EGDIR)
- 
- uninstall-local:
- 	[ -f $(DESTDIR)/$(config_dir)/knot.sample.conf ] && \
+ @HAVE_DAEMON_TRUE@install-data-local: knot.sample.conf
+-@HAVE_DAEMON_TRUE@	if [ \! -f $(DESTDIR)/$(config_dir)/knot.sample.conf ]; then \
+-@HAVE_DAEMON_TRUE@	  $(INSTALL) -d $(DESTDIR)/$(config_dir); \
+-@HAVE_DAEMON_TRUE@	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir); \
++@HAVE_DAEMON_TRUE@	if [ \! -f $(DESTDIR)/$(EGDIR)/knot.sample.conf ]; then \
++@HAVE_DAEMON_TRUE@	  $(INSTALL) -d $(DESTDIR)/$(EGDIR); \
++@HAVE_DAEMON_TRUE@	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(EGDIR); \
+ @HAVE_DAEMON_TRUE@	fi
+ @HAVE_BASH_COMPLETIONS_TRUE@@HAVE_DAEMON_TRUE@	if [ \! -f $(DESTDIR)/$(bash_completions_dir)/keymgr ]; then \
+ @HAVE_BASH_COMPLETIONS_TRUE@@HAVE_DAEMON_TRUE@	  $(INSTALL) -d $(DESTDIR)/$(bash_completions_dir); \