Version bumps. 9.7.3_p4 fixes CVE-2011-2464. 9.8.0_p4 fixes CVE-2011-1907 and CVE-2011-2464. Remove old version.

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

7 files changed, 37 insertions, 638 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index cbb0339453a7..f19cbdffe89f 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.341 2011/06/16 18:56:09 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.342 2011/07/05 17:00:12 idl0r Exp $
+
+*bind-9.8.0_p4 (05 Jul 2011)
+*bind-9.7.3_p3 (05 Jul 2011)
+
+  05 Jul 2011; Christian Ruppert <idl0r@gentoo.org> -bind-9.7.3.ebuild,
+  -bind-9.7.3-r1.ebuild, +bind-9.7.3_p3.ebuild, -bind-9.8.0_p2-r1.ebuild,
+  +bind-9.8.0_p4.ebuild, -files/named.confd-r5, -files/named.init-r9:
+  Version bumps. 9.7.3_p4 fixes CVE-2011-2464. 9.8.0_p4 fixes CVE-2011-1907 and
+  CVE-2011-2464. Remove old version.
 
   16 Jun 2011; Christian Ruppert <idl0r@gentoo.org> files/named.init-r11:
   Make the init script POSIX conform again, bug 366431.
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index e5ab7f8510a2..8da4211ce2f8 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -8,32 +8,30 @@ AUX bind-dlzmysql5-reconnect.patch 1842 RMD160 687f6128b6511dbeecdfc81b197520b1a
 AUX localhost.zone-r3 426 RMD160 b2dfe76923695e6eac49234b7e7f90fef4d1838e SHA1 b84babc535466cacc7001e4c6eb21e22ae11b22d SHA256 3f39e9b5be72435e961cd6f5acdfe396b05640bf370969acf918a939575122bc
 AUX named.cache 2941 RMD160 c29f47291496e67e72c129db488d07172fe244e6 SHA1 b1575428e8b5f513469a90a32cf163e8db46cab5 SHA256 35f7fcf2b177678cf362af7ac942f7f1a1c102c045dc3844991a411fc4c5d277
 AUX named.conf-r5 3952 RMD160 e4554204786565b08eefb9d129c7b8e0b3a55454 SHA1 cd5c48aa966760343a807c107839c82ba5b575a0 SHA256 fd1e2cbb7d2b3d00ae658a431c747a2adb35227bf6bc6996db1fe705cf2da943
-AUX named.confd-r5 1224 RMD160 b353a2bd8c73cbc1f967d04339d4f07db840a5ee SHA1 181a57e1b2c0371ad2704bb61f621498e2bfddff SHA256 00f06f96dc0cc7855bd15d31449b492e3a2502938e8038081c9f09e0d0ce7a08
 AUX named.confd-r6 1368 RMD160 8ea5c67af53a0986a09f1077a5dd722dd52c8b51 SHA1 64d5d6ead7fb5ba0ff8016b5fee2518fbde6f90c SHA256 704ac6954b2bad5d0bab19281dc703e86d9b4fe94d63dd00be1e525a3e64c492
 AUX named.init-r10 5925 RMD160 acd84047fe945bb146c676a673eca9782362f4ad SHA1 bf91dabc72f693222c935eada9a21f7dc7dc2c2a SHA256 e7604579ed45cafdf121a65c5847b56aecb42356a213f7bac17474823431b24d
 AUX named.init-r11 6250 RMD160 12de95defb4de776b4399640be5ae7b2c91388f8 SHA1 9e8ab623ce45cc362b156fed8ffdd67c3294f740 SHA256 5fec01c26a37a793a7c812b0e0c22bd0a0142d1ebfabd21b1bf4f11b73c5526b
-AUX named.init-r9 4946 RMD160 48cce5a99a8da1eff3492c4896fbae4c1343a675 SHA1 944ed08d22e70ba93625814695535f58feed2083 SHA256 77fd6b4ecb0f7f4baa872d1be1b18d2ea9a913a15f30f63ab904a62ad4325748
 DIST bind-9.7.3-P1.tar.gz 7586464 RMD160 838d9089b4f761608c0358a2f897654a7383357b SHA1 4c61aa9ca83310c18e2260748e2f1a5296c83d78 SHA256 5ff684039fda0df27b75a771b66dbe77fd612fb4ade5f4c15960fbb8d62bbbf1
