* bugs #130649 and #151839 are fixed.

Package-Manager: portage-2.1.2_pre3-r6

6 files changed, 630 insertions, 5 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index a5ce4aabf67d..3c7d8a9dd69a 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.127 2006/09/22 18:47:39 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.128 2006/10/22 17:28:59 voxus Exp $
+
+*bind-9.3.2-r5 (22 Oct 2006)
+*bind-9.2.6-r5 (22 Oct 2006)
+
+  22 Oct 2006; Konstantin V. Arkhipov <voxus@gentoo.org>
+  +bind-9.2.6-r5.ebuild, +bind-9.3.2-r5.ebuild:
+  Closing bugs #130649 and #151839.
 
   22 Sep 2006; Javier Villavicencio <the_paya@gentoo.org>
   bind-9.3.2-r4.ebuild:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index ea5b147b32b3..9f3e63e4d254 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -97,6 +100,10 @@ EBUILD bind-9.2.6-r4.ebuild 8901 RMD160 de4eebc73dd372fdbec87678470cb5a351908d7f
 MD5 e258f67176cc5ca52798ec412388df50 bind-9.2.6-r4.ebuild 8901
 RMD160 de4eebc73dd372fdbec87678470cb5a351908d7f bind-9.2.6-r4.ebuild 8901
 SHA256 bac6886cee98acc294118b00043c7264dbb653ee349df89ccd9c01dde042ee1a bind-9.2.6-r4.ebuild 8901
+EBUILD bind-9.2.6-r5.ebuild 9012 RMD160 a24a570ff120be61bc6a17527f6c41cce3316e7c SHA1 261afb6ee50da6f9a0cd17701d60851accf01e1c SHA256 372e2e683b1d99ac791dc70c1cecd57b4aedbc2229d7c44516b777c29ff79698
+MD5 4821ac71b5c76f53c22844480b0395dd bind-9.2.6-r5.ebuild 9012
+RMD160 a24a570ff120be61bc6a17527f6c41cce3316e7c bind-9.2.6-r5.ebuild 9012
+SHA256 372e2e683b1d99ac791dc70c1cecd57b4aedbc2229d7c44516b777c29ff79698 bind-9.2.6-r5.ebuild 9012
 EBUILD bind-9.2.6.ebuild 8765 RMD160 a4e7573e4d3c0a52a6b6d922e065f4114bc66ebe SHA1 5bf0fc6a9aab14f8ebe73e4ffbb1cf81bf743f58 SHA256 fc0ffd88139dc84644d8f93e65fcfcf2a9c8c97f5e44eb50f837ace99382ebff
 MD5 c09ec8d3022d20acace88c5aa9859cd7 bind-9.2.6.ebuild 8765
 RMD160 a4e7573e4d3c0a52a6b6d922e065f4114bc66ebe bind-9.2.6.ebuild 8765
@@ -109,14 +116,18 @@ EBUILD bind-9.3.2-r4.ebuild 8511 RMD160 0c294dd821a9eaa9a8c5dc3b0a41011340bc7c21
 MD5 a8a9ea2ea307010f78269693ddd1108f bind-9.3.2-r4.ebuild 8511
 RMD160 0c294dd821a9eaa9a8c5dc3b0a41011340bc7c21 bind-9.3.2-r4.ebuild 8511
 SHA256 28b1a52817a6cc12917db99101f6b6a8050261b9acde63e3d42101825d2c069e bind-9.3.2-r4.ebuild 8511
