Version bump, fix chroot configuration (#247979) and fix localhost/127.zones (#246175)

Package-Manager: portage-2.2_rc19/cvs/Linux 2.6.25-gentoo-r7 x86_64

7 files changed, 42 insertions, 598 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 98c9ea4b1fab..7550eb729627 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.214 2008/11/19 21:20:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.215 2008/12/26 22:27:30 dertobi123 Exp $
+
+*bind-9.5.1 (26 Dec 2008)
+
+  26 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> +files/127.zone-r1,
+  +files/localhost.zone-r3, -bind-9.4.2_p2-r1.ebuild, -bind-9.4.3.ebuild,
+  -bind-9.5.0_p2-r1.ebuild, +bind-9.5.1.ebuild:
+  Version bump, fix chroot configuration (#247979) and fix localhost/127.zones
+  (#246175)
 
 *bind-9.4.3 (19 Nov 2008)
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index c587f254e283..60cd5cc52bba 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,5 +1,6 @@
 AUX 10bind.env 27 RMD160 872245707b4f72a212cda162c59495744d77a6e3 SHA1 7b8c1abd5910bb7a07c6b7c820c2b34a534b2593 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650
 AUX 127.zone 227 RMD160 66ab92f201d71da613702a85806d2e8d27f6516f SHA1 6787635fd44b1f29dc34b31053ca28e4353f69e0 SHA256 65b909fc1398dfa5b532ab395d6920758937093cf7e5b5bec8242dff4fe15e89
+AUX 127.zone-r1 533 RMD160 2795c6c27912a73ac45582f33de3182382db3a5d SHA1 87fcb2b96db4cef99d25fa87759dd32ea2ac5559 SHA256 0fa4c294640d4191710647d1b18a2099f22ff674b3a35e6e81ff929f921da626
 AUX bind-9.3.2-missing_odbc_test.patch 613 RMD160 ec141cef65e470dfc8df4c641ec96bfbd5d8cdd1 SHA1 dbc3a933cac7e474fa62fb2f71e50be91825b963 SHA256 5e6465bdb01cbb662333cc2b0a00ad51905a0cda2eb6b7abc3a0b2dd3e701f4e
 AUX bind-9.4.0-dlzbdb-close_cursor.patch 338 RMD160 3c92206a6c77ac8e9ea854dfc22fda5753b653a9 SHA1 903383e2b142d76a73030c27f2cdab8d100df150 SHA256 4a004d72565d6db683b879851ae8dfaddcf1b39fd0f97a995d9c5d22d72c6395
 AUX bind-dlzbdb-includes.patch 465 RMD160 07e120527c34ebc044f1312e491a8d8dc13ec558 SHA1 0184830214317aac4c2f60a8eeabdbbdbf3b2276 SHA256 16ac0b8ba61287a2172c99ab21dd66d0a46b104ef34f710da5933720604f70c6
@@ -7,6 +8,7 @@ AUX bind-dlzmysql5-reconnect.patch 1842 RMD160 687f6128b6511dbeecdfc81b197520b1a
 AUX libcap.patch 552 RMD160 57ab19b4c0a7594a931944ebd59b3ad50bb207fb SHA1 3aaa027694a93f0f901db01d849433cddc48a08e SHA256 f95e6685fb8f77c1b4f77c9fbdaa2eb17f648ad71c9a8d50769d6dc92c379bf5
 AUX localhost.zone-r1 419 RMD160 4013a4c855081d823c3b17f898e483d96eac2c3a SHA1 e0c5329c72039b6abd5dca60199aee2b617475f3 SHA256 bb7ec96335f265f7d6d21b6dd63e0a794477c0ec2675864a4851717a72ac447f
 AUX localhost.zone-r2 423 RMD160 d4b5c18d7f1678595799320b0bfa238d23e5119e SHA1 0e7bdf1cf307b553a572a6775efd69d9a254a77c SHA256 b6dff70386920adb21883566610b0a45b9de5a3847a870e4ad1902c5c7900399
+AUX localhost.zone-r3 426 RMD160 b2dfe76923695e6eac49234b7e7f90fef4d1838e SHA1 b84babc535466cacc7001e4c6eb21e22ae11b22d SHA256 3f39e9b5be72435e961cd6f5acdfe396b05640bf370969acf918a939575122bc
 AUX named.ca 2878 RMD160 f374039998071794501461ccc13012c052b7d117 SHA1 c2f8c46a51493e4209fca6c3f2ba7755ae6dcf2b SHA256 0bd88f7f5cab2f872d3619700e382c1df6837a8aacf28cf6a0bf336742a0ee56
 AUX named.conf-r3 1314 RMD160 b8189eaac58eb27b612eacc66826802748e145ca SHA1 d8b2af94a89472ed0b767bdebadcfebcbf6ddfd3 SHA256 ab2f7305e9a1d30406528c5ef079beb4970c89572e90d57bb5ddb27b8126ad13
 AUX named.confd-r1 392 RMD160 eb80118694d541aeb06df96473ca7d226adf0f6c SHA1 8a0a19237cb661c9d10f545041783edc0f3795ce SHA256 7f985999486b6cfea652b7a7470976bc703c259ef8cbc1cedc3eaacb302805a6
@@ -16,16 +18,13 @@ AUX named.init-r5 1620 RMD160 37279362e437241188a07e5f274730e68645827e SHA1 00a1
 DIST bind-9.3.2-P1.tar.gz 5303237 RMD160 49c1f9ba1d9a4d831ed6dfbe7997c8d5fcd3dcf8 SHA1 4172b7a2814707efecf60a3c484d9fc90e06abfb SHA256 7c61230a0bd5b85de383a7053ec9b1b101295aa6a6bb681968f5fe0deeacefe0
 DIST bind-9.4.1-P1.tar.gz 6341409 RMD160 ced75a96098d78a7fdd8cc1d1e3daf2ad142ee9f SHA1 c65bfd3d6ff1dd78b678fe350e323bfb6d47fe1b SHA256 912d07be9a6b4fa180d38637bf32ac4e802b087e46fbbf2a76314ecc3444b693
 DIST bind-9.4.2-P2.tar.gz 6456550 RMD160 c0934436914cbc0963298cec326fe14a73130873 SHA1 e6aebf6e73dfd4d8ccae397bc5cafaa17fbc5ce4 SHA256 eddf17749abb469bd67213c151450c8e07414d7fcf5a4cd0dc6c03da9656d74d
-DIST bind-9.4.3.tar.gz 6543773 RMD160 05bf5650761f56e9b3b7f27f97fb7dbd0b70ca88 SHA1 8b34602d2877e2855c380c2adea09c0b319aeb71 SHA256 f1b991947fe673310fa4c61b42723f4efb48ea5c24fb5b802bd66786ea660be6
-DIST bind-9.5.0-P2.tar.gz 6627081 RMD160 2ac07f4d48f22cfeabd4d8089aaf955b81199dc0 SHA1 e93a230e0e80e8e5975c83bf0ca0b1186f53fe52 SHA256 e614450ddaa9ac9ad0138c4da536ea6443e70455f99ef3dcaca8067b5a846a3c
+DIST bind-9.5.1.tar.gz 6690642 RMD160 c71dc803b9ddc5c55831dc7652d5c1b9cac78b85 SHA1 1dc0cc2aee726949d1ab857d5e75d8805ca01838 SHA256 320441f4297e4c5cea0c6026afb98d5d9a3c2ccfe05e46d68279218f73867d9a
 DIST bind-sdb-ldap-1.1.0.tar.bz2 5883 RMD160 ec2f684f278e5fa72158486a14dfce3005a62602 SHA1 fae539a29615fda56a2dcb55a1e01d335835b980 SHA256 afe9cc6a99c20f1dc1929b0a30ff815b0aac509a6c12f8df432853c856d35754
 DIST ctrix_dlz_9.3.2b1.patch.bz2 60982 RMD160 dd76c79d58fdcf75d5c991bac4b6de54aeb4f8bb SHA1 a3c65ef330846f62e22655261954a7fe982cb616 SHA256 f0764290a08b4a839eae8b82a6e27301ce9ff41f3132f697139d73698f89cffc
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
 EBUILD bind-9.3.2-r5.ebuild 8593 RMD160 7e17f83d1d8435b1afff008fb0f2b6cbdbedb441 SHA1 1ca6afb0a6cc48648ac55dc28d9b1b322fe42060 SHA256 43377769216a078795c27049ca44142f816b8fd9b6ddb5026a2ea67b0e989411
 EBUILD bind-9.4.1_p1.ebuild 8437 RMD160 f75f8cd519d3d279bc4a80aed13cf30b0b324f42 SHA1 561f8d33ca4c9a08cfa461236440c333a5f1e661 SHA256 c471eb6dd40862e1b08633adf6c2012f92b503f9d9e106436276aa25e5a53086
-EBUILD bind-9.4.2_p2-r1.ebuild 9033 RMD160 9897469a49733f01ebf3a38b0db9a636275ff83b SHA1 9857b2f12144076a6046db17c8a17eadd4637c02 SHA256 f35d88217c4d91a6f89cf3d550142c734b2e8da8fee1b5248bfb0b0b94cc7a5b
 EBUILD bind-9.4.2_p2.ebuild 8892 RMD160 fcfbafe653b3682e6971b81428b66df449ed6112 SHA1 42391b42f101ac7e5520ec6b8d3b72b53cffbc9e SHA256 d509903697b03456ec7470174298b60219eca288df36da7c9bc159c8445c8aec
-EBUILD bind-9.4.3.ebuild 8964 RMD160 c54efccc3e8cb5449295f7ef56eb5ce92a960abc SHA1 7e74954fb36356e4fe5e175461a394c9aa544448 SHA256 8d3e048d25a869269fc48b9d57aa4d8840d45782df76b134d87ff4ae313b989a
-EBUILD bind-9.5.0_p2-r1.ebuild 9359 RMD160 69fd19ccd8c21b2d424a3b1f08757d74638980fa SHA1 9601d39b779faf5dc7b66075355bff0877da42c8 SHA256 7c65ecbffc326611e1db109a0fa0bf3ffcdff88262c607bae298b8809e585dcb
-MISC ChangeLog 35208 RMD160 53f5d15ab35caf0d335ea74d0a4f160ac090c469 SHA1 db440cf1c37072ab974ce33ba31c2a45b785a8d9 SHA256 440c04d55d2fbf6dc4cf82bfd4fefa99b1260dc4c1e019f056104b45dc6de7a3
+EBUILD bind-9.5.1.ebuild 9254 RMD160 4bd2585904f6ff52000ac0cafa46bf5cd75df93d SHA1 2edcc8e34fe554dde165e1f593b61b268d2e96c6 SHA256 98f76176d2b4d5620a91b55dc4a5ce1151310fd14962f2cc797adf940444a869
+MISC ChangeLog 35525 RMD160 0a6f4e80cf91ef59002174c6f1b883c1bdd10a70 SHA1 911d442a8a623fd3fdeed84efe9216b8b4e65adb SHA256 1683aa8f084b8dfc9a03f749dc71b1802547e59bc07288c5db61eb5fb7917e5d
 MISC metadata.xml 647 RMD160 410f601bd6c9449561ef54882c0ae1059d78f908 SHA1 688afcfc2258a4498f6c8564a7528a5224a62876 SHA256 379367eae51c6a1ddbd9d5b3c49d99c863b14f5cbef093980488a96849b4aacf
diff --git a/net-dns/bind/bind-9.4.2_p2-r1.ebuild b/net-dns/bind/bind-9.4.2_p2-r1.ebuild
deleted file mode 100644
index d8db433af2c4..000000000000
--- a/net-dns/bind/bind-9.4.2_p2-r1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.2_p2-r1.ebuild,v 1.2 2008/11/03 13:03:41 armin76 Exp $
-
-inherit eutils libtool autotools toolchain-funcs flag-o-matic
-
-DLZ_VERSION="9.3.3"
-MY_PV="${PV/_p2/-P2}"
-
-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}/${PN}-${MY_PV}.tar.gz
-	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"
-
-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 )
-	threads? ( >=sys-libs/libcap-2.1.0 )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	resolvconf? ( net-dns/openresolv )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-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
-
-	# bind needs a newer libcap #220167
-	use threads && epatch "${FILESDIR}"/libcap.patch
-
-	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 && epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
-
-	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i "${S}"/bin/Makefile.in
-
-	# bug #220361
-	rm "${S}"/aclocal.m4 "${S}"/libtool.m4
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf
-
-	# bug #151839
-	sed -e \
-		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
-		-i lib/isc/unix/socket.c
-
-	# remove useless c++ checks
-	epunt_cxx
-}
-
-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
-			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_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
-	}
-
-	newenvd "${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
-
-	newinitd "${FILESDIR}"/named.init-r5 named
-	newconfd "${FILESDIR}"/named.confd-r2 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/share/man/man8/{dnssec-keygen.8,nsupdate.8}
-	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
-
-	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
-
-	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; };"
-
-	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.4.3.ebuild b/net-dns/bind/bind-9.4.3.ebuild
deleted file mode 100644
index a18b61e1851b..000000000000
--- a/net-dns/bind/bind-9.4.3.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.3.ebuild,v 1.1 2008/11/19 21:20:48 dertobi123 Exp $
-
-inherit eutils libtool autotools toolchain-funcs flag-o-matic
-
-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 )"
-
-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"
-
-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 )
-	threads? ( >=sys-libs/libcap-2.1.0 )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	resolvconf? ( net-dns/openresolv )"
-
-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
-
-	# bind needs a newer libcap #220167
-	use threads && epatch "${FILESDIR}"/libcap.patch
-
-	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 && epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
-
-	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i "${S}"/bin/Makefile.in
-
-	# bug #220361
-	rm "${S}"/aclocal.m4 "${S}"/libtool.m4
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf
-
-	# bug #151839
-	sed -e \
-		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
-		-i lib/isc/unix/socket.c
-
-	# remove useless c++ checks
-	epunt_cxx
-}
-
-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
-			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_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
-	}
-
-	newenvd "${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
-
-	newinitd "${FILESDIR}"/named.init-r5 named
-	newconfd "${FILESDIR}"/named.confd-r2 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/share/man/man8/{dnssec-keygen.8,nsupdate.8}
-	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
-
-	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
-
-	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; };"
-
-	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.5.0_p2-r1.ebuild b/net-dns/bind/bind-9.5.1.ebuild
index 3e709f5182b7..d599b7038d56 100644
--- a/net-dns/bind/bind-9.5.0_p2-r1.ebuild
+++ b/net-dns/bind/bind-9.5.1.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.5.0_p2-r1.ebuild,v 1.2 2008/11/03 13:03:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.5.1.ebuild,v 1.1 2008/12/26 22:27:30 dertobi123 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
-MY_PV="${PV/_p2/-P2}"
 SDB_LDAP_VER="1.1.0"
 
 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}/${PN}-${MY_PV}.tar.gz
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
 	sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.bz2 )
 	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
 