-DIST bind-9.7.3.tar.gz 7653584 RMD160 9e53c9cefa2e8261bc52b5d6d7ed550891d9dce5 SHA1 78e14b3d3e653a8c21b098361b645dee5ed66238 SHA256 7c584ca838da4adb6e94e4507b97b180248ca2b1e6aec1513336b58b344a29f7
-DIST bind-9.8.0-P2.tar.gz 7702702 RMD160 3db0b25303da78f06d6fb48f66908111cb0eb34c SHA1 b3492ad11cfbf2939d9b0fb62c52c204de58679b SHA256 da4d3d2e2c3b3b1f5c6cd870ff262af5a2e82082b7a7e9c77ccab637fa11f2bd
+DIST bind-9.7.3-P3.tar.gz 7586748 RMD160 456aed6a9c6e87de43d38860eaef2ee5d67e1f8e SHA1 90c5340daa94517e3bc7be89feef5ea6918fc390 SHA256 464e9aeeaf8d6964205621ead02898e076ebcfcbeef8c651dc695891c5622c37
+DIST bind-9.8.0-P1-geoip-1.3.patch 54084 RMD160 d695b9aea249f308525d0938504ad61685e4d17c SHA1 4c4e40fc448e9effe7f1190728d3b623fae75b0e SHA256 988dadad30c54becc388c925ede32647419e34ee0fc689699e54d5c0843e233b
+DIST bind-9.8.0-P4.tar.gz 7703981 RMD160 cd44fe00d5f052ab441c16b2e735ad5771b4230a SHA1 969864200c1516a8bea54266de60f316d79182b4 SHA256 ea2d9c30f41e680afc8b85eabd7c58865ce31d72009f2812d03078428869f415
 DIST bind-geoip-1.3-9.7.2-P2.patch 54084 RMD160 fcc2308bd2832df821f76aeb1ea1c5740fadb6f3 SHA1 786c2fd8dde40f235e292f5bd883094863976580 SHA256 c12c03fc25a679d8d4296142597c698ab934e18cc761113553062a66be2875dd
 DIST bind-geoip-1.3-readme.txt 10040 RMD160 073956324ed4780e0e0cdbf40ae259f85ebef9d2 SHA1 e13ea2f458adfed3f1a20f9fe3eb2bfd484fc0b0 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845
 DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 RMD160 eb7507dc4b1da0064516d9e75dbc435553b1c9ce SHA1 8c269cd172c6d90df38dab201cdd105eff03cbe3 SHA256 fe043a573ba187dcc8b0f7313d4408236e6916ec246b0443b7e71b33c8303ae9
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
-EBUILD bind-9.7.3-r1.ebuild 11624 RMD160 19690cfe501651256d1a2cc1901e93e317b79ce4 SHA1 6d85901298a213f6c4e5fec03b1fb222fa33a6b4 SHA256 b9b97ec7c2c869f51b1e64e3b87e8a63edd9f9dde6dae5f010189eac6b12f160
-EBUILD bind-9.7.3.ebuild 11374 RMD160 9c65021dfb7b8a5e2d5d1efd202d71355ef695aa SHA1 2ef602dc663c0259310e054c771e576a5f1f0e25 SHA256 5da52eab6748d8a03ff41464f39069942fc6cfe39e1a4b575b125151f4e10b1f
 EBUILD bind-9.7.3_p1.ebuild 11613 RMD160 bad58a3f45a5d909b4df04803d959e2c9affe0b4 SHA1 646d7a1fb10980e704fb8ed39f1acb3d70c2b55e SHA256 9aa8a6e64f914d8beeeb44dd1453ebe9dcbe2a7e7c7a913e651df7e2d3613e95
