updated ebuild with dlz support, currently hard masked, testing badly needed

(Portage version: 2.0.51-r15)

4 files changed, 204 insertions, 12 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 2b0acf174663..978cc1e27961 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.54 2005/01/28 19:29:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.55 2005/01/31 11:41:54 mglauche Exp $
+
+*bind-9.2.2-r5 (31 Jan 2005)
+
+  31 Jan 2005; <mglauche@gentoo.org> +bind-9.2.2-r5.ebuild:
+  new ebuild for dlz support, see bug #60555, thanks to Charlie Gehlin
+  <charlie@gehlin.com>
 
 *bind-9.3.1_beta2 (28 Jan 2005)
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 899c24f83bd2..c3013e40e5ea 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 45b230cb3f1fd14ba338701d4080b4ba bind-9.2.3.ebuild 5875
 MD5 6b59baf987877253eb9e2638c6cf56cd bind-9.2.2-r3.ebuild 5709
+MD5 5a747cc1bae4dda1423e22383ad3c694 bind-9.2.2-r5.ebuild 6356
 MD5 e74705fa1f4ec70e05cf44eb7796ba0e bind-9.3.1_beta2.ebuild 5937
 MD5 9676ca38b8a2af68a01785194ecd12d8 bind-9.2.2.ebuild 4678
 MD5 01424b3848125e67c3f94c902f8f984f bind-9.3.0_rc2.ebuild 5892
@@ -18,6 +16,8 @@ MD5 e020f0d41f68e0c47d196c4aa1a06c09 files/digest-bind-9.2.2-r1 63
 MD5 e020f0d41f68e0c47d196c4aa1a06c09 files/digest-bind-9.2.2-r2 63
 MD5 309110e09d923344a34a803f8906fae3 files/digest-bind-9.2.2-r3 121
 MD5 309110e09d923344a34a803f8906fae3 files/digest-bind-9.2.2-r4 121
+MD5 ce78c05705c759f2494388ad313bdcbb files/digest-bind-9.2.2-r5 182
+MD5 371fe0279c4c631f1475d9203a2eacc1 files/digest-bind-9.2.3-r1 124
 MD5 e020f0d41f68e0c47d196c4aa1a06c09 files/digest-bind-9.2.2 63
 MD5 feb1027d97d15dcf8fdc57b2de185af2 files/digest-bind-9.2.3 63
 MD5 21e3efd21e18f4c660155978105f8ebe files/named.confd 351
@@ -32,11 +32,3 @@ MD5 2bb12cfcd70284e72fbf9e70e5e2974d files/dyndns-samples.tbz2 22866
 MD5 412d666c947769b6015a65a42bb8ea00 files/named.rc6 1434
 MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
 MD5 e83e7a76e253debfdd120311fda73fb6 files/named.ca 2518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-Comment: Robbat2 @ Orbis-Terrarum Networks
-
-iD8DBQFB+pKSPpIsIjIzwiwRAi2XAJ9VcV8wmP+Ev5cNJOoqCLL8vPS8RACgmK2n
-WiBL4JrwQKrle37qY+MtnmU=
-=qJEy
------END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.2.2-r5.ebuild b/net-dns/bind/bind-9.2.2-r5.ebuild
new file mode 100644
index 000000000000..a327a60e71ef
--- /dev/null
+++ b/net-dns/bind/bind-9.2.2-r5.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.2-r5.ebuild,v 1.1 2005/01/31 11:41:54 mglauche Exp $
+
+inherit eutils
+
+IUSE="ssl ipv6 doc dlz postgres bind-mysql mysql odbc ldap selinux"
+
+DLZ_VER=0.7.0
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
+	ftp://ftp.isc.org/isc/bind9/${PV}/patch.${PV}-P1
+	dlz? ( mirror://sourceforge/bind-dlz/DLZ-${DLZ_VER}.tar.gz )"
+HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
+
+# this ebuild contains the very untested dlz extension, hard-masking it for now
+KEYWORDS="-x86 -ppc -sparc -alpha -hppa -amd64 -ppc64"
+
+LICENSE="as-is"
+SLOT="0"
+
+DEPEND="sys-apps/groff
+	>=sys-apps/sed-4
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )"
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+
+	epatch ${DISTDIR}/patch.${PV}-P1
+
+	# 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
+	if use bind-mysql; then
+		epatch ${FILESDIR}/bind-9.2.2-mysql.patch
+	fi
+	if use dlz; then
+		epatch ../dlz.patch
+	fi
+}
+
+src_compile() {
+	local myconf=""
+
+	use ssl && myconf="${myconf} --with-openssl"
+	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
+	use dlz && myconf="${myconf} --disable-threads --with-dlz-filesystem --with-dlz-stub" || myconf="${myconf} --enable-threads"
+	use postgres && myconf="${myconf} --with-dlz-postgres"
+	use mysql && myconf="${myconf} --with-dlz-mysql"
+	# use berkdb is broken, at least with my machine 
+	# commenting out for now
+	# use berkdb && myconf="${myconf} --with-dlz-bdb"
+	use ldap  && myconf="${myconf} --with-dlz-ldap"
+	use odbc  && myconf="${myconf} --with-dlz-odbc"
+
+	econf 	--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		${myconf} || die "econf failed"
+
+	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."
+	echo
+	einfo "Recently verisign added a wildcard A record to the .COM and .NET TLD"
+	einfo "zones making all .com and .net domains appear to be registered"
+	einfo "This causes many problems such as breaking important anti-spam checks"
+	einfo "which verify source domains exist. ISC released a patch for BIND which"
+	einfo "adds 'delegation-only' zones to allow admins to return the .com and .net"
+	einfo "domain resolution to their normal function."
+	echo
+	einfo "There is no need to create a com or net data file. Just the"
+	einfo "entries to the named.conf file is enough."
+	echo
+	einfo "	zone "com" IN { type delegation-only; };"
+	einfo "	zone "net" IN { type delegation-only; };"
+}
+
+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-r5 b/net-dns/bind/files/digest-bind-9.2.2-r5
new file mode 100644
index 000000000000..7f7c4fb25f26
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.2.2-r5
@@ -0,0 +1,3 @@
+MD5 6ea7d64a0856893ab3eb541ab7bbc725 bind-9.2.2.tar.gz 5054652
+MD5 063edc41c756ffc6a1051d5f1937fa2c patch.9.2.2-P1 40087
+MD5 2095ceb0be6f86d6ac7e0990a04d08de DLZ-0.7.0.tar.gz 249768