@@ -23,14 +22,13 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	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 )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
 	resolvconf? ( net-dns/openresolv )"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 pkg_setup() {
 	use threads && {
 		echo
@@ -58,9 +56,6 @@ src_unpack() {
 			"${i}"
 	done
 
-	# bind needs a newer libcap #220167
-	use threads && epatch "${FILESDIR}"/libcap.patch
-
 	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
@@ -186,8 +181,8 @@ src_install() {
 	insinto /var/bind ; doins "${FILESDIR}"/named.ca
 
 	insinto /var/bind/pri
-	doins "${FILESDIR}"/127.zone
-	newins "${FILESDIR}"/localhost.zone-r2 localhost.zone
+	newins "${FILESDIR}"/127.zone-r1 127.zone
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
 
 	newinitd "${FILESDIR}"/named.init-r5 named
 	newconfd "${FILESDIR}"/named.confd-r2 named
diff --git a/net-dns/bind/files/127.zone-r1 b/net-dns/bind/files/127.zone-r1
new file mode 100644
index 000000000000..ebce95f7c33c
--- /dev/null
+++ b/net-dns/bind/files/127.zone-r1
@@ -0,0 +1,12 @@
+$ORIGIN 127.in-addr.arpa.
+$TTL 1W
+@                       1D IN SOA       localhost. root.localhost. (
+                                        2008122601      ; serial
+                                        3H              ; refresh
+                                        15M             ; retry
+                                        1W              ; expiry
+                                        1D )            ; minimum
+
+@                       1D IN NS        localhost.
+1.0.0                   1D IN PTR       localhost.
+
diff --git a/net-dns/bind/files/localhost.zone-r3 b/net-dns/bind/files/localhost.zone-r3
new file mode 100644
index 000000000000..2e7a5912b972
--- /dev/null
+++ b/net-dns/bind/files/localhost.zone-r3
@@ -0,0 +1,11 @@
+$TTL 1W
+@       IN      SOA     localhost. root.localhost.  (
+                                      2008122601 ; Serial
+                                      28800      ; Refresh
+                                      14400      ; Retry
+                                      604800     ; Expire - 1 week
+                                      86400 )    ; Minimum
+@		IN      NS      localhost.
+@		IN	A	127.0.0.1
+
+@		IN	AAAA	::1