-EBUILD bind-9.8.0_p2-r1.ebuild 12181 RMD160 c4622d839bdb3799a6812777185c459f782cbe02 SHA1 8294dab01a089b4e8a5b542aed465cab45f62af5 SHA256 eeeb2f22e5591ba1e44b0266291ddd4a7c71bfc4e6cdcdd1fcef5675b97f5587
-MISC ChangeLog 58173 RMD160 7997b0f022ab6c9eda18162ea88233dc862256e7 SHA1 59f7ee3fc8c05bb2ee6e8a60fd6783d2aa3c93d7 SHA256 dde5925d811e997aa504712980b0f92a80bdf4a0fc48dffbc6269c5ed5324bfa
+EBUILD bind-9.7.3_p3.ebuild 11556 RMD160 63b29fbf691c8b3693144f48cb0252aae3ae0654 SHA1 4bef52b2217169d04283bebf7c2fe7d7a9608f42 SHA256 d4a7fd80bb6a4f9cf17036d1c90ecf31e7c872c42eedf533569fc0e018521120
+EBUILD bind-9.8.0_p4.ebuild 12176 RMD160 a9020e7863295b45788113ba97f3c4b08652fcb2 SHA1 ad394c2bc28556c924d18bee8361a098b9ae54ad SHA256 e5a535ad9db7b823ec0ee8bd3377da21d5031d36341de1c958f4561309a5dc3d
+MISC ChangeLog 58566 RMD160 cf80adeb0304cab02d36719b8ea71b1edaefabe2 SHA1 b1d92f620249e05ca1d2fe067a0db11deec13032 SHA256 cdf0e1e929385e89a3f4cb96db15a54d4f511b018728df58901eb026fcc5a641
 MISC metadata.xml 686 RMD160 04372d2e822125106bfbec86f7f754b2f8381250 SHA1 efe392ad948d348fb8c1a9a38558fb3cc3e892c8 SHA256 ac17c78fd6d997049a1b1e49be8142e78514bec66e85099c8e946b300fde7c4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJN+lHOAAoJEMOx0zmdw4Z1Hw4H/0TeHdj/BmDIum+oZV+1Ik4B
