Fix a bug, see changelog

5 files changed, 231 insertions, 4 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 91196ffce9e3..5cb47fc5da99 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.25 2003/04/19 19:57:36 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.26 2003/04/27 22:37:46 lostlogic Exp $
+
+*bind-9.2.2-r2 (27 Apr 2003)
+
+  27 Apr 2003; Brandon Low <lostlogic@gentoo.org> bind-9.2.2-r2.ebuild,
+  files/named.rc7:
+  Fix bug 19971.
 
 *bind-9.2.2-r1 (19 Apr 2003)
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index ffd59c9917fb..e880025c27d5 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,7 +1,7 @@
 MD5 20542079b97eb62c2bf449ae44361cc4 bind-9.2.2.ebuild 4584
-MD5 d3586eddb838e4392e13d0b2ee4ba5e4 bind-9.2.2-r2.ebuild 4797
+MD5 25e13d358d4a439b9a65030ee2161701 bind-9.2.2-r2.ebuild 4797
 MD5 f2878b39d022399c9bc5a7eb63763651 bind-9.2.2_rc1-r2.ebuild 4496
-MD5 cc628348bcf947c5991c9bb5e7a9de48 ChangeLog 5302
+MD5 6dbfb1c4de2c16f19d53a13c13d91e7b ChangeLog 5192
 MD5 d3586eddb838e4392e13d0b2ee4ba5e4 bind-9.2.2-r1.ebuild 4797
 MD5 51197afe8da37b1b453456de90ca4f25 files/127 227
 MD5 e020f0d41f68e0c47d196c4aa1a06c09 files/digest-bind-9.2.2-r1 63
@@ -15,6 +15,7 @@ MD5 20f93349185d27963c279254fe494b34 files/named.conf-r2 766
 MD5 8c87d7839f4a6caa9c690e5905a247f4 files/digest-bind-9.2.2_rc1-r2 66
 MD5 ccfca63035b534556c3910270d40a4b9 files/localhost.zone 412
 MD5 2bb12cfcd70284e72fbf9e70e5e2974d files/dyndns-samples.tbz2 22866
-MD5 3cb77260da49cece1c127ba43a7da843 files/named.rc7 1692
+MD5 118c4ccb777bbbd0e55e7cd26ff442cf files/named.rc6 1378
+MD5 c0d3c0898169e863e9e09c910b1b158a files/named.rc7 1400
 MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
 MD5 b5605e61fab3836f54d54acfba68b09f files/named.ca 2499
