Update nsd to 3.0.5:

NOTE: the configuration file format has changed. Don't update blindly.

Major changes:
- integrated AXFR/IXFR support for zone transfer. IXFR is not supported
  when acting as master.
- TSIG authentication support for queries, notifies and zone transfers.
- full NOTIFY support
- DNAME type is supported
- experimental support for NSEC3 and NSID, not enabled in pkgsrc
- various bug fixes.

6 files changed, 47 insertions, 57 deletions

diff --git a/net/nsd/MESSAGE b/net/nsd/MESSAGE
index 764792d2eea..43eb3ac7c4e 100644
--- a/net/nsd/MESSAGE
+++ b/net/nsd/MESSAGE
@@ -1,7 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2005/11/05 21:27:53 joerg Exp $
+$NetBSD: MESSAGE,v 1.2 2007/08/11 23:48:40 joerg Exp $
+
+The configuration format of nsd has changed between 2.x and 3.x.
+A sample Python script to help migrating the old nsd.zones format
+into the new nsd.conf can be found in share/examples/nsd.
 
-The default location of the NSD database has moved to
-${VARBASE}/db/nsd.db. This location can be overriden by -f for nsd
-and in ${SYSCONFDIR}/nsd/nsdc.conf for nsdc.
 ===========================================================================
diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index 79e282a66a6..a951c606d9a 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2006/07/03 13:33:59 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2007/08/11 23:48:40 joerg Exp $
 
-DISTNAME=	nsd-2.3.5
+DISTNAME=	nsd-3.0.5
 CATEGORIES=	net
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/
 
@@ -8,14 +8,18 @@ MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.nlnetlabs.nl/nsd/index.html
 COMMENT=	Authoritative-only DNS server
 
-BUILD_DEFS+=	USE_INET6
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+BUILD_DEFS+=	USE_INET6 VARBASE
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
 
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
+PKG_SYSCONFSUBDIR=	nsd
+
+CONFIGURE_ARGS+=--with-configdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=--enable-bind8-stats
 CONFIGURE_ARGS+=--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
 .if !defined(USE_INET6)
@@ -23,29 +27,26 @@ CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
 CONFIGURE_ARGS+=--with-pidfile=${VARBASE}/run/nsd.pid
-CONFIGURE_ARGS+=--with-user=nsd
+CONFIGURE_ARGS+=--with-user=${NSD_USER}
 CONFIGURE_ARGS+=--with-dbfile=${VARBASE}/db/nsd.db
+CONFIGURE_ARGS+=--with-difffile=${VARBASE}/db/nsd-ixfr.db
+CONFIGURE_ARGS+=--with-xfrdfile=${VARBASE}/db/nsd-xfrd.state
 CONFIGURE_ARGS+=--with-ssl=${BUILDLINK_PREFIX.openssl}
 
 RCD_SCRIPTS=	nsd
-FILES_SUBST+=	NSDDB=${VARBASE}/db/nsd.db
 
-PKG_GROUPS?=	nsd
-PKG_USERS?=	nsd:nsd
+NSD_USER?=	nsd
+NSD_GROUP?=	nsd
+
+PKG_GROUPS=	${NSD_GROUP}
+PKG_USERS=	${NSD_USER}:${NSD_GROUP}
+
+CONF_FILES+=	share/examples/nsd/nsd.conf ${PKG_SYSCONFDIR}/nsd.conf
 