-MS1pKYP4plF9wmwI4yvHXjQh+9ySurMfrHQ28R9sBcAOS/bRUB3qqRHxXXXMOgNr
-L8n5cFx92Ht3shMevEUnfGh+pV3nFjeGkh2/9ta6/CYJnkZc+DmBVko9CshCcyZc
-00smHbEWvWTEY3p2d6OZFODs0dO3HU95ovAU3auTE1qJGLCHNBYJjew/OAPQ92E9
-EfpnW7SN/NDUmcVKckSLJ1o4PEk4wni2wNNuboRvrUg9iWjf+EMOi39uskm4aJvy
-uqe3cbyYrJypIRDx/jMfC/Vs4MfVywBlpiXNqyp0I6/BVg/Dt07WM85D+YoyGt4=
-=Nmlf
+iQEcBAEBCAAGBQJOE0MiAAoJEMOx0zmdw4Z1mnEH/Ar5ejViKQ62quhXlNMdUpGl
+lEp2KUcyFInkNTq9tmibCjxN5BvU0W1WCmOoSfIqLye6Jw9ShNNm8xJR1FswkRrY
+TsvDoNa8SAV/V0Cht3rgdcjJS4omOzeVpJNT4YsmIH9xUiEwqSnwo7bdjNBM7/3U
+k12q4bWntH8pA2Uu13sXVduYbPYtiLPPUOtBE6ZH8rcyC8alHorquvKRwDw/TGie
+HBwHg4DEzjMylsbZywwnqDiftnm/fzrJpiwNcloMmWXGfDq6x1Ekm0Lcmd4Ui2YI
+5fBvCO91hygfM4lPsljLs+VGin/Am5Gop7YpNl6+BLvNofMXpHHGUl/5qmZlfSQ=
+=SqxZ
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.7.3.ebuild b/net-dns/bind/bind-9.7.3.ebuild
deleted file mode 100644
index 1ae555eccc36..000000000000
--- a/net-dns/bind/bind-9.7.3.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.3.ebuild,v 1.7 2011/02/26 17:37:16 armin76 Exp $
-
-EAPI="3"
-
-inherit eutils autotools toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_p/-P}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0"
-
-GEOIP_PV=1.3
-#GEOIP_PV_AGAINST="${MY_PV}"
-GEOIP_PV_AGAINST="9.7.2-P2"
-GEOIP_P="bind-geoip-${GEOIP_PV}"
-GEOIP_PATCH_A="${GEOIP_P}-${GEOIP_PV_AGAINST}.patch"
-GEOIP_DOC_A="${GEOIP_P}-readme.txt"
-GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-	geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A}
-			 ${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} )"
-#	sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.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 mysql odbc ldap selinux idn threads
-	resolvconf urandom xml geoip gssapi" # sdb-ldap
-
-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 )
-	postgres? ( dev-db/postgresql-base )
-	threads? ( >=sys-libs/libcap-2.1.0 )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( >=dev-libs/geoip-1.4.6 )
-	gssapi? ( virtual/krb5 )"
-#	sdb-ldap? ( net-nds/openldap )
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	resolvconf? ( net-dns/openresolv )
-	sys-process/psmisc"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use threads && {
-		ewarn
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		ewarn
-	}
-
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_prepare() {
-	# 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}" || die "sed failed, ${i} doesn't exist"
-	done
-
-	if use dlz; then
-		# 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/)
-		if use mysql && has_version ">=dev-db/mysql-5"; then
-			epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
-		fi
-
-		if use odbc; then
-			epatch "${FILESDIR}/${P}-odbc-dlz-detect.patch"
-		fi
-	fi
-
-	# should be installed by bind-tools
-	sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die
-
-	# sdb-ldap patch as per  bug #160567
-	# Upstream URL: http://bind9-ldap.bayour.com/
-	# FIXME: bug 302735
-#	use sdb-ldap && epatch "${WORKDIR}"/sdb-ldap/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
-
-	if use geoip; then
-		cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
-		sed -i -e 's/RELEASETYPE=-P/RELEASETYPE=/' \
-			-e 's/-RELEASEVER=2/-RELEASEVER=/' \
-			-e 's/+RELEASEVER=2-geoip-1.3/+RELEASEVER=-geoip-1.3/' \
-			${GEOIP_PATCH_A} || die
-		epatch ${GEOIP_PATCH_A}
-	fi
-
-	# bug #220361
-	rm {aclocal,libtool}.m4
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf
-
-	# remove useless c++ checks
-	epunt_cxx
-}
-
-src_configure() {
-	local myconf=""
-
-	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
-			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"
-		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
-
-	use geoip && myconf="${myconf} --with-geoip"
-
-	# bug #158664
-	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	export BUILD_CC=$(tc-getBUILD_CC)
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		$(use_with ssl openssl) \
-		$(use_with idn) \
-		$(use_enable ipv6) \
-		$(use_with xml libxml2) \
-		$(use_with gssapi) \
-		${myconf}
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc CHANGES FAQ README
-
-	if use idn; then
-		dodoc contrib/idn/README.idnkit || die
-	fi
-
-	if use doc; then
-		dodoc doc/arm/Bv9ARM.pdf || die
-
-		docinto misc
-		dodoc doc/misc/* || die
-
-		# might a 'html' useflag make sense?
-		docinto html
-		dohtml -r doc/arm/* || die
-
-		docinto	draft
-		dodoc doc/draft/* || die
-
-		docinto rfc
-		dodoc doc/rfc/* || die
-
-		docinto contrib
-		dodoc contrib/named-bootconf/named-bootconf.sh \
-			contrib/nanny/nanny.pl || die
-
-		# some handy-dandy dynamic dns examples
-		cd "${D}"/usr/share/doc/${PF}
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-	fi
-
-	use geoip && dodoc "${DISTDIR}"/${GEOIP_P}-readme.txt
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r5 named.conf || die
-
-	# ftp://ftp.rs.internic.net/domain/named.cache:
-	insinto /var/bind
-	doins "${FILESDIR}"/named.cache || die
-
-	insinto /var/bind/pri
-	newins "${FILESDIR}"/127.zone-r1 127.zone || die
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone || die
-
-	newinitd "${FILESDIR}"/named.init-r9 named || die
-	newconfd "${FILESDIR}"/named.confd-r5 named || die
-
-	newenvd "${FILESDIR}"/10bind.env 10bind || die
-
-	# 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,host,nslookup}.1*
-	rm -f "${D}"/usr/share/man/man8/{dnssec-keygen,nsupdate}.8*
-	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
-	rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate}
-
-	dosym /var/bind/named.cache /var/bind/root.cache || die
-	dosym /var/bind/pri /etc/bind/pri || die
-	dosym /var/bind/sec /etc/bind/sec || die
-	keepdir /var/bind/sec
-
-	dodir /var/{run,log}/named || die
-
-	fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri}
-	fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/{run,log}/named /var/bind/{,sec}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
-		chown root:named /etc/bind/rndc.key
-		chmod 0640 /etc/bind/rndc.key
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-
-	ewarn
-	ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache"
-	ewarn "you may need to fix your named.conf!"
-	ewarn
-	ewarn "NOTE: If you upgrade from <net-dns/bind-9.4.3_p5-r1, you may encounter permission problems"
-	ewarn "To fix the permissions do:"
-	ewarn "chown root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri}"
-	ewarn "chown root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
-	ewarn "chmod 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
-	ewarn "chmod 0750 /etc/bind /var/bind/pri"
-	ewarn "chmod 0770 /var/{run,log}/named /var/bind/{,sec}"
-	ewarn
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT}
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/{run,log}}
-	mkdir -m 0750 -p ${CHROOT}/etc/bind
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,{run,log}/named}
-	chown root:named ${CHROOT} ${CHROOT}/var/{bind,{run,log}/named} ${CHROOT}/etc/bind
-
-	cp /etc/localtime ${CHROOT}/etc/localtime
-
-	mknod ${CHROOT}/dev/null c 1 3
-	chmod 0666 ${CHROOT}/dev/null
-
-	mknod ${CHROOT}/dev/zero c 1 5
-	chmod 0666 ${CHROOT}/dev/zero
-
-	if use urandom; then
-		mknod ${CHROOT}/dev/urandom c 1 9
-		chmod 0666 ${CHROOT}/dev/urandom
-	else
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 0666 ${CHROOT}/dev/random
-	fi
-
-	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
-		cp -a /etc/bind ${CHROOT}/etc/
-		cp -a /var/bind ${CHROOT}/var/
-	fi
-
-	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-		mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
-	fi
-
-	elog "You may need to add the following line to your syslog-ng.conf:"
-	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/bind-9.7.3-r1.ebuild b/net-dns/bind/bind-9.7.3_p3.ebuild
index 838830e8c064..a54983844799 100644
--- a/net-dns/bind/bind-9.7.3-r1.ebuild
+++ b/net-dns/bind/bind-9.7.3_p3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.3-r1.ebuild,v 1.2 2011/02/27 22:27:48 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.3_p3.ebuild,v 1.1 2011/07/05 17:00:12 idl0r Exp $
 
 EAPI="3"
 
@@ -84,7 +84,7 @@ src_prepare() {
 		fi
 
 		if use odbc; then
-			epatch "${FILESDIR}/${P}-odbc-dlz-detect.patch"
+			epatch "${FILESDIR}/bind-9.7.3-odbc-dlz-detect.patch"
 		fi
 	fi
 
@@ -103,9 +103,8 @@ src_prepare() {
 
 	if use geoip; then
 		cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
-		sed -i -e 's/RELEASETYPE=-P/RELEASETYPE=/' \
-			-e 's/-RELEASEVER=2/-RELEASEVER=/' \
-			-e 's/+RELEASEVER=2-geoip-1.3/+RELEASEVER=-geoip-1.3/' \
+		sed -i -e 's:PATCHVER=2:PATCHVER=3:' \
+			-e 's/RELEASEVER=2/RELEASEVER=3/' \
 			${GEOIP_PATCH_A} || die
 		epatch ${GEOIP_PATCH_A}
 	fi
@@ -213,7 +212,7 @@ src_install() {
 		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
 	fi
 
-	use geoip && dodoc "${DISTDIR}"/${GEOIP_P}-readme.txt
+	use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A}
 
 	insinto /etc/bind
 	newins "${FILESDIR}"/named.conf-r5 named.conf || die
@@ -226,7 +225,7 @@ src_install() {
 	newins "${FILESDIR}"/127.zone-r1 127.zone || die
 	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone || die
 
-	newinitd "${FILESDIR}"/named.init-r10 named || die
+	newinitd "${FILESDIR}"/named.init-r11 named || die
 	newconfd "${FILESDIR}"/named.confd-r6 named || die
 
 	newenvd "${FILESDIR}"/10bind.env 10bind || die
diff --git a/net-dns/bind/bind-9.8.0_p2-r1.ebuild b/net-dns/bind/bind-9.8.0_p4.ebuild
index 9c83947cf9ab..8eabdc1ee2e9 100644
--- a/net-dns/bind/bind-9.8.0_p2-r1.ebuild
+++ b/net-dns/bind/bind-9.8.0_p4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.0_p2-r1.ebuild,v 1.1 2011/06/16 18:54:12 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.0_p4.ebuild,v 1.1 2011/07/05 17:00:12 idl0r Exp $
 
 EAPI="3"
 
@@ -12,12 +12,13 @@ MY_P="${PN}-${MY_PV}"
 
 SDB_LDAP_VER="1.1.0-fc14"
 
+# bind-9.8.0-P1-geoip-1.3.patch
 GEOIP_PV=1.3
 #GEOIP_PV_AGAINST="${MY_PV}"
-GEOIP_PV_AGAINST="9.7.2-P2"
-GEOIP_P="bind-geoip-${GEOIP_PV}"
-GEOIP_PATCH_A="${GEOIP_P}-${GEOIP_PV_AGAINST}.patch"
-GEOIP_DOC_A="${GEOIP_P}-readme.txt"
+GEOIP_PV_AGAINST="9.8.0-P1"
+GEOIP_P="bind-${GEOIP_PV_AGAINST}-geoip-${GEOIP_PV}"
+GEOIP_PATCH_A="${GEOIP_P}.patch"
+GEOIP_DOC_A="bind-geoip-1.3-readme.txt"
 GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
 
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
@@ -104,8 +105,7 @@ src_prepare() {
 
 	if use geoip; then
 		cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
-		sed -i -e 's:MINORVER=7:MINORVER=8:' \
-			-e 's:PATCHVER=2:PATCHVER=0:' ${GEOIP_PATCH_A} || die
+		sed -i -e 's:RELEASEVER=1:RELEASEVER=4:' ${GEOIP_PATCH_A} || die
 		epatch ${GEOIP_PATCH_A}
 	fi
 
@@ -212,7 +212,7 @@ src_install() {
 		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
 	fi
 
-	use geoip && dodoc "${DISTDIR}"/${GEOIP_P}-readme.txt
+	use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A}
 
 	insinto /etc/bind
 	newins "${FILESDIR}"/named.conf-r5 named.conf || die
diff --git a/net-dns/bind/files/named.confd-r5 b/net-dns/bind/files/named.confd-r5
deleted file mode 100644
index 631ac19db6c8..000000000000
--- a/net-dns/bind/files/named.confd-r5
+++ /dev/null
@@ -1,44 +0,0 @@
-# Set various named options here.
-#
-#OPTIONS=""
-
-# Set this to the number of processors you want bind to use.
-# Leave this unchanged if you want bind to automatically detect the number
-#CPU="1"
-
-# If you wish to run bind in a chroot:
-# 1) un-comment the CHROOT= assignment, below. You may use
-#    a different chroot directory but MAKE SURE it's empty.
-# 2) run: emerge --config =<bind-version>
-#
-#CHROOT="/chroot/dns"
-
-# Uncomment to enable binmount of /usr/share/GeoIP
-#CHROOT_GEOIP="1"
-
-# Uncomment the line below to avoid that the init script mounts the needed paths
-# into the chroot directory.
-# You have to copy all needed config files by hand if you say CHROOT_NOMOUNT="1".
-#CHROOT_NOMOUNT="1"
-
-# Default pid file location
-PIDFILE="${CHROOT}/var/run/named/named.pid"
-
-# Scheduling priority: 19 is the lowest and -20 is the highest.
-# Default: 0
-#NAMED_NICELEVEL="0"
-
-# Uncomment rc_named_use/rc_named_after for the database you need.
-# Its necessary to ensure the database backend will be started before named.
-
-# MySQL
-#rc_named_use="mysql"
-#rc_named_after="mysql"
-
-# PostgreSQL
-#rc_named_use="pg_autovacuum postgresql"
-#rc_named_after="pg_autovacuum postgresql"
-
-# LDAP
-#rc_named_use="ldap"
-#rc_named_after="ldap"
diff --git a/net-dns/bind/files/named.init-r9 b/net-dns/bind/files/named.init-r9
deleted file mode 100644
index a962984f399f..000000000000
--- a/net-dns/bind/files/named.init-r9
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r9,v 1.2 2010/12/15 23:35:09 idl0r Exp $
-
-opts="start stop reload restart checkconfig checkzones"
-
-depend() {
-	need net
-	use logger
-	provide dns
-}
-
-NAMED_CONF=${CHROOT}/etc/bind/named.conf
-
-_mount() {
-	local from
-	local to
-	local opts
-
-	if [ "${#}" -lt 3 ]; then
-		eerror "_mount(): to few arguments"
-		return 1
-	fi
-
-	from=$1
-	to=$2
-	shift 2
-
-	opts="${*}"
-	shift $#
-
-	if [ -z "$(awk "\$2 == \"${to}\" { print \$2 }" /proc/mounts)" ]; then
-		einfo "mounting ${from} to ${to}"
-		mount ${from} ${to} ${opts} || return 1
-	fi
-
-	return 0
-}
-
-_umount() {
-	local dir=$1
-
-	if [ -n "$(awk "\$2 == \"${dir}\" { print \$2 }" /proc/mounts)" ]; then
-		einfo "umount ${dir}"
-		umount ${dir} || return 1
-	fi
-
-	return 0
-}
-
-_get_pidfile() {
-	# as suggested in bug #107724, bug 335398#c17
-	[ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\
-			/usr/sbin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF/${CHROOT}} | grep 'pid-file' | cut -d\" -f2)
-	[ -z "${PIDFILE}" ] && PIDFILE=${CHROOT}/var/run/named/named.pid
-}
-
-check_chroot() {
-	if [ -n "${CHROOT}" ]; then
-		[ ! -d "${CHROOT}" ] && return 1
-		[ ! -d "${CHROOT}/dev" ] || [ ! -d "${CHROOT}/etc" ] || [ ! -d "${CHROOT}/var" ] && return 1
-		[ ! -d "${CHROOT}/var/run" ] || [ ! -d "${CHROOT}/var/log" ] && return 1
-		[ ! -d "${CHROOT}/etc/bind" ] || [ ! -d "${CHROOT}/var/bind" ] && return 1
-		[ ! -d "${CHROOT}/var/log/named" ] && return 1
-		[ ! -e "${CHROOT}/etc/localtime" ] && return 1
-		[ ! -c "${CHROOT}/dev/null" ] || [ ! -c "${CHROOT}/dev/zero" ] && return 1
-		[ ! -c "${CHROOT}/dev/random" ] && [ ! -c "${CHROOT}/dev/urandom" ] && return 1
-		[ "${CHROOT_GEOIP:-0}" -eq 1 ] && [ ! -d "${CHROOT}/usr/share/GeoIP" ] && return 1
-	fi
-
-	return 0
-}
-
-checkconfig() {
-	ebegin "Checking named configuration"
-
-	if [ ! -f "${NAMED_CONF}" ] ; then
-		eerror "No ${NAMED_CONF} file exists!"
-		return 1
-	fi
-
-	/usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF/${CHROOT}} || {
-		eerror "named-checkconf failed! Please fix your config first."
-		return 1
-	}
-
-	eend 0
-	return 0
-}
-
-checkzones() {
-	ebegin "Checking named configuration and zones"
-	/usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF/${CHROOT}}
-	eend $?
-}
-
-start() {
-	local piddir
-
-	ebegin "Starting ${CHROOT:+chrooted }named"
-
-	if [ -n "${CHROOT}" ]; then
-		check_chroot || {
-			eend 1
-			eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
-			return 1
-		}
-
-		if [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
-			einfo "Mounting chroot dirs"
-			_mount /etc/bind ${CHROOT}/etc/bind -o bind
-			_mount /var/bind ${CHROOT}/var/bind -o bind
-			_mount /var/log/named ${CHROOT}/var/log/named -o bind
-			if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-				_mount /usr/share/GeoIP ${CHROOT}/usr/share/GeoIP -o bind
-			fi
-		fi
-	fi
-
-	checkconfig || { eend 1; return 1; }
-
-	# create piddir (usually /var/run/named) if necessary, bug 334535
-	_get_pidfile
-	piddir="${PIDFILE%/*}"
-	if [ ! -d "${piddir}" ]; then
-		checkpath -q -d -o root:named -m 0770 "${piddir}" || {
-			eend 1
-			return 1
-		}
-	fi
-
-	# In case someone have $CPU set in /etc/conf.d/named
-	if [ -n "${CPU}" ] && [ "${CPU}" -gt 0 ]; then
-		CPU="-n ${CPU}"
-	fi
-
-	start-stop-daemon --start --pidfile ${PIDFILE} \
-		--nicelevel ${NAMED_NICELEVEL:-0} \
-		--exec /usr/sbin/named \
-		-- -u named ${CPU} ${OPTIONS} ${CHROOT:+-t} ${CHROOT}
-	eend $?
-}
-
-stop() {
-	local reported=0
-
-	ebegin "Stopping ${CHROOT:+chrooted }named"
-
-	# Workaround for now, until openrc's restart has been fixed.
-	# openrc doesn't care about a restart() function in init scripts.
-	if [ "${RC_CMD}" = "restart" ]; then
-		checkconfig || { eend 1; return 1; }
-	fi
-
-	# -R 10, bug 335398
-	_get_pidfile
-	start-stop-daemon --stop --retry 10 --pidfile $PIDFILE \
-		--exec /usr/sbin/named
-
-	if [ -n "${CHROOT}" ] && [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
-		ebegin "Umounting chroot dirs"
-
-		# just to be sure everything gets clean
-		while fuser -s ${CHROOT} 2>/dev/null; do
-			if [ "${reported}" -eq 0 ]; then
-				einfo "Waiting until all named processes are stopped"
-				reported=1
-			fi
-			sleep 1
-		done
-
-		[ "${CHROOT_GEOIP:-0}" -eq 1 ] && _umount ${CHROOT}/usr/share/GeoIP
-		_umount ${CHROOT}/etc/bind
-		_umount ${CHROOT}/var/log/named
-		_umount ${CHROOT}/var/bind
-	fi
-
-	eend $?
-}
-
-reload() {
-	local ret
-
-	ebegin "Reloading named.conf and zone files"
-
-	checkconfig || { eend 1; return 1; }
-
-	_get_pidfile
-	if [ -n "${PIDFILE}" ]; then
-		# FIXME: Remove --stop and --oknodo as soon as baselayout-1 has been removed... finally...
-		start-stop-daemon --stop --oknodo --pidfile $PIDFILE --signal HUP --exec /usr/sbin/named
-		ret=$?
-	else
-		ewarn "Unable to determine the pidfile... this is"
-		ewarn "a fallback mode. Please check your installation!"
-
-		$RC_SERVICE restart
-		ret=$?
-	fi
-
-	eend $ret
-}