+EBUILD bind-9.3.2-r5.ebuild 8612 RMD160 3daac5f15e495223b4ad860d02de9143a8a112a8 SHA1 6e88614144076a79f59bb4803fd84f46030260f5 SHA256 cb4cabb69adf9aa7fe4f389f050b485bf2809b06ff86213459022097acc860d9
+MD5 209ac21c39473e5069937978c6474a6d bind-9.3.2-r5.ebuild 8612
+RMD160 3daac5f15e495223b4ad860d02de9143a8a112a8 bind-9.3.2-r5.ebuild 8612
+SHA256 cb4cabb69adf9aa7fe4f389f050b485bf2809b06ff86213459022097acc860d9 bind-9.3.2-r5.ebuild 8612
 EBUILD bind-9.3.2.ebuild 8408 RMD160 18332773abf46e69887f0d71cd02b0692253883d SHA1 5bf5d13982703d160f8cb7f6930cd5fb1fc1b0d8 SHA256 752be80b4c50b28319ed90c0f9b918d253ace9aba4d3358c4dcc256f11f531a2
 MD5 e0380e82b4ea99daeb0fe7664737e365 bind-9.3.2.ebuild 8408
 RMD160 18332773abf46e69887f0d71cd02b0692253883d bind-9.3.2.ebuild 8408
 SHA256 752be80b4c50b28319ed90c0f9b918d253ace9aba4d3358c4dcc256f11f531a2 bind-9.3.2.ebuild 8408
-MISC ChangeLog 21041 RMD160 17bc310bbe52120b2c80bd6ec01aec00ba797aa2 SHA1 8a8d41e273542c69321c205385afacc0145bd18f SHA256 3ca92bc93c68b42c51328c547a6359781231cfd4104cc652a31f77998870705a
-MD5 c119ea89b7add82fe195d57f57da6585 ChangeLog 21041
-RMD160 17bc310bbe52120b2c80bd6ec01aec00ba797aa2 ChangeLog 21041
-SHA256 3ca92bc93c68b42c51328c547a6359781231cfd4104cc652a31f77998870705a ChangeLog 21041
+MISC ChangeLog 21239 RMD160 c45d6ef2becd72817a66ebc23cb75c5398ba2dc3 SHA1 dcfe9d26052d9f7df7dfdc79ff073e528e5f3918 SHA256 de1a5a86590fb0b650fd87192e8188b768562a18b19b3b57295e7f2f7b78cda4
+MD5 4734971ec90ee9b61ef2900512f1814c ChangeLog 21239
+RMD160 c45d6ef2becd72817a66ebc23cb75c5398ba2dc3 ChangeLog 21239
+SHA256 de1a5a86590fb0b650fd87192e8188b768562a18b19b3b57295e7f2f7b78cda4 ChangeLog 21239
 MISC metadata.xml 352 RMD160 0c1a848023a0dd76c5173c0a2135beed46e90263 SHA1 24f998969c955accd1fd4f3719bdf83d4e9d432b SHA256 f6f6ae15da16a20d5e0ce76563e3e27901e25787131b8784ffe872ffe3ddd034
 MD5 bf7284c3e31bd3292a01fa046b3220bb metadata.xml 352
 RMD160 0c1a848023a0dd76c5173c0a2135beed46e90263 metadata.xml 352
@@ -130,6 +141,9 @@ SHA256 7275e1e44f5325ece2457bf8fb28fc92b49bc384fd91810e5e4d25a88de16b24 files/di
 MD5 bf38f9efe8cff49eeade2faca5720ce2 files/digest-bind-9.2.6-r4 717
 RMD160 3a480872713a13747d693d560d0a372c715ee20c files/digest-bind-9.2.6-r4 717
 SHA256 f8f961b86cef21d2fa4b5d6f7518e1bd7a2fc6210056c9c219743eb34019aae0 files/digest-bind-9.2.6-r4 717
+MD5 bf38f9efe8cff49eeade2faca5720ce2 files/digest-bind-9.2.6-r5 717
+RMD160 3a480872713a13747d693d560d0a372c715ee20c files/digest-bind-9.2.6-r5 717
+SHA256 f8f961b86cef21d2fa4b5d6f7518e1bd7a2fc6210056c9c219743eb34019aae0 files/digest-bind-9.2.6-r5 717
 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
@@ -139,3 +153,13 @@ SHA256 39453324f8464c8ffef631fcd7300cd771763b9c069ea086b1a5e5cc4a1662c9 files/di
 MD5 332f5323adbe06366904a40316eb1c37 files/digest-bind-9.3.2-r4 738
 RMD160 efc4ffc6818f679a6cb736b4bb60827526284a3d files/digest-bind-9.3.2-r4 738
 SHA256 3095c273ca6a59991a75e0f8526dc3e6ba2a6d0b1e129a2271190dd28d1f54ca files/digest-bind-9.3.2-r4 738
