Fix initscript bugs #279568 and #257632.

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

5 files changed, 477 insertions, 2 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index cb5ce5343c6f..db73efb119ec 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.246 2009/11/12 07:56:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.247 2009/11/12 08:37:18 scarabeus Exp $
+
+*bind-9.6.1_p1-r1 (12 Nov 2009)
+
+  12 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +bind-9.6.1_p1-r1.ebuild, +files/named.confd-r3, +files/named.init-r7:
+  Fix initscript bugs #279568 and #257632.
 
   12 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> bind-9.6.1_p1.ebuild:
   Fix collision issues. Per bug #276966 and #282565.
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index c3268e9aa150..d8cce68b6efd 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -14,9 +14,11 @@ AUX named.ca 2940 RMD160 a1a3c1fc88f50c2cd60a3a3dcd2c884f553d1095 SHA1 9feadfe32
 AUX named.conf-r3 1314 RMD160 b8189eaac58eb27b612eacc66826802748e145ca SHA1 d8b2af94a89472ed0b767bdebadcfebcbf6ddfd3 SHA256 ab2f7305e9a1d30406528c5ef079beb4970c89572e90d57bb5ddb27b8126ad13
 AUX named.confd-r1 392 RMD160 eb80118694d541aeb06df96473ca7d226adf0f6c SHA1 8a0a19237cb661c9d10f545041783edc0f3795ce SHA256 7f985999486b6cfea652b7a7470976bc703c259ef8cbc1cedc3eaacb302805a6
 AUX named.confd-r2 479 RMD160 0a0452bf9bb6f18d4628ee72abe82a52d484a2cb SHA1 d0b0e2f5d72d43862c5aaff9a226fd8599992323 SHA256 bae05257852ecbc7f66bd30e452162f15b6f6e8c3fc170fb6dfdfa7d22361915
+AUX named.confd-r3 565 RMD160 3592e3e42a27a8a9e0a2a2728ebb5b993e31960c SHA1 b2ee0c6465612e480631f966da1047a17aefd5e4 SHA256 5bc18b263101663e089764c87941ac0c19e6030fe3011f6dba3eebbadfb536f2
 AUX named.init-r4 1585 RMD160 30ed0f443f0ec1b63d3fd15e4d32fc79ad6199af SHA1 e600929124b4e993552896f6f111f06a706fed89 SHA256 f2eb9393a7380f670af0e09bd378cf619681e33b81ed7e5c7f5b7a1b01964821
 AUX named.init-r5 1620 RMD160 37279362e437241188a07e5f274730e68645827e SHA1 00a14819a322b391183084c79cc9a4dc04d0d484 SHA256 07fb9d653f086319680d04abde0218495ed09d3528087257788bf294252a0bad
 AUX named.init-r6 2677 RMD160 034167ae1532b4e1547b57905acca5dadb816da5 SHA1 8221bbba9b345738e12a5c7a27c5972882bf2aa1 SHA256 b64f6ff961c795a652740ee82d26fe029a9e009c0af2525d6383cfaa2a184034
+AUX named.init-r7 2717 RMD160 fd00883265443b762fa69135579a59cf350c75cd SHA1 340f41e153416d0c444750e5fbe17534cb44e40f SHA256 b10c1607500fccb2e58707c3c197e2bbe4c615bba06748baff34d53cb57bfbad
 DIST bind-9.4.3-P2.tar.gz 6544865 RMD160 89d7c41a8c04833f4427914857f91ffffb0ac5ee SHA1 6ef00b9db269180e4cfa2ea3fe06f7ab9bc7cfa0 SHA256 fb7c9964942ecc07606bb8d4361bf9d9bd8091e059fea1b56e6a0972f99b1ba1
 DIST bind-9.4.3-P3.tar.gz 6544968 RMD160 1e59f48f538141bb5c36fa58607ac4689cb6a161 SHA1 165b3ee52309ae4a483901db6992a979f6382ba7 SHA256 cf1186b9f9bb993053e49f7c9bc22a1f218266cc6112d4e668a56ab8861a2b6d
 DIST bind-9.5.1-P3.tar.gz 6690806 RMD160 6a929a8860b4e0f4394783023eef8b488ad58af8 SHA1 fa17c60a1e0e95c67b2680f091e46c5677dcb805 SHA256 81dfb6ef4d5b1fc5adb24b4b099cf7fc94c785d04f4c96b634d35ec98758560a