diff --git a/net-dns/bind/bind-9.2.2-r2.ebuild b/net-dns/bind/bind-9.2.2-r2.ebuild
new file mode 100644
index 000000000000..ba87d710a3f1
--- /dev/null
+++ b/net-dns/bind/bind-9.2.2-r2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.2-r2.ebuild,v 1.1 2003/04/27 22:37:46 lostlogic Exp $
+
+IUSE="ssl ipv6 doc"
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz"
+HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm"
+LICENSE="as-is"
+SLOT="0"
+
+DEPEND="sys-apps/groff
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+
+	# Adjusting PATHs in manpages
+	for i in `echo bin/{named/named.8,check/named-checkconf.8,nsupdate/nsupdate.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}
+	done
+}
+
+src_compile() {
+	local myconf=""
+
+	use ssl && myconf="${myconf} --with-openssl"
+	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
+
+	econf 	--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--enable-threads \
+		--with-libtool \
+		${myconf}
+
+	MAKEOPTS="${MAKEOPTS} -j1" emake || die "failed to compile bind"
+}
+
+src_install() {
+	einstall || die "failed to install bind"
+	
+	dodoc CHANGES COPYRIGHT FAQ README
+
+	use doc && {
+		docinto misc ; dodoc doc/misc/*
+		docinto html ; dodoc doc/arm/*
+		docinto	draft ; dodoc doc/draft/*
+		docinto rfc ; dodoc doc/rfc/*
+		docinto contrib ; dodoc contrib/named-bootconf/named-bootconf.sh \
+		contrib/nanny/nanny.pl
+	}
+
+	insinto /etc/env.d
+	newins ${FILESDIR}/10bind.env 10bind
+
+	# some handy-dandy dynamic dns examples
+	cd ${D}/usr/share/doc/${PF}
+	tar pjxf ${FILESDIR}/dyndns-samples.tbz2
+
+	dodir /etc/bind /var/bind/{pri,sec}
+	keepdir /var/bind/sec
+
+	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r2 named.conf
+	# ftp://ftp.rs.internic.net/domain/named.ca:
+	insinto /var/bind ; doins ${FILESDIR}/named.ca
+	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/named.rc6 named
+	insinto /etc/conf.d ; newins ${FILESDIR}/named.confd named
+	
+	dosym ../../var/bind/named.ca /var/bind/root.cache 
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+}
+
+pkg_preinst() {
+	# 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.1.gz,host.1.gz}
+	rm -f ${D}/usr/bin/{dig,host,nslookup}
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		/usr/sbin/rndc-confgen -a -u named
+	fi
+
+	install -d -o named -g named ${ROOT}/var/run/named \
+		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
+	chown -R named:named ${ROOT}/var/bind
+
+	einfo "The default zone files are now installed as *.zone,"
+	einfo "be careful merging config files if you have modified"
+	einfo "/var/bind/pri/127 or /var/bind/pri/localhost"
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	einfo "The BIND ebuild now includes chroot support."
+	einfo "If you like to run bind in chroot AND this is a new install OR"
+	einfo "your bind doesn't already run in chroot, simply run:"
+	einfo "\`ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\`"
+	einfo "Before running the above command you might want to change the chroot"
+	einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
+	einfo
+}
+
+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 700 -p ${CHROOT}
+		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
+		chown -R named:named ${CHROOT}/var/run/named
+		cp -R /etc/bind ${CHROOT}/etc/
+		cp /etc/localtime ${CHROOT}/etc/localtime
+		chown named:named ${CHROOT}/etc/bind/rndc.key
+		cp -R /var/bind ${CHROOT}/var/
+		chown -R named:named ${CHROOT}/var/
+		mknod ${CHROOT}/dev/zero c 1 5
+		mknod ${CHROOT}/dev/random c 1 8
+		chmod 666 ${CHROOT}/dev/{random,zero}
+		chown named:named ${CHROOT}
+
+		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
+		if [ $RETVAL = 0 ]; then
+			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
+			mv --force /etc/conf.d/named.orig /etc/conf.d/named
+		fi
+
+		sleep 1; echo " Done."; sleep 1
+		einfo
+		einfo "Add the following to your root .bashrc or .bash_profile: "
+		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
+		einfo "Then do the following: "
+		einfo "   source /root/.bashrc or .bash_profile"
+		einfo
+	fi
+}
diff --git a/net-dns/bind/files/digest-bind-9.2.2-r2 b/net-dns/bind/files/digest-bind-9.2.2-r2
new file mode 100644
index 000000000000..a11f05a79883
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.2.2-r2
@@ -0,0 +1 @@
+MD5 6ea7d64a0856893ab3eb541ab7bbc725 bind-9.2.2.tar.gz 5054652
diff --git a/net-dns/bind/files/named.rc7 b/net-dns/bind/files/named.rc7
new file mode 100644
index 000000000000..e2663994978a
--- /dev/null
+++ b/net-dns/bind/files/named.rc7
@@ -0,0 +1,66 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.rc7,v 1.1 2003/04/27 22:37:46 lostlogic Exp $
+
+opts="start stop reload restart"
+
+depend() {
+	need net
+	use logger
+	provide dns
+}
+
+checkconfig() {
+	if [ ! -f ${CHROOT}/etc/bind/named.conf ] ; then
+		eerror "No ${CHROOT}/etc/bind/named.conf file exists!"
+	fi
+	
+	# In case someone doesn't have $CPU set from /etc/conf.d/named
+	if [ ! $CPU ] ; then
+		CPU=1
+	fi
+
+	if [ $CHROOT -a -d $CHROOT ] ; then
+		PIDFILE="${CHROOT}/var/run/named/named.pid"
+		KEY="${CHROOT}/etc/bind/rndc.key"
+	else
+		PIDFILE="/var/run/named/named.pid"
+		KEY="/etc/bind/rndc.key"
+	fi
+}
+
+start() {
+	ebegin "Starting ${CHROOT:+chrooted }named"
+	checkconfig || return 1
+	start-stop-daemon --start --quiet --exec /usr/sbin/named -- -u named -n $CPU $OPTIONS ${CHROOT:+-t $CHROOT}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping named"
+	checkconfig || return 2
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE
+	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
+}
+
+restart() {
+	svc_stop
+	svc_start
+}
+