+MD5 332f5323adbe06366904a40316eb1c37 files/digest-bind-9.3.2-r5 738
+RMD160 efc4ffc6818f679a6cb736b4bb60827526284a3d files/digest-bind-9.3.2-r5 738
+SHA256 3095c273ca6a59991a75e0f8526dc3e6ba2a6d0b1e129a2271190dd28d1f54ca files/digest-bind-9.3.2-r5 738
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFO6pqbwxeDFj+ScoRApO1AJ9nZil+1CLdUBAsam3aeO3CHnyYtgCgwVye
+kvxqeB2BM3JcDpYxjBkLYDk=
+=bToM
+-----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.2.6-r5.ebuild b/net-dns/bind/bind-9.2.6-r5.ebuild
new file mode 100644
index 000000000000..c7ff6ca69c67
--- /dev/null
+++ b/net-dns/bind/bind-9.2.6-r5.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.6-r5.ebuild,v 1.1 2006/10/22 17:28:59 voxus Exp $
+
+inherit eutils libtool autotools
+
+DLZ_VERSION="9.2.5"
+MY_P="${P}-P1"
+MY_PV="${PV}-P1"
+
+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/${MY_PV}/${MY_P}.tar.gz
+	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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl ipv6 doc dlz postgres berkdb bind-mysql mysql odbc ldap selinux idn threads"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
+	mysql? ( >=dev-db/mysql-4 )
+	bind-mysql? ( >=dev-db/mysql-4 )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_unpack() {
+	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
+	}
+
+	unpack ${A} && cd ${S}
+
+	# Adjusting PATHs in manpages
+	for i in `echo 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
+
+	if use dlz; then
+		epatch ${DISTDIR}/dlz-${DLZ_VERSION}.patch.bz2
+		epatch ${FILESDIR}/bind-${DLZ_VERSION}-berkdb_fix.patch
+		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
+	fi
+
+	if use bind-mysql; then
+		if use dlz; then
+			MP=${P}-dlz-mysql.patch
+		else
+			MP=${P}-mysql.patch
+		fi
+
+		ebegin "Fixing mysql patch"
+		eindent
+
+		cp ${FILESDIR}/${MP} ${T}/${MP}
+
+		sed -e "s:-I/usr/local/include:`mysql_config --include`:" \
+			-e "s:-L/usr/local/lib/mysql -lmysqlclient:`mysql_config --libs`:" \
+			-i ${T}/${MP}
+
+		epatch ${T}/${MP}
+
+		eoutdent
+		eend $?
+	fi
+
+	if use idn; then
+		epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
+	fi
+
+	# it should be installed by bind-tools
+	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
+
+	cd "${S}"
+	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
+
+	# bug #151839
+	sed \
+		-e 's:CDEFINES = :CDEFINES = -USO_BSDCOMPAT:' \
+		-i lib/isc/unix/Makefile.in
+}
+
+src_compile() {
+	local myconf=""
+
+	use ssl && myconf="${myconf} --with-openssl"
+	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=/usr/include"
+	}
+
+	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 the"
+			einfo "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 \
+		`use_enable ipv6` \
+		--with-libtool \
+		${myconf} || die "econf failed"
+
+	emake -j1 || die "failed to compile bind"
+
+	if use idn; then
+		cd ${S}/contrib/idn/idnkit-1.0-src
+		econf || die "idn econf failed"
+		emake || die "idn emake failed"
+	fi
+}
+
+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
+	}
+
+	insinto /etc/env.d
+	newins ${FILESDIR}/10bind.env 10bind
+
+	# some handy-dandy dynamic dns examples
+	cd ${D}/usr/share/doc/${PF}
+	tar pjxf ${DISTDIR}/dyndns-samples.tbz2
+
+	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,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
+
+	if use idn; then
+		cd ${S}/contrib/idn/idnkit-1.0-src
+		einstall || die "failed to install idn kit"
+		docinto idn
+		dodoc ChangeLog INSTALL{,.ja} README{,.ja} NEWS
+	fi
+
+	# 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}
+}
+
+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.2-r5.ebuild b/net-dns/bind/bind-9.3.2-r5.ebuild
new file mode 100644
index 000000000000..3ce1fb6b3452
--- /dev/null
+++ b/net-dns/bind/bind-9.3.2-r5.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.2-r5.ebuild,v 1.1 2006/10/22 17:28:59 voxus Exp $
+
+inherit eutils libtool autotools
+
+DLZ_VERSION="9.3.2b1"
+MY_P="${P}-P1"
+MY_PV="${PV}-P1"
+
+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/${MY_PV}/${MY_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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
+	mysql? ( >=dev-db/mysql-4 )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )"
+
+S=${WORKDIR}/${MY_P}
+
+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
+
+		use odbc && epatch ${FILESDIR}/${P}-missing_odbc_test.patch
+	}
+
+	use idn && epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-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:CDEFINES = :CDEFINES = -USO_BSDCOMPAT:' \
+		-i lib/isc/unix/Makefile.in
+}
+
+src_compile() {
+	local myconf=""
+
+	use ssl && myconf="${myconf} --with-openssl"
+
+	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"
+
+	use idn && {
+		cd ${S}/contrib/idn/idnkit-1.0-src
+		econf || die "idn econf failed"
+		emake || die "idn emake failed"
+	}
+}
+
+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-r1 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
+
+	if use idn; then
+		cd ${S}/contrib/idn/idnkit-1.0-src
+		einstall || die "failed to install idn kit"
+		docinto idn
+		dodoc ChangeLog INSTALL{,.ja} README{,.ja} NEWS
+	fi
+
+	# 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}
+}
+
+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/digest-bind-9.2.6-r5 b/net-dns/bind/files/digest-bind-9.2.6-r5
new file mode 100644
index 000000000000..1459af898a6b
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.2.6-r5
@@ -0,0 +1,9 @@
+MD5 1efb07dc442ffe6ab742c2eb45e0f761 bind-9.2.6-P1.tar.gz 5126606
+RMD160 5fbfe63c6ff5c28dbbf9c800e13264b7618df9b4 bind-9.2.6-P1.tar.gz 5126606
+SHA256 ecd5180b6afbaecac6a468462e7378e37bc1cc118c4ca9749da74e23c11893e8 bind-9.2.6-P1.tar.gz 5126606
+MD5 3bb820ced02fa2db7ae37e5288a73706 dlz-9.2.5.patch.bz2 135932
+RMD160 d1686658b04b8896828e0b40c1cb869a2b3735f1 dlz-9.2.5.patch.bz2 135932
+SHA256 051ba8ba5825fe3a4f77adcc75e46471bc3ed74c132043bc9e6a6b8d516cd442 dlz-9.2.5.patch.bz2 135932
+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.2-r5 b/net-dns/bind/files/digest-bind-9.3.2-r5
new file mode 100644
index 000000000000..40caaf55c96f
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.3.2-r5
@@ -0,0 +1,9 @@
+MD5 a0b86647ef6a2d5f1e759112d08e2229 bind-9.3.2-P1.tar.gz 5303237
+RMD160 49c1f9ba1d9a4d831ed6dfbe7997c8d5fcd3dcf8 bind-9.3.2-P1.tar.gz 5303237
+SHA256 7c61230a0bd5b85de383a7053ec9b1b101295aa6a6bb681968f5fe0deeacefe0 bind-9.3.2-P1.tar.gz 5303237
+MD5 a70b386bf85c26b1c797e0936be28b79 ctrix_dlz_9.3.2b1.patch.bz2 60982
+RMD160 dd76c79d58fdcf75d5c991bac4b6de54aeb4f8bb ctrix_dlz_9.3.2b1.patch.bz2 60982
+SHA256 f0764290a08b4a839eae8b82a6e27301ce9ff41f3132f697139d73698f89cffc ctrix_dlz_9.3.2b1.patch.bz2 60982
+MD5 2bb12cfcd70284e72fbf9e70e5e2974d dyndns-samples.tbz2 22866
+RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d dyndns-samples.tbz2 22866
+SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 dyndns-samples.tbz2 22866