* closing bug #167605

Package-Manager: portage-2.1.2-r10

7 files changed, 608 insertions, 15 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 2cd4b648239e..7107bb1a4ad0 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.147 2007/02/14 13:41:39 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.148 2007/02/22 11:12:46 voxus Exp $
+
+*bind-9.3.4-r1 (22 Feb 2007)
+*bind-9.2.8-r1 (22 Feb 2007)
+
+  22 Feb 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  +files/bind-dlzbdb-close_cursor.patch, +bind-9.2.8-r1.ebuild,
+  +bind-9.3.4-r1.ebuild:
+  Closing bug #167605.
 
   14 Feb 2007; Bryan Østergaard <kloeri@gentoo.org> bind-9.2.8.ebuild,
   bind-9.3.4.ebuild:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 900116abfbc8..e424d9ff157c 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 10bind.env 27 RMD160 872245707b4f72a212cda162c59495744d77a6e3 SHA1 7b8c1abd5910bb7a07c6b7c820c2b34a534b2593 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650
 MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
 RMD160 872245707b4f72a212cda162c59495744d77a6e3 files/10bind.env 27
@@ -37,6 +34,10 @@ AUX bind-9.4.0_rc2-missing_odbc_test.patch 613 RMD160 ec141cef65e470dfc8df4c641e
 MD5 cb5a05fb75f7a95ec8167efc19089a54 files/bind-9.4.0_rc2-missing_odbc_test.patch 613
 RMD160 ec141cef65e470dfc8df4c641ec96bfbd5d8cdd1 files/bind-9.4.0_rc2-missing_odbc_test.patch 613
 SHA256 5e6465bdb01cbb662333cc2b0a00ad51905a0cda2eb6b7abc3a0b2dd3e701f4e files/bind-9.4.0_rc2-missing_odbc_test.patch 613
+AUX bind-dlzbdb-close_cursor.patch 307 RMD160 1bbf09d393b5db40b483a952db5f39fe60efda7c SHA1 4214a98ca49b6b85366f85d40dd9d5bbfd008151 SHA256 e18fb5668ffaa540d8ec3e01fe40b1f0d1c562a094c06fa902ef67953daed9f5
+MD5 448a6410601bd8ac83e7ac6bc7ba4544 files/bind-dlzbdb-close_cursor.patch 307
+RMD160 1bbf09d393b5db40b483a952db5f39fe60efda7c files/bind-dlzbdb-close_cursor.patch 307
+SHA256 e18fb5668ffaa540d8ec3e01fe40b1f0d1c562a094c06fa902ef67953daed9f5 files/bind-dlzbdb-close_cursor.patch 307
 AUX bind-dlzbdb-includes.patch 465 RMD160 07e120527c34ebc044f1312e491a8d8dc13ec558 SHA1 0184830214317aac4c2f60a8eeabdbbdbf3b2276 SHA256 16ac0b8ba61287a2172c99ab21dd66d0a46b104ef34f710da5933720604f70c6
 MD5 5299fb17398d9613850e0b68ff1d38e1 files/bind-dlzbdb-includes.patch 465
 RMD160 07e120527c34ebc044f1312e491a8d8dc13ec558 files/bind-dlzbdb-includes.patch 465
@@ -139,6 +140,10 @@ EBUILD bind-9.2.7.ebuild 9001 RMD160 bd2e424e7c72adf48e4a4e46a6a4f34ee5ca7f99 SH
 MD5 a1aa87065b4526759d985ab28e7a4507 bind-9.2.7.ebuild 9001
 RMD160 bd2e424e7c72adf48e4a4e46a6a4f34ee5ca7f99 bind-9.2.7.ebuild 9001
 SHA256 bba25f1be168c95ed05e10baf8f73fdb7741977e8e8699a7fc78ac0574999217 bind-9.2.7.ebuild 9001
