From 2e0d2b7a82544344fcca21dbfc962d903377dc6c Mon Sep 17 00:00:00 2001 From: "Tom Hendrikx (whyscream)" Date: Mon, 2 Aug 2010 19:26:56 +0000 Subject: version bump to nsd 3.2.6, dropping 3 USE flags due to upstream 'cleanup' in configure script, minor update to init script svn path=/sunrise/; revision=11070 --- net-dns/nsd/Manifest | 10 +++--- net-dns/nsd/files/nsd.cron | 4 +-- net-dns/nsd/files/nsd.initd | 16 +++++++-- net-dns/nsd/metadata.xml | 3 -- net-dns/nsd/nsd-3.2.5.ebuild | 81 ------------------------------------------- net-dns/nsd/nsd-3.2.6.ebuild | 82 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 102 insertions(+), 94 deletions(-) delete mode 100644 net-dns/nsd/nsd-3.2.5.ebuild create mode 100644 net-dns/nsd/nsd-3.2.6.ebuild (limited to 'net-dns') diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest index 40eee2290..652946fd7 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 227 RMD160 9a78cfc2bfb18ada86c42e24310416043d30a4f4 SHA1 feed7a81954ba03e85457ee731ca7475098bd189 SHA256 8d62364ac608edacbb1e1d2a80c3b9490600eca65c796f84b394a6289618778c -AUX nsd.initd 1564 RMD160 def86cc589c7b004a734110b3c75639b51acbc57 SHA1 cd9244a54aeb61e42a57038ec895c8130436f549 SHA256 ffd8019da6e8b60156bd232a7612112deee957eafb8d8eb9f3a149827fad14da -DIST nsd-3.2.5.tar.gz 863577 RMD160 fcd608791cefc115678982a19a44474a64494504 SHA1 90678506145a7a4cf62fbb266013abb8ad464484 SHA256 219d27655168e66b9d0383689724492709902bc1229000d27099d41a6c9798d9 -EBUILD nsd-3.2.5.ebuild 2255 RMD160 7096dc60ba7237f42516952069d5e16bbf647825 SHA1 7c6f154c036883cdb5c1ec6c20ad4aff2ec7f7f4 SHA256 af7b0e6d8c4c628968cf4ed4b7484164bc778584ae1b626c35deabe3b5562143 +AUX nsd.cron 226 RMD160 c233bc5dad3d6fe294a319b18951dd39b3f7526a SHA1 459ce4169546ac9027241c951563a1e1b45227d1 SHA256 0440fbb33895a010bf7df9b772d757faa3b7c188e14de45331167b6e1fe9c4d3 +AUX nsd.initd 1810 RMD160 54f405b6bfcfdf4826c840023e56104660a58381 SHA1 4ad6b13be41d1b03d77d945e05e6734689dbd4d3 SHA256 9b8b3419a683d79bc1e2aa9d9dbfd8c7deae17e2f95aad5b09537aed3abd214a +DIST nsd-3.2.6.tar.gz 865021 RMD160 8df9cbb91dfd5279d3c8daf94aea99a7634c2b48 SHA1 7857df4c34a10f63c8100ae806f12f6035397773 SHA256 858bc6cd2cb81c2e364b9a8a324c97f38a8c676b9f5ae8e07a100d8f528d8d6e +EBUILD nsd-3.2.6.ebuild 2349 RMD160 dc498b0a6a16c5d5408420040b8cd3ccd133e69c SHA1 07c99c93a4d35e992c90a81ee19881f2919b618d SHA256 6cc10d46378fd98dde4201f209874e9ce87268c2253a49a07b0e55f2c504fcbc MISC ChangeLog 2274 RMD160 6f269181451203d2deade2943222fae1c19ee15c SHA1 0cdd347a8e0789cb540f62373a4cd4202d41f233 SHA256 806364fef9820f40259481015ab8ee1dcf8489296c33363ae9187ce257bfa598 -MISC metadata.xml 696 RMD160 2466d7db79fa9e45f3b2b0a9846668a71fce4822 SHA1 92274f7eaba3b5b9f7b2fd8c644cb14052f0aff7 SHA256 bb7be360da50bfe94d3c606a9f4ed3d13413d4715f2b51e845cb200e0bc233df +MISC metadata.xml 551 RMD160 64919dd481309b32d1f9f54ceda491cdc94d9134 SHA1 af02f1b2bd8ad94b944ba4ecd6e28845b5827667 SHA256 f373accf720f3a352ef530d64620912a99b40d417181df1ccc366eea3e3dc074 diff --git a/net-dns/nsd/files/nsd.cron b/net-dns/nsd/files/nsd.cron index 36aaf32b0..158938a1e 100644 --- a/net-dns/nsd/files/nsd.cron +++ b/net-dns/nsd/files/nsd.cron @@ -1,10 +1,10 @@ #!/bin/sh -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ # my_nsdc="/usr/sbin/nsdc" -if [[ -x ${my_nsdc} ]]; then +if test -x ${my_nsdc}; then ${my_nsdc} patch 1>/dev/null fi diff --git a/net-dns/nsd/files/nsd.initd b/net-dns/nsd/files/nsd.initd index a2ad26a73..76ac12100 100644 --- a/net-dns/nsd/files/nsd.initd +++ b/net-dns/nsd/files/nsd.initd @@ -1,5 +1,5 @@ #!/sbin/runscript -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ # @@ -20,7 +20,7 @@ depend() { } _checkconf() { - if [ ! -e "${config_file}" ]; then + if ! test -e "${config_file}"; then eerror "You need to create an appropriate config file." eerror "An example can be found in /etc/nsd/nsd.conf.sample" return 1 @@ -33,8 +33,17 @@ _checkconf() { return 0 } +_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 + fi + return 0 +} + _patch() { - local difffile=`${my_nsd_checkconf} -o difffile ${config_file}` + local difffile=$(${my_nsd_checkconf} -o difffile ${config_file}) if test -s ${difffile}; then ebegin "Patching NSD zone files" ${my_nsdc} patch > /dev/null @@ -53,6 +62,7 @@ _rebuild() { start() { ebegin "Starting NSD" _checkconf || return 1 + _checkdb || _rebuild || return 1 ${my_nsdc} start ${my_nsdc} running eend $? diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml index 6b7c9165b..f99de67e6 100644 --- a/net-dns/nsd/metadata.xml +++ b/net-dns/nsd/metadata.xml @@ -6,12 +6,9 @@ Enables BIND8 like NSTATS and XSTATS - Enable DNSSEC support Enable largefile support Enable NSEC3 support - Enable NSID support Configure NSD as a root server Enable runtime checks - Enable TSIG support diff --git a/net-dns/nsd/nsd-3.2.5.ebuild b/net-dns/nsd/nsd-3.2.5.ebuild deleted file mode 100644 index ad4974bfa..000000000 --- a/net-dns/nsd/nsd-3.2.5.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bind8-stats dnssec ipv6 largefile nsec3 nsid root-server runtime-checks tsig" - -DEPEND="tsig? ( dev-libs/openssl )" -RDEPEND=${DEPEND} - -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 -} - -src_configure() { - econf \ - --with-dbfile=/var/db/nsd/nsd.db \ - --with-difffile=/var/db/nsd/ixfr.db \ - --with-pidfile=/var/run/nsd/nsd.pid \ - --with-xfrdfile=/var/db/nsd/xfrd.state \ - --with-zonesdir=/var/lib/nsd \ - $(use_enable bind8-stats) \ - $(use_enable dnssec) \ - $(use_enable largefile) \ - $(use_enable ipv6) \ - $(use_enable nsec3) \ - $(use_enable nsid) \ - $(use_enable root-server) \ - $(use_enable runtime-checks checking) \ - $(use_enable tsig) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc doc/{ChangeLog,CREDITS,NSD-FOR-BIND-USERS,README,REQUIREMENTS} \ - || die "dodoc failed" - - insinto /usr/share/nsd - doins "${FILESDIR}/nsd.cron" || die "doins failed" - doins contrib/nsd.zones2nsd.conf || die "doins failed" - - newinitd "${FILESDIR}"/nsd.initd nsd || die "newinitd failed" - newconfd "${FILESDIR}"/nsd.confd nsd || die "newconfd failed" - - # database directory, writable by nsd for ixfr.db file - dodir /var/db/nsd - fowners nsd:nsd /var/db/nsd - fperms 750 /var/db/nsd - - # zones directory, writable by root for 'nsdc patch' - dodir /var/lib/nsd - fowners root:nsd /var/lib/nsd - fperms 750 /var/lib/nsd - - # pid dir, writable by nsd - dodir /var/run/nsd - fowners nsd:nsd /var/run/nsd -} - -pkg_postinst() { - elog "If you are using bind and want to convert (or sync) bind zones" - elog "you should check out bind2nsd (http://bind2nsd.sourceforge.net)." - echo - elog "To automatically merge zone transfer changes back to nsd's" - elog "zone files using 'nsdc patch', try nsd.cron in /usr/share/nsd" -} diff --git a/net-dns/nsd/nsd-3.2.6.ebuild b/net-dns/nsd/nsd-3.2.6.ebuild new file mode 100644 index 000000000..40c0f04f5 --- /dev/null +++ b/net-dns/nsd/nsd-3.2.6.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils + +DESCRIPTION="An authoritative only, high performance, open source name server" +HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" +SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bind8-stats ipv6 largefile nsec3 root-server runtime-checks" + +DEPEND="tsig? ( dev-libs/openssl )" +RDEPEND=${DEPEND} + +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 +} + +src_configure() { + econf \ + --with-dbfile=/var/db/nsd/nsd.db \ + --with-difffile=/var/db/nsd/ixfr.db \ + --with-pidfile=/var/run/nsd/nsd.pid \ + --with-xfrdfile=/var/db/nsd/xfrd.state \ + --with-zonesdir=/var/lib/nsd \ + $(use_enable bind8-stats) \ + $(use_enable largefile) \ + $(use_enable ipv6) \ + $(use_enable nsec3) \ + $(use_enable root-server) \ + $(use_enable runtime-checks checking) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc doc/{ChangeLog,CREDITS,NSD-FOR-BIND-USERS,README,REQUIREMENTS} \ + || die "dodoc failed" + + insinto /usr/share/nsd + doins "${FILESDIR}/nsd.cron" || die "doins failed" + doins contrib/nsd.zones2nsd.conf || die "doins failed" + + newinitd "${FILESDIR}"/nsd.initd nsd || die "newinitd failed" + newconfd "${FILESDIR}"/nsd.confd nsd || die "newconfd failed" + + # database directory, writable by nsd for ixfr.db file + dodir /var/db/nsd + fowners nsd:nsd /var/db/nsd + fperms 750 /var/db/nsd + + # zones directory, writable by root for 'nsdc patch' + dodir /var/lib/nsd + fowners root:nsd /var/lib/nsd + fperms 750 /var/lib/nsd + + # pid dir, writable by nsd + dodir /var/run/nsd + fowners nsd:nsd /var/run/nsd +} + +pkg_postinst() { + elog "If you are using bind and want to convert (or sync) bind zones" + elog "you should check out bind2nsd (http://bind2nsd.sourceforge.net)." + echo + elog "To automatically merge zone transfer changes back to nsd's" + elog "zone files using 'nsdc patch', try nsd.cron in /usr/share/nsd" + echo + # remove on next version bump + einfo "Since nsd 3.2.6, USE flags for dnssec, nsid and tsig have been" + einfo "removed, as all of them are now enabled by default by upstream." +} -- cgit v1.2.3-65-gdbad