-.for _file_ in nsd.zones nsdc.conf
-CONF_FILES+=	${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/nsd/${_file_}
-.endfor
+INSTALLATION_DIRS=	share/examples/nsd
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/nsd
-	${INSTALL_DATA_DIR} ${PREFIX}/share/nsd/contrib
-.for FILE in README RELNOTES DIFFERENCES LICENSE NSD-DATABASE TODO
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/nsd
-.endfor
-.for FILE in README build-nsdzones.pl build-nsdzones.pl.README example-plugin.c
-	${INSTALL_DATA} ${WRKSRC}/contrib/${FILE} ${PREFIX}/share/nsd/contrib
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/contrib/nsd.zones2nsd.conf ${DESTDIR}${PREFIX}/share/examples/nsd
 
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/nsd/PLIST b/net/nsd/PLIST
index 8b950a4b0be..caeec6bd008 100644
--- a/net/nsd/PLIST
+++ b/net/nsd/PLIST
@@ -1,27 +1,20 @@
-@comment $NetBSD: PLIST,v 1.8 2005/11/06 16:36:48 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/08/11 23:48:40 joerg Exp $
+man/man5/nsd.conf.5
+man/man8/nsd-checkconf.8
 man/man8/nsd-notify.8
+man/man8/nsd-patch.8
 man/man8/nsd-xfer.8
 man/man8/nsd.8
 man/man8/nsdc.8
 man/man8/zonec.8
 sbin/nsd
+sbin/nsd-checkconf
 sbin/nsd-notify
+sbin/nsd-patch
 sbin/nsd-xfer
 sbin/nsdc
 sbin/zonec
-share/examples/nsd/nsd.zones
-share/examples/nsd/nsdc.conf
 share/examples/rc.d/nsd
-share/nsd/DIFFERENCES
-share/nsd/LICENSE
-share/nsd/NSD-DATABASE
-share/nsd/README
-share/nsd/RELNOTES
-share/nsd/TODO
-share/nsd/contrib/README
-share/nsd/contrib/build-nsdzones.pl
-share/nsd/contrib/build-nsdzones.pl.README
-share/nsd/contrib/example-plugin.c
-@dirrm share/nsd/contrib
-@dirrm share/nsd
+share/examples/nsd/nsd.conf
+share/examples/nsd/nsd.zones2nsd.conf
 @dirrm share/examples/nsd
diff --git a/net/nsd/distinfo b/net/nsd/distinfo
index 24208e4c86c..d0879f09715 100644
--- a/net/nsd/distinfo
+++ b/net/nsd/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20 2006/07/03 13:33:59 joerg Exp $
+$NetBSD: distinfo,v 1.21 2007/08/11 23:48:40 joerg Exp $
 
-SHA1 (nsd-2.3.5.tar.gz) = 99d3e0a763700ffa130082bb7955ddb6fa1ad5d7
-RMD160 (nsd-2.3.5.tar.gz) = 7844faee0593bc67c8008d8c1140b1998ceb4945
-Size (nsd-2.3.5.tar.gz) = 239147 bytes
-SHA1 (patch-aa) = 65bac2ea618750ab629142c2c85cdfbc846e19e3
+SHA1 (nsd-3.0.5.tar.gz) = e6b433e0017d51b8c3f31897053d6c7718957627
+RMD160 (nsd-3.0.5.tar.gz) = 6d5a8ae0068dcab5ea55fd07b6e57444f47a9900
+Size (nsd-3.0.5.tar.gz) = 789687 bytes
+SHA1 (patch-aa) = 81b820eb4f2056ab85cad16b7dc526f1ba2737aa
diff --git a/net/nsd/files/nsd.sh b/net/nsd/files/nsd.sh
index 529ca7dca94..d1513431010 100644
--- a/net/nsd/files/nsd.sh
+++ b/net/nsd/files/nsd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: nsd.sh,v 1.1 2005/11/05 21:27:53 joerg Exp $
+# $NetBSD: nsd.sh,v 1.2 2007/08/11 23:48:40 joerg Exp $
 #
 # PROVIDE: nsd
 # REQUIRE: DAEMON
@@ -11,8 +11,6 @@
 name="nsd"
 rcvar=${name}
 
-required_files="@PKG_SYSCONFDIR@/nsd/nsd.zones @NSDDB@"
-
 command=/usr/pkg/sbin/${name}
 pidfile=/var/run/${name}.pid
 
diff --git a/net/nsd/patches/patch-aa b/net/nsd/patches/patch-aa
index 715d56abcf3..1b8110771e5 100644
--- a/net/nsd/patches/patch-aa
+++ b/net/nsd/patches/patch-aa
@@ -1,16 +1,13 @@
-$NetBSD: patch-aa,v 1.10 2006/07/03 13:34:00 joerg Exp $
+$NetBSD: patch-aa,v 1.11 2007/08/11 23:48:40 joerg Exp $
 
---- Makefile.in.orig	2006-05-08 09:26:05.000000000 +0000
+--- Makefile.in.orig	2007-08-12 00:06:16.000000000 +0200
 +++ Makefile.in
-@@ -173,8 +173,9 @@ install: all
- 	$(INSTALL_DATA) zonec.8 $(DESTDIR)$(mandir)/man8
- 	$(INSTALL_DATA) nsd-notify.8 $(DESTDIR)$(mandir)/man8/nsd-notify.8
- 	$(INSTALL_DATA) nsd-xfer.8 $(DESTDIR)$(mandir)/man8/nsd-xfer.8
--	$(INSTALL_DATA) nsdc.conf.sample $(DESTDIR)$(configfile).sample
--	$(INSTALL_DATA) nsd.zones.sample $(DESTDIR)$(zonesfile).sample
-+	mkdir -p $(prefix)/share/examples/nsd
-+	$(INSTALL_DATA) nsdc.conf.sample $(prefix)/share/examples/nsd/nsdc.conf
-+	$(INSTALL_DATA) nsd.zones.sample $(prefix)/share/examples/nsd/nsd.zones
+@@ -328,7 +328,7 @@ install: all
+ 	$(INSTALL_DATA) $(srcdir)/nsd-patch.8 $(DESTDIR)$(mandir)/man8/nsd-patch.8
+ 	$(INSTALL_DATA) $(srcdir)/nsd-xfer.8 $(DESTDIR)$(mandir)/man8/nsd-xfer.8
+ 	$(INSTALL_DATA) $(srcdir)/nsd.conf.5 $(DESTDIR)$(mandir)/man5/nsd.conf.5
+-	$(INSTALL_DATA) nsd.conf.sample $(DESTDIR)$(nsdconfigfile).sample
++	$(INSTALL_DATA) nsd.conf.sample $(DESTDIR)${PREFIX}/share/examples/nsd/nsd.conf
  
  uninstall:
  	@echo