+EBUILD bind-9.2.8-r1.ebuild 8472 RMD160 c0361f52cce0573e6e55b51ad356d78ab8325304 SHA1 b40386aa2fe9d13fee4455f65957cb45bc70576c SHA256 fec5a1a7b7afc4667d6a4f2dbeff4381ca46e2709aab6ccc62dc544e5b54b9f1
+MD5 78be1324c93bc0686d1360adb9aaefee bind-9.2.8-r1.ebuild 8472
+RMD160 c0361f52cce0573e6e55b51ad356d78ab8325304 bind-9.2.8-r1.ebuild 8472
+SHA256 fec5a1a7b7afc4667d6a4f2dbeff4381ca46e2709aab6ccc62dc544e5b54b9f1 bind-9.2.8-r1.ebuild 8472
 EBUILD bind-9.2.8.ebuild 8410 RMD160 19b32acb98f310016104a879829bbd368c757fa7 SHA1 df5327c4cc1f978b41b6fd3476b44bf532431c67 SHA256 38bc1ea744d7c7c6dfebfcd09c8eac5b52e42ff55e4e3f10e382221808e39796
 MD5 9f1cfb21c5f2ec33c28d090dd9b3cb07 bind-9.2.8.ebuild 8410
 RMD160 19b32acb98f310016104a879829bbd368c757fa7 bind-9.2.8.ebuild 8410
@@ -163,6 +168,10 @@ EBUILD bind-9.3.3.ebuild 8715 RMD160 3d6471e55d6c98bfad047e6bda199baeb00d5cf0 SH
 MD5 8492a44d2acfef4889f8f21fe5d18b5b bind-9.3.3.ebuild 8715
 RMD160 3d6471e55d6c98bfad047e6bda199baeb00d5cf0 bind-9.3.3.ebuild 8715
 SHA256 847014311a46b3ac1c196fd6d31692cf12c3758300d24deefd8c54eb039a4ef6 bind-9.3.3.ebuild 8715
+EBUILD bind-9.3.4-r1.ebuild 8448 RMD160 2fa2450e96d4041011f50901996ef53d444219fa SHA1 5a64d9d1833e873e5f1f5bcbfa23f7cd56b1b03f SHA256 4eb25eb2242935af0ecdb3324e251e766bdf8ac78f2da7351e14740642a54152
+MD5 d44e0fd7b25801eab8299d14ab5a90bc bind-9.3.4-r1.ebuild 8448
+RMD160 2fa2450e96d4041011f50901996ef53d444219fa bind-9.3.4-r1.ebuild 8448
+SHA256 4eb25eb2242935af0ecdb3324e251e766bdf8ac78f2da7351e14740642a54152 bind-9.3.4-r1.ebuild 8448
 EBUILD bind-9.3.4.ebuild 8383 RMD160 dd9cc4295f7e46e8035c482ec359f912b989f88c SHA1 047bdb82f00e9dd899b0c4ee19e460b9c286121e SHA256 c328559d719129fdc46e5371decd721e64868ac520f364d6e076daad3b37a6c9
 MD5 e3cb180c8885c49dd194836783921fc6 bind-9.3.4.ebuild 8383
 RMD160 dd9cc4295f7e46e8035c482ec359f912b989f88c bind-9.3.4.ebuild 8383
@@ -171,10 +180,10 @@ EBUILD bind-9.4.0_rc2.ebuild 8446 RMD160 68885f5195c9ca5b910edaf53c4baf8d102caed
 MD5 bef9d74a5c4d89f529eacbf19d5c9b37 bind-9.4.0_rc2.ebuild 8446
 RMD160 68885f5195c9ca5b910edaf53c4baf8d102caed5 bind-9.4.0_rc2.ebuild 8446
 SHA256 f71cf662180e720f41f32b12a82850e72bd9f691c8f668d40ed3e629320c4e55 bind-9.4.0_rc2.ebuild 8446
