added munin plugin + USE flag, small other improvements

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64

4 files changed, 32 insertions, 9 deletions

diff --git a/net-dns/nsd/ChangeLog b/net-dns/nsd/ChangeLog
index 5f97f5db6cb0..c90b0b281206 100644
--- a/net-dns/nsd/ChangeLog
+++ b/net-dns/nsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/nsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/ChangeLog,v 1.1 2013/01/30 10:43:01 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/ChangeLog,v 1.2 2013/01/30 17:19:22 wschlich Exp $
+
+*nsd-4.0.0_beta3-r1 (30 Jan 2013)
+
+  30 Jan 2013; Wolfram Schlich <wschlich@gentoo.org> +nsd-4.0.0_beta3-r1.ebuild,
+  -nsd-4.0.0_beta3.ebuild, metadata.xml:
+  added munin plugin + USE flag, small other improvements
 
 *nsd-4.0.0_beta3 (30 Jan 2013)
 
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 442327185aee..bb392eea88be 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,5 +1,5 @@
 AUX nsd.initd 1478 SHA256 3f57c1dfa11211dee4e0449e7afadb0e5b4b4156dfcc226720bca7b5b30dda93 SHA512 26edf33acdef8e34fdb896be3cb4ad676067d3b04242b03e03a25182d39d8c182f7c529ae61df9e7611db4ed0e79034526d5a81f7a861d5a863f33934a7ec456 WHIRLPOOL 13c8dc78395574d432c677534a899e95d3befd53c594243675d725bd23f005c2dd4b3b8cf61b88f3b7492bf76cb20fc3fd574a31678cb62664d228415280b6d5
 DIST nsd-4.0.0b3.tar.gz 1016389 SHA256 1348f1290b2ee2b04dc4558d55cb6255bbeb39b85134aab7c98545a737db55c2 SHA512 d03aaa7c9a4b7e405e93492d4eec16d7495c8a4a85ff1e510dcf763f2d38ffe4476ab8e979078a75cad7abeaf64de0312b7d4702e53e1df93e866dd0ef4cc9b7 WHIRLPOOL 11025145589cd35de6259e166ae2e86ee1f93ff1f42d0f4f991ade657b180b813bd95a50ce57ace631b7411a711577b3e4abdbfe958e179206827e8ea100ccf6
-EBUILD nsd-4.0.0_beta3.ebuild 2025 SHA256 eac41a4ccd39efd6a6551ebc5c09be3dc847cbcfba0e62ab461e5fe638732b84 SHA512 53684d873dcfe66582ac9eb79844fd56d079603f67e8ac5861d4f0fb9b73f2d4c0c5e181cbf6e7465c06197570d40948bd78864a64564c6c0a4cf2c14850edd6 WHIRLPOOL 492769989acda6bf971683d85241c0bc807885e683dcad557ffe4361f68be6fcd6a3e3f4ec2b23b891b8cb51c8be79febccb031975887598d3a5382d241f0083
-MISC ChangeLog 421 SHA256 f659931b39f3fd2a6c7a81fa11af84bc05120a5cfdd450cdc80a756f682eaeb3 SHA512 f93df442ea2ba10d858adf11120396b2e9c95a6c6e7e28d400e9114cc7b9e3bf93e2b9b1a49848bd3091339a1b9315eccf0235e4db528d90bfcc90091989c9e4 WHIRLPOOL ea13c4e03ae97533d2df9593743cf1aa9a816752d3a95fd0bea2466654dea6caa47467dd79cd3e587f48f37c7cc020dd121066290e81f2cf119bb072221323ed
-MISC metadata.xml 1081 SHA256 ecc49f4f6a35f2f8c8918083ea30b16c4a52555a89668fac4585a93fa8830b2b SHA512 74cfaa6005102270125f2682e603867256eb5f93677c37bd8e01de112eee89753ddd6599c48922ff61d3de97144b7414a799a2633a844d61809fde241244e99d WHIRLPOOL de8d1cf3dc67086383b407eccab39fa186cb41cd058537963a1bae41d8523a1c729363a95544c5ff0d1c3e97282024d28d4df8ebe18e74e50474e94888de2554
+EBUILD nsd-4.0.0_beta3-r1.ebuild 2447 SHA256 51030b8dba7bf7a08cd3540851ec409c931439e33d2531aa96da0e7c705ba490 SHA512 225f74fcf158b3f4a129c0c40ce79d398c81b3da7ae1476385551d02771dbb3f19e473bffe1c9e6c9e183268edd9a8bc7db074fe38fa242ae9204b9035cdcd5b WHIRLPOOL e59b1b10d2a702d9f1d5397e6026d94d36314f311c7b58aa2c7dfe7e18d18740a6261e7dc2b9d95ddf438923888fa1c2ba86571c63f2f29edd96c9d3e1ecf9b0
+MISC ChangeLog 637 SHA256 5de31f7fb1d8746aff68dc2aa673a71eed0d06627b5d86574db2924da44f0580 SHA512 1a109e608e7541cd6a7d7b52b5938bfdac2683ad6a07e123f3e1d826a73680c0744ba2f7f53dddc24cc97bffc8f3669c1c75a31d5978e1045f50f26a73455b16 WHIRLPOOL 323e233c8a953f14ded37d092f6874954d064cb775a67abff3792b1c895e17f9965452a7465cb52904f62faa6099028cba1bd4d64d95c12d5de5ce4ddaa9dbc2
+MISC metadata.xml 1203 SHA256 c00508f31dac525b60c403f3bf87280af9c83b3bb977859ba1db6588a9a70479 SHA512 2b5814b8dd37e94b18e9f29697aabd861db3c8b7e212eb74d2caeb08c735887794e91d584ed9a796528355d4cac9e4a29304ab5aced38bdaf8d7ea284cc1735c WHIRLPOOL 8a4147867a603257881a84823f4a2dd774a3b4c9b6de7d3ed698a95a004986ae34b7fc7068fbfca5b94ee539f1926b53e62f01ef409518364260d08310e06252
diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml
index e16ce939dce9..2879366705cc 100644
--- a/net-dns/nsd/metadata.xml
+++ b/net-dns/nsd/metadata.xml
@@ -24,5 +24,8 @@
 		<flag name='root-server'>Configure NSD as a root server</flag>
 		<flag name='runtime-checks'>Enable runtime checks, this could lead 
 			to a reduced service level</flag>