@@ -26,6 +28,7 @@ DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d S
 EBUILD bind-9.4.3_p2.ebuild 9213 RMD160 1e4d6db34438c0bb9f5996c5429f29e1cf63fd00 SHA1 c21db5b43d12eeb3f9ded54efa8a92df8b9ddfbf SHA256 8c4533cf5656d4268bab787b1b87ca296fbcdd131c28afcc02c47899505cb5f4
 EBUILD bind-9.4.3_p3.ebuild 9214 RMD160 98d46b131a300f7c8abcd501feb97a5c45067c73 SHA1 b6949704ec75b8f156b8610fdee078d9c1bef3b6 SHA256 e9c0680d2c1fce0f2e45c0c9269a80c94a1f6d0e22a73d42049c71414632dc2e
 EBUILD bind-9.5.1_p3.ebuild 9633 RMD160 dcb0cf93b95ef56096a42c2872fc7808526dd366 SHA1 59bbf11afb7047ada25dc51a278022f45d472239 SHA256 072131d7baa0ea499b4a4de3042189a58d1920e48dd04c7e1e6eb88cbe673c4a
+EBUILD bind-9.6.1_p1-r1.ebuild 9434 RMD160 bf9e49803a4ae83bddce41b568915fe06f18cd47 SHA1 c866a21ea9356a8948078f07f50b89316d2a5c05 SHA256 ef16ffa15f23d1e524c4f0e36d4b3e9875566edc3578e049a8cbbeba1713b7da
 EBUILD bind-9.6.1_p1.ebuild 9431 RMD160 66e47630c70700850d67822295a8c95186ca0ba6 SHA1 06a12fa4d0401ba5241daf40d4c136902ff9cb81 SHA256 edba82a58eb96590a6baf57bde2fc07e49560b1a8ad1a2015e5693087b57d7f8
-MISC ChangeLog 39878 RMD160 d389336c520a8bd25194235c0c7b6291f01cce37 SHA1 134afa2561d9aa2af33696d040bf558bc635ca3e SHA256 161257511164dc6af012aa924f945224c7fc44a16a74939c3c02352f53d124d2
+MISC ChangeLog 40083 RMD160 f50fe449b777b838751dcdf18c071f1c5096a947 SHA1 298473a12129cee2a8bf8e2965a961d13eecc66c SHA256 4b92c24ce8d2d8542c22e95c5036faf3e66631081a3f2ee98d5c5424210c7fc2
 MISC metadata.xml 647 RMD160 63aeb182631d45c774bdc08f11901147028f6d7c SHA1 9aff80992005daa758d373c4e3311ff8c3ae3ef9 SHA256 9417c62e0e5817e26d36ab5efd87f126781dbf445d9a1beb3abb899b8cb4806a