-MISC ChangeLog 24100 RMD160 a46e82a5534b8d861636abf6369f124851d623cb SHA1 c7c00750f740a1f38dd4d1e2ce9b5f6fb86ba2f3 SHA256 fd7d6e59645bf6ed3e0ec86f9e9a620416949853354e3a83715d5dfae1ba08d7
-MD5 914aec04241685dc28f68b62532c8dcf ChangeLog 24100
-RMD160 a46e82a5534b8d861636abf6369f124851d623cb ChangeLog 24100
-SHA256 fd7d6e59645bf6ed3e0ec86f9e9a620416949853354e3a83715d5dfae1ba08d7 ChangeLog 24100
+MISC ChangeLog 24328 RMD160 e1eb6ccf880e9ea5ab8dea8427df01d48e003c89 SHA1 72917c699f19565592e01ce498308636c122e82f SHA256 7f01ff4db358ccb2d41f49d0bc0a639a4efc80f0fddfae0f6e9d740cb38bc399
+MD5 1bf1d20cd3805d90c24dea19eafd4a1c ChangeLog 24328
+RMD160 e1eb6ccf880e9ea5ab8dea8427df01d48e003c89 ChangeLog 24328
+SHA256 7f01ff4db358ccb2d41f49d0bc0a639a4efc80f0fddfae0f6e9d740cb38bc399 ChangeLog 24328
 MISC metadata.xml 352 RMD160 0c1a848023a0dd76c5173c0a2135beed46e90263 SHA1 24f998969c955accd1fd4f3719bdf83d4e9d432b SHA256 f6f6ae15da16a20d5e0ce76563e3e27901e25787131b8784ffe872ffe3ddd034
 MD5 bf7284c3e31bd3292a01fa046b3220bb metadata.xml 352
 RMD160 0c1a848023a0dd76c5173c0a2135beed46e90263 metadata.xml 352
@@ -197,6 +206,9 @@ SHA256 86986d0504a6a3a9c27236ef6920ec1c66b0a4427f69b12f25b08b8b6b6d6ff6 files/di
 MD5 70279966f522410c64d88c0bb1268020 files/digest-bind-9.2.8 708
 RMD160 8ab16a0818d61f217bcddd761fb82d1060080aa4 files/digest-bind-9.2.8 708
 SHA256 a41b936338851072eac98938385c61fb38fba2d4ed53c4427ee44358d8959c39 files/digest-bind-9.2.8 708
+MD5 70279966f522410c64d88c0bb1268020 files/digest-bind-9.2.8-r1 708
+RMD160 8ab16a0818d61f217bcddd761fb82d1060080aa4 files/digest-bind-9.2.8-r1 708
+SHA256 a41b936338851072eac98938385c61fb38fba2d4ed53c4427ee44358d8959c39 files/digest-bind-9.2.8-r1 708
 MD5 ff0c0177b13e665beafd68ea30cd4e5a files/digest-bind-9.3.2 729
 RMD160 578baea200800e5a983e726cd7633d1dee2b3c0e files/digest-bind-9.3.2 729
 SHA256 39453324f8464c8ffef631fcd7300cd771763b9c069ea086b1a5e5cc4a1662c9 files/digest-bind-9.3.2 729
@@ -215,13 +227,9 @@ SHA256 cc51007f0fa03b13918828aa657dce1b820003ed8dbaf49313a1a4735c9314f9 files/di
 MD5 e90002b0ea49566f01d00de55bab0a27 files/digest-bind-9.3.4 723
 RMD160 2a25d4a9f6f7e0688054a0da4ada926df2f189dc files/digest-bind-9.3.4 723
 SHA256 34a9746ac50c14de6bc2e6383676681b87b0dde42379e8fa8cad2fc5d56b4fd1 files/digest-bind-9.3.4 723