+		<flag name='munin'>
+			Install a plugin for <pkg>net-analyzer/munin</pkg> to graph
+			statistical data from nsd.</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-dns/nsd/nsd-4.0.0_beta3.ebuild b/net-dns/nsd/nsd-4.0.0_beta3-r1.ebuild
index 627bf052adbd..8633109d9044 100644
--- a/net-dns/nsd/nsd-4.0.0_beta3.ebuild
+++ b/net-dns/nsd/nsd-4.0.0_beta3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-4.0.0_beta3.ebuild,v 1.1 2013/01/30 10:43:01 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-4.0.0_beta3-r1.ebuild,v 1.1 2013/01/30 17:19:22 wschlich Exp $
 
 EAPI=4
 
@@ -18,13 +18,14 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats ipv6 libevent minimal-responses mmap +nsec3 ratelimit root-server runtime-checks ssl"
+IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl"
 
 RDEPEND="
 	dev-libs/openssl
 	virtual/yacc
 	libevent? ( dev-libs/libevent )
 	ssl? ( dev-libs/openssl )
+	munin? ( net-analyzer/munin )
 "
 DEPEND="
 	${RDEPEND}
@@ -39,11 +40,13 @@ pkg_setup() {
 src_configure() {
 	econf \
 		--enable-largefile \
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \
 		--with-logfile="${EPREFIX}"/var/log/nsd.log \
 		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid \
+		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \
 		--with-xfrdir="${EPREFIX}"/var/db/nsd \
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.db \
+		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state \
+		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list \
+		--with-zonesdir="${EPREFIX}"/var/lib/nsd \
 		$(use_enable bind8-stats) \
 		$(use_enable ipv6) \
 		$(use_enable minimal-responses) \
@@ -63,11 +66,22 @@ src_install() {
 
 	newinitd "${FILESDIR}"/nsd.initd nsd
 
-	# database directory, writable by nsd for zone updates and transfers
+	# database directory, writable by nsd for database updates and zone transfers
 	dodir /var/db/nsd
 	fowners nsd:nsd /var/db/nsd
 	fperms 750 /var/db/nsd
 
+	# zones directory, writable by nsd for zone file updates (nsd-control write)
+	dodir /var/lib/nsd
+	fowners nsd:nsd /var/lib/nsd
+	fperms 750 /var/lib/nsd
+
+	# install munin plugin
+	if use munin; then
+		exeinto /usr/libexec/munin/plugins
+		doexe contrib/nsd_munin_
+	fi
+
 	# remove the /run directory that usually resides on tmpfs and is
 	# being taken care of by the nsd init script anyway (checkpath)
 	rm -rf "${D}"/run || die "Failed to remove /run"