net-dns/nsd: version bump, new USE flags, and minor init.d fix

5 files changed, 31 insertions, 18 deletions

diff --git a/net-dns/nsd/ChangeLog b/net-dns/nsd/ChangeLog
index d31c3d857..d24fc5e28 100644
--- a/net-dns/nsd/ChangeLog
+++ b/net-dns/nsd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*nsd-3.2.11 (09 Jul 2012)
+
+  09 Jul 2012; Tom Hendrikx (whyscream) <tom@whyscream.net> -nsd-3.2.10.ebuild,
+  +nsd-3.2.11.ebuild, files/nsd.initd, metadata.xml:
+  version bump, new USE flags, and minor init.d fix
+
   22 Jun 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> nsd-3.2.10.ebuild:
   inherit user eclass instead of eutils eclass for enewuser
 
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 6dd32ffe1..fbd104922 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,7 +1,7 @@
 AUX nsd.confd 104 RMD160 cd15a20757fd4db72a2da5327d68f4d6561bb271 SHA1 5fab374d008609d8aba9adb2a6eb0574f4ea4596 SHA256 de3c05a7b898b86f544ebc5804540dbf9736695cb21d614964561294533f2050
 AUX nsd.cron 262 RMD160 3fd5de5c7a3496d14705a5bb83d4632ce097b276 SHA1 6fc62e72e16fffd1d6e996cf616c9beb534a207d SHA256 c7b1d0141be64800fe88054b589afa0dc25d21ab42f40ee46e5b1ec659bfc8da
-AUX nsd.initd 1837 RMD160 5eb74375e3fa3ceda3dc98a021fcf104dbdb96d8 SHA1 22cbb5f30696e97d01b48014986830d6abd415b8 SHA256 d94d993e4a6ef5fdb7ba08123d04dd23e7d1b4f92d367915cc346b5011a9bd76
-DIST nsd-3.2.10.tar.gz 879180 RMD160 f096d162242d695dfa0596a46229c3a16475bafd SHA1 04657cffe5087d97213b245f8281296cac86b868 SHA256 fe6d9fae7ec549f1fa1f4fb1e40c9f05311fac43edf256a0d9f4f46377c23f31
-EBUILD nsd-3.2.10.ebuild 2083 RMD160 4ec242e6351c8d9069c94d35afaa839056e44913 SHA1 8a6a44de0adb77dc646b35c3af90432a81ae218e SHA256 03424bdd52cf17e7e03a640486bd429bfd674df5843a7139c28edc8ea16bcd2a
-MISC ChangeLog 4022 RMD160 67f8ec908b0255142ec8a6af669209c161836dd5 SHA1 085dfb7402a543aa53fc49c40a42cb8dd44e5d5d SHA256 2c96e68dae3093304fefb77df7b4e2a2d12d53057670bed1838322243fbede04
-MISC metadata.xml 472 RMD160 a598246ecb755ea526707cd20a3950929edb602b SHA1 5a4e9c06700d13b9fd7d92e2c65b3bcab66eee5b SHA256 84691567761773c3ccf9e9cc7a26edec1ceccf9a0a4596863779404380b0b0e9
+AUX nsd.initd 1825 RMD160 7921c9055e1cc34a5c588de61c82b0a135aa4ea1 SHA1 351fe6c25aaddac624623a5bb6cbe71b160bad10 SHA256 f58d7c403636d39b5211cb293931625764e77debae3907c09d8a3f7eb2fd3b15
+DIST nsd-3.2.11.tar.gz 885810 RMD160 e5764ddb6533a0f85b0c08764a8a7471d0249072 SHA1 4b8b9293fd13b0fba2a2bff9fd11940e0d8d7448 SHA256 9cd23d177ca241836d184b0203f6add0e5c2b98461069100001efe79afdc0d80
+EBUILD nsd-3.2.11.ebuild 2068 RMD160 8d1d9b1af9cae6f63f4ae9ceafc19a904aa95ed9 SHA1 969192508a04209c93ada140b1afeaa042cc9f57 SHA256 c4d7a4d474ff1fd20fd3b5872732424201ae95511c0f1fe556683e02fa262ba8
+MISC ChangeLog 4235 RMD160 3c5758c097283419b28399cb5d41c3647ca13974 SHA1 a1425520e14b858054ab53603aea0fb13a62b867 SHA256 782a551c38270b9b3b5d04011a75d59523ca3cb5e989839be77cdf192894906a
+MISC metadata.xml 632 RMD160 bcec2f385914874a1d1bcc75528663845c760cd0 SHA1 5b82a1fa928f5e24e16c5762c295ee4d7fb8c640 SHA256 fd58c2c3edd0ed6c7cef499ba635cfa475ab347d0dd5bba6912abb83796d421f
diff --git a/net-dns/nsd/files/nsd.initd b/net-dns/nsd/files/nsd.initd
index 1b827db65..891df962e 100644
--- a/net-dns/nsd/files/nsd.initd
+++ b/net-dns/nsd/files/nsd.initd
@@ -37,7 +37,7 @@ _checkdb() {
 	local database=$(${my_nsd_checkconf} -o database ${config_file})
 	if ! test -f $database; then
 		eerror "You have no database file in ${database}, will try to rebuild"
-		_rebuild
+		rebuild
 	fi
 	return 0
 }