+MD5 e90002b0ea49566f01d00de55bab0a27 files/digest-bind-9.3.4-r1 723
+RMD160 2a25d4a9f6f7e0688054a0da4ada926df2f189dc files/digest-bind-9.3.4-r1 723
+SHA256 34a9746ac50c14de6bc2e6383676681b87b0dde42379e8fa8cad2fc5d56b4fd1 files/digest-bind-9.3.4-r1 723
 MD5 bd87626394e98d0ecdf056c4c8bc1b4e files/digest-bind-9.4.0_rc2 732
 RMD160 eb02fbf83bc867e6b89c352cd4b4555397b39c63 files/digest-bind-9.4.0_rc2 732
 SHA256 6a62c59671789e58c1bfe81352ad4c03ef5f994434eaef006639c600e03a7f14 files/digest-bind-9.4.0_rc2 732
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF0xFVugEuf3OQ0akRAtzbAKCYwcEmeUVKmJXkMBRDKrDjNREPxACglXya
-kgQzOw7qGbhErzfKKl3uyaA=
-=x373
------END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.2.8-r1.ebuild b/net-dns/bind/bind-9.2.8-r1.ebuild
new file mode 100644
index 000000000000..c57ed3dc493d
--- /dev/null
+++ b/net-dns/bind/bind-9.2.8-r1.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.8-r1.ebuild,v 1.1 2007/02/22 11:12:46 voxus Exp $
+
+inherit eutils libtool autotools
+
+DLZ_VERSION="9.2.7"
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+	dlz? ( http://dev.gentoo.org/~voxus/dlz/dlz-${DLZ_VERSION}.patch.bz2 )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads resolvconf"
+
+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 )
+	resolvconf? ( net-dns/resolvconf-gentoo )"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )"
+
+pkg_setup() {
+	use threads && {
+		echo
+		ewarn "If you're in vserver enviroment, you're probably want to"
+		ewarn "disable threads support because of linux capabilities dependency"
+		echo
+	}
+
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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}"
+	done
+
+	use dlz && {
+		epatch ${DISTDIR}/dlz-${DLZ_VERSION}.patch.bz2
+		epatch ${FILESDIR}/bind-9.2.5-berkdb_fix.patch
+		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
+		epatch ${FILESDIR}/${PN}-dlzbdb-close_cursor.patch
+
+		# use odbc && epatch ${FILESDIR}/${P}-missing_odbc_test.patch
+	}
+
+	# should be installed by bind-tools
+	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
+
+	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
+
+	# bug #151839
+	sed \
+		-e 's:<config.h>:<config.h>\n\n#undef SO_BSDCOMPAT:' \
+		-i lib/isc/unix/socket.c
+}
+
+src_compile() {
+	local myconf=""
+
+	use ssl && myconf="${myconf} --with-openssl"
+	use idn && myconf="${myconf} --with-idn"
+
+	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
+			echo
+			ewarn ""
+			einfo "MySQL uses thread local storage in its C api. Thus MySQL"
+			einfo "requires that each thread of an application execute a MySQL"
+			einfo "\"thread initialization\" to setup the thread local storage."
+			einfo "This is impossible to do safely while staying within the DLZ"
+			einfo "driver API. This is a limitation caused by MySQL, and not"
+			einfo "the DLZ API."
+			ewarn "Because of this BIND MUST only run with a single thread when"
+			ewarn "using the MySQL driver."
+			echo
+			myconf="${myconf} --disable-linux-caps --disable-threads"
+			einfo "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
+
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		`use_enable ipv6` \
+		${myconf} || die "econf failed"
+
+	emake -j1 || 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
+		dohtml 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
+
+		# some handy-dandy dynamic dns examples
+		cd ${D}/usr/share/doc/${PF}
+		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
+	}
+
+	insinto /etc/env.d
+	newins ${FILESDIR}/10bind.env 10bind
+
+	dodir /etc/bind /var/bind/{pri,sec}
+	keepdir /var/bind/sec
+
+	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.ca:
+	insinto /var/bind ; doins ${FILESDIR}/named.ca
+
+	insinto /var/bind/pri
+	doins ${FILESDIR}/127.zone
+	newins ${FILESDIR}/localhost.zone-r2 localhost.zone
+
+	cp ${FILESDIR}/named.init-r4 ${T}/named && doinitd ${T}/named
+	cp ${FILESDIR}/named.confd-r1 ${T}/named && doconfd ${T}/named
+
+	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.1,host.1,nslookup.1}
+	rm -f ${D}/usr/bin/{dig,host,nslookup}
+
+	use resolvconf && {
+		exeinto /etc/resolvconf/update.d
+		newexe ${FILESDIR}/resolvconf.bind bind
+	}
+}
+
+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 ${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 "\`emerge --config '=${CATEGORY}/${PF}'\`"
+	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; };"
+
+	echo
+	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."
+	echo
+}
+
+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 root:named ${CHROOT}
+		chmod 0750 ${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/bind-9.3.4-r1.ebuild b/net-dns/bind/bind-9.3.4-r1.ebuild
new file mode 100644
index 000000000000..140390f981d7
--- /dev/null
+++ b/net-dns/bind/bind-9.3.4-r1.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.4-r1.ebuild,v 1.1 2007/02/22 11:12:46 voxus Exp $
+
+inherit eutils libtool autotools
+
+DLZ_VERSION="9.3.3"
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+	dlz? ( http://dev.gentoo.org/~voxus/bind/ctrix_dlz_${DLZ_VERSION}.patch.bz2	)"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads resolvconf"
+
+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 )
+	resolvconf? ( net-dns/resolvconf-gentoo )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )"
+
+pkg_setup() {
+	use threads && {
+		echo
+		ewarn "If you're in vserver enviroment, you're probably want to"
+		ewarn "disable threads support because of linux capabilities dependency"
+		echo
+	}
+
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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}"
+	done
+
+	use dlz && {
+		epatch ${DISTDIR}/ctrix_dlz_${DLZ_VERSION}.patch.bz2
+		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
+		epatch ${FILESDIR}/${PN}-dlzbdb-close_cursor.patch
+
+		use odbc && epatch ${FILESDIR}/${P}-missing_odbc_test.patch
+	}
+
+	# should be installed by bind-tools
+	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
+
+	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
+
+	# bug #151839
+	sed \
+		-e 's:<config.h>:<config.h>\n\n#undef SO_BSDCOMPAT:' \
+		-i lib/isc/unix/socket.c
+}
+
+src_compile() {
+	local myconf=""
+
+	use ssl && myconf="${myconf} --with-openssl"
+	use idn && myconf="${myconf} --with-idn"
+
+	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
+			echo
+			ewarn ""
+			einfo "MySQL uses thread local storage in its C api. Thus MySQL"
+			einfo "requires that each thread of an application execute a MySQL"
+			einfo "\"thread initialization\" to setup the thread local storage."
+			einfo "This is impossible to do safely while staying within the DLZ"
+			einfo "driver API. This is a limitation caused by MySQL, and not"
+			einfo "the DLZ API."
+			ewarn "Because of this BIND MUST only run with a single thread when"
+			ewarn "using the MySQL driver."
+			echo
+			myconf="${myconf} --disable-linux-caps --disable-threads"
+			einfo "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
+
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		`use_enable ipv6` \
+		${myconf} || die "econf failed"
+
+	emake -j1 || 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
+		dohtml 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
+
+		# some handy-dandy dynamic dns examples
+		cd ${D}/usr/share/doc/${PF}
+		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
+	}
+
+	insinto /etc/env.d
+	newins ${FILESDIR}/10bind.env 10bind
+
+	dodir /etc/bind /var/bind/{pri,sec}
+	keepdir /var/bind/sec
+
+	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.ca:
+	insinto /var/bind ; doins ${FILESDIR}/named.ca
+
+	insinto /var/bind/pri
+	doins ${FILESDIR}/127.zone
+	newins ${FILESDIR}/localhost.zone-r2 localhost.zone
+
+	cp ${FILESDIR}/named.init-r4 ${T}/named && doinitd ${T}/named
+	cp ${FILESDIR}/named.confd-r1 ${T}/named && doconfd ${T}/named
+
+	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.1,host.1,nslookup.1}
+	rm -f ${D}/usr/bin/{dig,host,nslookup}
+
+	use resolvconf && {
+		exeinto /etc/resolvconf/update.d
+		newexe ${FILESDIR}/resolvconf.bind bind
+	}
+}
+
+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 ${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 "\`emerge --config '=${CATEGORY}/${PF}'\`"
+	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; };"
+
+	echo
+	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."
+	echo
+}
+
+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 root:named ${CHROOT}
+		chmod 0750 ${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/bind-dlzbdb-close_cursor.patch b/net-dns/bind/files/bind-dlzbdb-close_cursor.patch
new file mode 100644
index 000000000000..5eb8c122290d
--- /dev/null
+++ b/net-dns/bind/files/bind-dlzbdb-close_cursor.patch
@@ -0,0 +1,11 @@
+--- bin/named/dlz_bdbhpt_driver.c	Thu May  4 13:13:20 2006
++++ bin/named/dlz_bdbhpt_driver.c	Thu May  4 13:27:05 2006
+@@ -462,7 +462,7 @@
+ 		xfr_cursor->c_close(xfr_cursor);
+ 		
+    if(dns_cursor != NULL)
+-      dns_cursor->c_close(xfr_cursor);
++      dns_cursor->c_close(dns_cursor);
+ 
+ 	return result;
+ }
diff --git a/net-dns/bind/files/digest-bind-9.2.8-r1 b/net-dns/bind/files/digest-bind-9.2.8-r1
new file mode 100644
index 000000000000..6d73dad89748
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.2.8-r1
@@ -0,0 +1,9 @@
+MD5 55455401e8b45b79cea89d3d79118ced bind-9.2.8.tar.gz 5208805
+RMD160 4bdba3e75a9d188d05787ca553aa656a416d4534 bind-9.2.8.tar.gz 5208805
+SHA256 4c037a1ffe71f8baa8b416589faa0a3c312b2afe7b79bde9ebf9bbde5af5a11d bind-9.2.8.tar.gz 5208805
+MD5 10b9cf6eeb8f1a63ad49bef6d4739a66 dlz-9.2.7.patch.bz2 100068
+RMD160 d53b00b27e43b645e96d25c3a7bdbc8e0d2ebade dlz-9.2.7.patch.bz2 100068
+SHA256 db255c43cdee05c05ac8f240e1d75dcbee3f010e41e9f08b133c14b209363e8c dlz-9.2.7.patch.bz2 100068
+MD5 2bb12cfcd70284e72fbf9e70e5e2974d dyndns-samples.tbz2 22866
+RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d dyndns-samples.tbz2 22866
+SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 dyndns-samples.tbz2 22866
diff --git a/net-dns/bind/files/digest-bind-9.3.4-r1 b/net-dns/bind/files/digest-bind-9.3.4-r1
new file mode 100644
index 000000000000..52fae07ad51b
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.3.4-r1
@@ -0,0 +1,9 @@
+MD5 df5417e7e7cf017fa28b65d0a3d6e999 bind-9.3.4.tar.gz 5405022
+RMD160 8b5fda9542f6afbe7ffb857d72f7e545237d7826 bind-9.3.4.tar.gz 5405022
+SHA256 40152026af715b15ac958f374394e5189a099b562eb913470ccc43f6fbd19c21 bind-9.3.4.tar.gz 5405022
+MD5 00419378bdf3691c7d2fe7737f25007d ctrix_dlz_9.3.3.patch.bz2 66143
+RMD160 ee3a7ef8e1b3167ff572ca8a7836a8d4d64a834d ctrix_dlz_9.3.3.patch.bz2 66143
+SHA256 6550455ba37f5f25f047078bedf825d05eab45bbc4a3d8b7bf23a716749423cf ctrix_dlz_9.3.3.patch.bz2 66143
+MD5 2bb12cfcd70284e72fbf9e70e5e2974d dyndns-samples.tbz2 22866
+RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d dyndns-samples.tbz2 22866
+SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 dyndns-samples.tbz2 22866