diff --git a/net-dns/bind/bind-9.6.1_p1-r1.ebuild b/net-dns/bind/bind-9.6.1_p1-r1.ebuild
new file mode 100644
index 000000000000..f85159319c66
--- /dev/null
+++ b/net-dns/bind/bind-9.6.1_p1-r1.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.1_p1-r1.ebuild,v 1.1 2009/11/12 08:37:18 scarabeus Exp $
+
+EAPI="2"
+
+inherit eutils autotools toolchain-funcs flag-o-matic
+
+MY_PV="${PV/_p1/-P1}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0"
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
+	sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.bz2 )
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads
+	resolvconf urandom sdb-ldap xml"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
+	mysql? ( >=virtual/mysql-4.0 )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )
+	idn? ( net-dns/idnkit )
+	postgres? ( virtual/postgresql-base )
+	threads? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	resolvconf? ( net-dns/openresolv )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use threads && {
+		ewarn
+		ewarn "If you're in vserver enviroment, you're probably want to"
+		ewarn "disable threads support because of linux capabilities dependency"
+		ewarn
+	}
+
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_prepare() {
+	# bug 278364 (workaround)
+	epatch "${FILESDIR}/${PN}-9.6.1-parallel.patch"
+
+	# Adjusting PATHs in manpages
+	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+		sed -i \
+			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+			"${i}" || die "sed failed, ${i} doesn't exist"
+	done
+
+	use dlz && epatch "${FILESDIR}"/${PN}-9.4.0-dlzbdb-close_cursor.patch
+
+	# bind fails to reconnect to MySQL5 databases, bug #180720, patch by Nicolas Brousse
+	# (http://www.shell-tips.com/2007/09/04/bind-950-patch-dlz-mysql-5-for-auto-reconnect/)
+	use dlz && use mysql && has_version ">=dev-db/mysql-5" && epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
+
+	# should be installed by bind-tools
+	sed -i -e "s:nsupdate ::g" bin/Makefile.in || die
+
+	# sdb-ldap patch as per  bug #160567
+	# Upstream URL: http://bind9-ldap.bayour.com/
+	use sdb-ldap && epatch "${WORKDIR}"/sdb-ldap/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+
+	# bug #220361
+	rm {aclocal,libtool}.m4
+	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf
+
+	# bug #151839
+	sed -i -e \
+		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
+		lib/isc/unix/socket.c || die
+
+	# remove useless c++ checks
+	epunt_cxx
+}
+
+src_configure() {
+	local myconf=""
+
+	use dlz && {
+		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
+		use postgres && myconf="${myconf} --with-dlz-postgres"
+		use mysql && myconf="${myconf} --with-dlz-mysql"
+		use berkdb && myconf="${myconf} --with-dlz-bdb"
+		use ldap  && myconf="${myconf} --with-dlz-ldap"
+		use odbc  && myconf="${myconf} --with-dlz-odbc"
+	}
+
+	if use threads; then
+		if use dlz && use mysql; then
+			ewarn
+			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
+			ewarn "requires that each thread of an application execute a MySQL"
+			ewarn "\"thread initialization\" to setup the thread local storage."
+			ewarn "This is impossible to do safely while staying within the DLZ"
+			ewarn "driver API. This is a limitation caused by MySQL, and not"
+			ewarn "the DLZ API."
+			ewarn "Because of this BIND MUST only run with a single thread when"
+			ewarn "using the MySQL driver."
+			ewarn
+			myconf="${myconf} --disable-linux-caps --disable-threads"
+			ewarn "Threading support disabled"
+			epause 10
+		else
+			myconf="${myconf} --enable-linux-caps --enable-threads"
+			einfo "Threading support enabled"
+		fi
+	else
+		myconf="${myconf} --disable-linux-caps --disable-threads"
+	fi
+
+	if use urandom; then
+		myconf="${myconf} --with-randomdev=/dev/urandom"
+	else
+		myconf="${myconf} --with-randomdev=/dev/random"
+	fi
+
+	# bug #158664
+	gcc-specs-ssp && replace-flags -O[23s] -O
+	export BUILD_CC="${CBUILD}-gcc"
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		$(use_with ssl openssl) \
+		$(use_with idn) \
+		$(use_enable ipv6) \
+		$(use_with xml libxml2) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc CHANGES FAQ KNOWN-DEFECTS README || die
+
+	if use idn; then
+		dodoc README.idnkit || die
+	fi
+
+	if use doc; then
+		dodoc doc/arm/Bv9ARM.pdf || die
+
+		docinto misc
+		dodoc doc/misc/* || die
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dohtml -r doc/arm/* || die
+
+		docinto	draft
+		dodoc doc/draft/* || die
+
+		docinto rfc
+		dodoc doc/rfc/* || die
+
+		docinto contrib
+		dodoc contrib/named-bootconf/named-bootconf.sh \
+			contrib/nanny/nanny.pl || die
+
+		# some handy-dandy dynamic dns examples
+		cd "${D}"/usr/share/doc/${PF}
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+	fi
+
+	newenvd "${FILESDIR}"/10bind.env 10bind || die
+
+	keepdir /var/bind/sec
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r3 named.conf || die
+
+	# ftp://ftp.rs.internic.net/domain/named.ca:
+	insinto /var/bind
+	doins "${FILESDIR}"/named.ca || die
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/127.zone-r1 127.zone || die
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone || die
+
+	newinitd "${FILESDIR}"/named.init-r7 named || die
+	newconfd "${FILESDIR}"/named.confd-r3 named || die
+
+	dosym /var/bind/named.ca /var/bind/root.cache
+	dosym /var/bind/pri /etc/bind/pri
+	dosym /var/bind/sec /etc/bind/sec
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
+	rm -f "${D}"/usr/share/man/man8/{dnssec-keygen,nsupdate}.8*
+	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+	rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if [ -c /dev/urandom ]; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a -u named
+			echo
+		fi
+	fi
+
+	install -d -o named -g named "${ROOT}"/var/run/named \
+		"${ROOT}"/var/bind/{pri,sec} "${ROOT}"/var/log/named
+	chown -R named:named "${ROOT}"/var/bind
+
+	elog "The default zone files are now installed as *.zone,"
+	elog "be careful merging config files if you have modified"
+	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
+	elog
+	elog "You can edit /etc/conf.d/named to customize named settings"
+	elog
+	elog "The BIND ebuild now includes chroot support."
+	elog "If you like to run bind in chroot AND this is a new install OR"
+	elog "your bind doesn't already run in chroot, simply run:"
+	elog "\`emerge --config '=${CATEGORY}/${PF}'\`"
+	elog "Before running the above command you might want to change the chroot"
+	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
+	elog
+	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
+	elog "zones making all .com and .net domains appear to be registered"
+	elog "This causes many problems such as breaking important anti-spam checks"
+	elog "which verify source domains exist. ISC released a patch for BIND which"
+	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
+	elog "domain resolution to their normal function."
+	elog
+	elog "There is no need to create a com or net data file. Just the"
+	elog "entries to the named.conf file is enough."
+	elog
+	elog "	zone "com" IN { type delegation-only; };"
+	elog "	zone "net" IN { type delegation-only; };"
+
+	ewarn
+	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
+	ewarn "when it was previously optional.  If the priority is missing, BIND"
+	ewarn "won't load the zone file at all."
+	ewarn
+
+	ewarn "NOTE: as of 'bind-9.6.1' the chroot part of the init-script got some major changes."
+}
+
+pkg_config() {
+	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
+	EXISTS="no"
+
+	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
+		CHROOT="/chroot/dns"
+	elif [ -d ${CHROOT} ]; then
+		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
+	fi
+
+	if [ ! "$EXISTS" = yes ]; then
+		einfo ; einfon "Setting up the chroot directory..."
+
+		mkdir -m 750 -p ${CHROOT}
+		mkdir -p ${CHROOT}/{dev,proc,etc/bind,var/{run,log}/named,var/bind}
+		chown -R named:named ${CHROOT}
+		chown root:named ${CHROOT}
+
+		cp /etc/localtime ${CHROOT}/etc/localtime
+
+		mknod ${CHROOT}/dev/zero c 1 5
+		chmod 666 ${CHROOT}/dev/zero
+
+		if use urandom; then
+			mknod ${CHROOT}/dev/urandom c 1 9
+			chmod 666 ${CHROOT}/dev/urandom
+		else
+			mknod ${CHROOT}/dev/random c 1 8
+			chmod 666 ${CHROOT}/dev/random
+		fi
+
+		if [ -f '/etc/syslog-ng/syslog-ng.conf' ]; then
+			echo "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" >>/etc/syslog-ng/syslog-ng.conf
+		fi
+
+		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
+		if [ $RETVAL = 0 ]; then
+			sed -i 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named 2>/dev/null
+		fi
+	else
+		ewarn "NOTE: as of 'bind-9.6.1' the chroot part of the init-script got some major changes."
+	fi
+}
diff --git a/net-dns/bind/files/named.confd-r3 b/net-dns/bind/files/named.confd-r3
new file mode 100644
index 000000000000..02fa8980c9a5
--- /dev/null
+++ b/net-dns/bind/files/named.confd-r3
@@ -0,0 +1,20 @@
+# Set various named options here.
+#
+OPTIONS=""
+
+# Set this to the number of processors you want bind to use.
+# Leave this unchanged if you want bind to automatically detect the number
+#CPU="1"
+
+# If you wish to run bind in a chroot, run:
+# emerge --config =<bind-version>
+# and un-comment the following line.
+# You can specify a different chroot directory but MAKE SURE it's empty.
+# CHROOT="/chroot/dns"
+
+# Default pid file location
+PIDFILE="${CHROOT}/var/run/named/named.pid"
+
+# Scheduling priority: 19 is the lowest and -20 is the highest.
+#
+NAMED_NICELEVEL="0"
diff --git a/net-dns/bind/files/named.init-r7 b/net-dns/bind/files/named.init-r7
new file mode 100644
index 000000000000..0ad8dca54cb1
--- /dev/null
+++ b/net-dns/bind/files/named.init-r7
@@ -0,0 +1,140 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.1 2009/11/12 08:37:16 scarabeus Exp $
+
+opts="start stop reload restart"
+
+depend() {
+	need net
+	use logger
+	after pg_autovacuum postgresql mysql ldap
+	provide dns
+}
+
+_mount() {
+	local from
+	local to
+	local opts
+
+	if [[ $# -lt 3 ]];
+	then
+		eerror "_mount(): to few arguments"
+		return 1
+	fi
+
+	from=$1
+	to=$2
+	shift 2
+	
+	opts="${*}"
+	shift $#
+
+	if [[ -z $(grep "${to}" /proc/mounts) ]];
+	then
+		einfo "mounting ${from} to ${to}"
+		mount ${from} ${to} ${opts} || return 1
+	fi
+}
+
+_umount() {
+	local dir=$1
+	
+	if [[ -n $(grep "${dir}" /proc/mounts) ]];
+	then
+		einfo "umount ${dir}"
+		umount ${dir}
+	fi
+}
+
+checkconfig() {
+	if [ ! -f ${CHROOT}/etc/bind/named.conf ] ; then
+		eerror "No ${CHROOT}/etc/bind/named.conf file exists!"
+	fi
+	
+	# In case someone have $CPU set in /etc/conf.d/named
+	if [ ${CPU} ] ; then
+		CPU="-n ${CPU}"
+	fi
+
+	# as suggested in bug #107724
+	[ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\
+		egrep -v \
+			"^([[:cntrl:] ]+(#|//|/\*)|(#|//|/\*))" \
+			${CHROOT}/etc/bind/named.conf \
+				| egrep -o -m1 "pid\-file +\".+\" *;" \
+				| cut -d\" -f2
+	)
+
+	KEY="${CHROOT}/etc/bind/rndc.key"
+}
+
+start() {
+	ebegin "Starting ${CHROOT:+chrooted }named"
+
+	if [[ -n ${CHROOT} ]];
+	then
+		einfo "Mounting chroot dirs"
+		_mount /etc/bind ${CHROOT}/etc/bind -o bind
+		_mount /var/bind ${CHROOT}/var/bind -o bind
+		_mount /var/log/named ${CHROOT}/var/log/named -o bind
+	fi
+
+	checkconfig || return 1
+
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
+		--nicelevel ${NAMED_NICELEVEL:-0} \
+		--exec /usr/sbin/named \
+		-- -u named ${CPU} ${OPTIONS} ${CHROOT:+-t} ${CHROOT}
+	eend $?
+}
+
+stop() {
+	local reported=0
+
+	ebegin "Stopping ${CHROOT:+chrooted }named"
+	checkconfig || return 2
+	if [ -f $KEY ] ; then
+		rndc -k $KEY stop &>/dev/null
+	else
+		start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+			--exec /usr/sbin/named -- stop
+	fi
+
+	if [[ -n ${CHROOT} ]];
+	then
+		einfo "Umounting chroot dirs"
+
+		# just to be sure everything gets clean
+		while [[ -n $(fuser ${CHROOT} 2>&1) ]]
+		do
+			if [[ ${reported} -eq 0 ]];
+			then
+				einfo "Waiting until all named processes are stopped"
+				reported=1
+			fi
+			sleep 1
+		done
+
+		_umount ${CHROOT}/etc/bind
+		_umount ${CHROOT}/var/log/named
+		_umount ${CHROOT}/var/bind
+	fi
+
+	eend $?
+}
+
+reload() {
+	checkconfig || return 3
+	if [ ! -f $PIDFILE ] ; then
+		/etc/init.d/named start &>/dev/null
+		exit
+	fi
+
+	if [ -f $KEY ] ; then
+		ebegin "Reloading named.conf and zone files"
+		rndc -k $KEY reload &>/dev/null
+		eend $?
+	else /etc/init.d/named restart &>/dev/null
+	fi
+}