@@ -63,7 +63,7 @@ rebuild() {
 start() { 
 	ebegin "Starting NSD"
 	_checkconf || return 1
-	_checkdb || rebuild || return 1
+	_checkdb || return 1
 	${my_nsdc} start
 	${my_nsdc} running
 	eend $? 
diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml
index effad9c63..aab769769 100644
--- a/net-dns/nsd/metadata.xml
+++ b/net-dns/nsd/metadata.xml
@@ -3,10 +3,12 @@
 <pkgmetadata>
 	<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
 	<use>
-		<flag name='bind8-stats'>Enables BIND8 like NSTATS and 
-			XSTATS</flag>
+		<flag name='bind8-stats'>Enables BIND8 like NSTATS and XSTATS</flag>
 		<flag name='nsec3'>Enable NSEC3 support</flag>
 		<flag name='root-server'>Configure NSD as a root server</flag>
-		<flag name='runtime-checks'>Enable runtime checks</flag>
+		<flag name='runtime-checks'>Enable runtime checks, this could lead 
+			to a reduced service level</flag>
+		<flag name='zone-stats'>Enable per-zone statistics logging, this 
+			could lead to a reduced service level</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-dns/nsd/nsd-3.2.10.ebuild b/net-dns/nsd/nsd-3.2.11.ebuild
index 6889d06f7..6ab5454b3 100644
--- a/net-dns/nsd/nsd-3.2.10.ebuild
+++ b/net-dns/nsd/nsd-3.2.11.ebuild
@@ -13,15 +13,18 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats ipv6 nsec3 root-server runtime-checks"
+IUSE="bind8-stats ipv6 mmap +nsec3 root-server runtime-checks zone-stats"
 
-DEPEND="dev-libs/openssl"
-RDEPEND=${DEPEND}
+RDEPEND="
+	dev-libs/openssl
+	virtual/yacc
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+"
 
 pkg_setup() {
-	if use runtime-checks; then
-		ewarn "You enabled runtime-checks USE flag, this could lead to a reduced service level"
-	fi
 	enewgroup nsd
 	enewuser nsd -1 -1 -1 nsd
 }
@@ -36,9 +39,11 @@ src_configure() {
 		--enable-largefile \
 		$(use_enable bind8-stats) \
 		$(use_enable ipv6) \
+		$(use_enable mmap) \
 		$(use_enable nsec3) \
 		$(use_enable root-server) \
-		$(use_enable runtime-checks checking)
+		$(use_enable runtime-checks checking) \
+		$(use_enable zone-stats)
 }
 
 src_install() {
@@ -50,7 +55,7 @@ src_install() {
 	doins contrib/nsd.zones2nsd.conf
 
 	exeinto /etc/cron.daily
-	doexe "${FILESDIR}/nsd.cron"
+	doexe "${FILESDIR}"/nsd.cron
 
 	newinitd "${FILESDIR}"/nsd.initd nsd
 	newconfd "${FILESDIR}"/nsd.confd nsd