Version bump, bug 437828 - CVE CVE-2012-5166

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

5 files changed, 463 insertions, 268 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 9a277d143ac8..389656ebe28a 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.415 2012/09/16 14:23:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.416 2012/10/10 20:11:06 idl0r Exp $
+
+*bind-9.9.2 (10 Oct 2012)
+*bind-9.9.1_p4 (10 Oct 2012)
+
+  10 Oct 2012; Christian Ruppert <idl0r@gentoo.org> -bind-9.9.1_p2.ebuild,
+  +bind-9.9.1_p4.ebuild, +bind-9.9.2.ebuild, -files/named.init-r11:
+  Version bump, bug 437828 - CVE CVE-2012-5166
 
   16 Sep 2012; Jeroen Roovers <jer@gentoo.org> bind-9.9.1_p3.ebuild:
   Stable for HPPA (bug #434876).
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index c2cee8fd60f0..9b8312617845 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -10,24 +10,30 @@ AUX localhost.zone-r3 426 SHA256 3f39e9b5be72435e961cd6f5acdfe396b05640bf370969a
 AUX named.cache 3048 SHA256 eb0ce2b11bf2302a716fa8ef21d55e55f1892dfd853c73c71319bfa5e171eff3 SHA512 058ae1ef089eb4d5ad43ffb83e9f48d586cdfcd4cd4efe9b531a0628d4ee1a69e489187572747a224059a00efd9187012bf59a6da05c4ddfbfa1b7719ff6cbdc WHIRLPOOL 896df0ffaf307c7208a5102058a2cc6e033c9c297602e5441ea8eeec6fc9937d5e90ddb4e5832020cf624607bc92560c394cc7aa2a2e71d383be0e737873f0e1
 AUX named.conf-r5 4119 SHA256 a5bcfe16562672e46550c2d84bfff63405998f512b639cc27a53f0b0fdf7f24e SHA512 232a3935eeb8609578a440ba45a75e87afe1521993e87d1dd2892184883807cd784b80f2a5b10414a614b8e5f31983efc58ae0088738ca622c07eef98f1e8369 WHIRLPOOL 8c57c646fb037e3801f0ab9dd5e1695bd769392d93bd407f7af937f28934a8848941ade303a8dd68a3509c3bf37db16b8e1e8aa93afe4a6781eac99753f605dd
 AUX named.confd-r6 1368 SHA256 704ac6954b2bad5d0bab19281dc703e86d9b4fe94d63dd00be1e525a3e64c492 SHA512 074c37ecfa6d59de4ac70782b4722ffbeb3d66fae7cfa66810a67a06a1915d4e73f03b1f497d6005f125749aff61d11adf2927dcdb5a3d4fc4fb407fafa02dd1 WHIRLPOOL 3347b6887f1c516d3a4b2d40eb42195669b7a2ec01d02df21c7c0d4c27fe8984e1a2985d32f7631c1cd31b16c0f5031e69abfe5fd3d9c9debd156fd04d5c6910
-AUX named.init-r11 6134 SHA256 8de85e03b2c1e8cc6e79a65e70a1c85a3d873d956425fef3291626c2db006884 SHA512 810e2e8fc410c35fae42f0851cb5bbdaabb2343e9825a36729e443fefb5be2d9d23a7fda07fcc74e1f86de44b2dd2d9c86243b4b0b18e93a53faea585d986fca WHIRLPOOL d55d7863639ac5e5e6e8c10a3e19c95ec24e01131f5892e9d49d1444c849059fad1f8af6529da803fffaa670d486c91e881153604e71e41dd1a189dca2a83f66
 AUX named.init-r12 6095 SHA256 953e066b5d77f59917db59365cd2103c5bec19889775bd3f6437b946c9d6d936 SHA512 7a576816fb3306c2a66227f78f23301b55b5376f587e6a521b33c2c90dc1499290751c83d5e0e5bc4961a1413480d993c909bf3c448a05762bf7928b43bf9559 WHIRLPOOL e0973117385b6d5d3bdc83c1777a90849da682e89ce716bf69de92528959edf93edbff264b25aa13ad7f73803f3eb403e89badad996c2c01245c5a0f97247b7f
-DIST bind-9.9.1-P1-geoip-1.3.patch 54332 SHA256 d876f58c60d60bafb3603067f66bc014e2867c2328f293aedbe26a65598e68b7 SHA512 93d4e0a10def2a41c6e0f050225642cbef25bf2e973d74ca9994a8a67a37bffd2b3ef97c3d41f06607f870e7de3244ed6f690792b5c3843d151ae6a921f85f28 WHIRLPOOL 7cd7cd33b8fe6d2bba8b9734e6c7bb4ecd45bd12fdfa0a549d734e11d4df79076a1aa4b63f616db007d32edf0ef8b350d76a84ac1bc0b0d2e86cff23fe124daf
 DIST bind-9.9.1-P2-geoip-1.3.patch 54332 SHA256 13c537f543e5ac15ceb92ccb167a8afcc22fbbd60d890ae159c96850c17d9428 SHA512 605d2dc5a7791d6b97b861843bdf779edd572eb75fe2c1be3e1e666170abac403fd8153ebb1a8093a7fe75c1454c3a826db4653db00c551bb0a398eed83d28e7 WHIRLPOOL fce6aa1d5f7fe280ee1a3ca53c65f8ddf22fce6f90c884286a671e81ab4432a080a1abecd6b7325aa79a280d3679a8af9420b6a8102c242bf5684778a4c19082
-DIST bind-9.9.1-P2.tar.gz 7223896 SHA256 a46ecf6177b69d6e9a83a15f792d0594adcc8e800086208dd9b84452afb84d0e SHA512 9c3adf1621ea0f953cd81c9ff6c2d0a6a2dd766b2558ec43ebd6143f16738db011730d235052514d52200f87a6b16107acf173a38a6f5c8885f63a7e6384e852 WHIRLPOOL 3652e660f551b30ad28a43941cc910683b706cf3bc306c7c88622ac6f967ae9961626d0321c32bc8206e1f799c10658b0d8cda0479bd5f2cfa5d34494509239d
 DIST bind-9.9.1-P3.tar.gz 7217415 SHA256 1cdb83db76d6f8554dea19e3bd82b8d65261a24b9ce9fc948eade8c57569e302 SHA512 822b41cf402b8393492aea0c7de262023fd4e48761c5eb730755dcd849881cf98be42e9286502c9308331eb7c546c90b825f4550c821e9ea2e77ef14e025ce70 WHIRLPOOL 5e2c8df6d021078731e36e0bcd66e6755b45f1d77fe08b2f95a567188e39851db29244660f857cbf42d4ab925b05151f5a5c6367f0ff63e36b3f1c44661983ef
+DIST bind-9.9.1-P4-geoip-1.3.patch 54332 SHA256 32e539377037cb4295b97acf7a24ae9814a4e25989ee3a539e06cc3a0f37d526 SHA512 b7117568710a322f46e7393f3f78cacec2cd29a9bb86ad352c74e301b6bd394b52b57725eae503d500ebd4b3f702dbf866f6aec5024e97b053e097a9a3c98e8f WHIRLPOOL a41d549bffc23945ed723d8338f9db0107dd23fb9379cfdbd10da18e48f7a8b89ed22664cbad86517910bd413e005ff0649eeaaf3b983dd190b29f6907149048
+DIST bind-9.9.1-P4.tar.gz 7227655 SHA256 18f90727fd9566da037e71569d9b3a4834c96b04d9e75f9899eba0bc88c0868a SHA512 b40236c48ea05f52c637165c1a4cc528698542253d1268c571be0362d25457590c04202e70646d463d7ef7a2eea7ba7bb0a0d4e12bd1b36400dedbebeb776379 WHIRLPOOL 577f76fc6cc4ba02930e8c82dee94aed218acbd1f2a39fbd6d19901fba2409eed2bb62270317d53d3c701f4615de3febf7d85daa8ca84bbec6111de91abd1647
+DIST bind-9.9.2-geoip-1.3.patch 54328 SHA256 0d87a1b547b42c775ffb591bc8104f92c18e99ebe2ab3a97e8c5bc5731be6fba SHA512 7673b3001bc7d64e80ee548c63ab083141affdd76edf6704da6980c26de341be7341d7566dd9bc8d3b02a0a08934ccd513bd61d2a426f61b3b47959ec14d21ae WHIRLPOOL f561baae427ff4141022b94ca557e2c3fba58434531f45c28b153ada537cadec2388694689b30c1a5b5db9c10e9cbaaad6c7a42797effc7c429c4403c6516404
+DIST bind-9.9.2.tar.gz 7285050 SHA256 7e6530b198d512e27a856bbd7426b1a3c47fd55d06d667adb66f760259009b48 SHA512 a64eec10ba69d1bc97524bdf003a3fc3721b0879e128b58fe1e8e181165cd613e7f9492f9a1dfab7a4e689adf743db70e85ec2bce4220ce8203e5fdb478e92f4 WHIRLPOOL cffc59ab3a0cc1113183e85d9b543f4b1d183b181d9b5ab5caea6698645adf919fc84a3b8820cd6d54ef3cb98a008f950e7599f685adbf516da17deb043d9ad8
 DIST bind-geoip-1.3-readme.txt 10040 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845 SHA512 463b9c5178cd00b8c3626fafc32e2c4db5005b9442c364525a22a3bd20b6f3ff99fab32e9103355d08546b349398499e221109a96d8d073d1fbe9a1f3d385ae9 WHIRLPOOL a00f0e5564f37b434f84d152e797c249640913e13ab7f109e2ff0abc45c519a28ad24e4f6173fa587c4774653f4c9381f9b8ab33c5697f47b30fa139eed48569
 DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 SHA256 fe043a573ba187dcc8b0f7313d4408236e6916ec246b0443b7e71b33c8303ae9 SHA512 62690ef3471055e4ae3d8dcedd296c0a5c3a75a3be237c76fdea07aa879f2bb1df4c56b8ca1e3ed9b488a980d16f9c9a3a12a53ef3208607472d18c225916ac5 WHIRLPOOL da3683f815509c5adf0ef819cf1165b64ba35efc6c588fd46b1c6b3d0374766442acb02ecf19dd90bbad5afb174dd27fd3e0894166ea8e78901e95ae870f9f5e
 DIST dyndns-samples.tbz2 22866 SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac WHIRLPOOL 08d4e6a817f1d02597631e18152dbd55ea1bc4c82174be150cc77efc9e1f0f03b6471d1cefbe4229cd3161de752ef232a43ca274a07b78e9c974ceb04cfe99a2
 DIST rl-9.9.1-P2.patch 80440 SHA256 99efd951582ce790e274082e0bedaea698b9b7f49cf1de387752583993cf2115 SHA512 7a6a7b588de68f2dc2ed4f19b55adc1d5083a80c672889c823016c92195b4b6f215cdb6328af5127c62ff616451f5991c11dcef5e54d9ca7d58e391c4db8823b WHIRLPOOL 896744688dac120bf93c0a340f04fed1fa6a67ec91fa10580bf3fab803805f87f1f279c87a52b7381f239941c40e9bfed84a771831a7ba42ae338796b4faa95b
-EBUILD bind-9.9.1_p2.ebuild 12265 SHA256 87f6ba29b891e70f280c05d9190d4901e387aa95526ad00d8f104cdce470e4af SHA512 03164ba5107b82c398a989c8181cf98ead8124be61c71d00660530b884d66e4436f2fd1296429b102df9e177eeb56ea46e114730b848a62e2b9e9c5482fa537a WHIRLPOOL 69ca140f7df9bb1671deb18ae9c3216f1736c33579497473b0a1374578185d3b77cc96ae91b2d2344865f89022ed19131c0a67ef2203d125b44e5cabc2dc7f8e
 EBUILD bind-9.9.1_p3.ebuild 12782 SHA256 7a2e8df185dcd05e7328624ccf0cba02cea22314d7aa1e6cd951a51100550c29 SHA512 d021cfa62355af619b637de1fc2aa8560e8c3dc264c88263d1be95f22ea32e4010683bb86377bdc9799f832cea66b30cc7ce04d05a7f61879170a73493a10f4a WHIRLPOOL 93106c26863b9ac1ef6b758eca0419ec007fef8d71cfb44f4ae79fb48873301ac013ee224ddfd8d65e1b486705c6783df30a3a3b377408c91069afeb5c891549
-MISC ChangeLog 68862 SHA256 5a957d872ea0e9942e3472d4b9b6fdb4481df48f4c18f8ee090554cec92e9042 SHA512 50ca6af86523af97590de70818ad6f817dc98215c454c00b499b0363102ec08bc83c8d0616a968db9c3ac83cad8517d4a13031b000bacc2e80e81c3add2f9eb1 WHIRLPOOL 640579be5a145aecf3963021bb018b7340b7ea0c72aa44e64f6db731d16204cdaca6342e704c946ee4275788e736267bcebdebd806651a4f715d97471aa1055f
+EBUILD bind-9.9.1_p4.ebuild 12796 SHA256 9dbcabece49bb8a883c60ccf6d000e40ab52cddfa8a862397743e5cca478784f SHA512 98493712fefd36cb0873fd4952794c58339489e1a080ad19ab9c4592d155c9e1c0d05eecf50076ec2cd4d9e2b8e19b9a367855e65c1f4ca2e1bfa2249789a7aa WHIRLPOOL 642e8092e1e697611786e7d5d35e81e53e56a972b95c5ef8e0716a4d4e1ac6ab191c136edc32b4439d6a82c8c78f7fbf3192db4b6571b4229ed5c949ea3ad40a
+EBUILD bind-9.9.2.ebuild 13281 SHA256 324a66040eafee6b811b24d458334c11bfb49519ce1a3dc854c59241427a74f6 SHA512 4cef3161c5a3aee8547a6aea2ca4ea5ac1f6df8b7070ec2106b9debbff51c3d973fffbd57d94ea813cf5edba8f59627f9eeb1e26bfe3848c048cabf7498f2d76 WHIRLPOOL da6372969ab34590984692dccfb86c5b04cc159c3ed6a36b81ef71e4ef23fa0cbebccd00ccb6f886b613a6c90ad7f4230d8ec100ef5bf48250ea81eac69e2f81
+MISC ChangeLog 69111 SHA256 5ad0919407b63201f9862feaaa3c93be5d91e34b3d2e7334e50841a456566052 SHA512 6705d7a84f4dc0637498766f0797621e6780fa28e4c12e35de6789a2744c2e4c9ee94265d62bbf0db2fdd1e09f95f725a12e8bfae8e99c6b06c683872c6c39c8 WHIRLPOOL baa71f83cf2b8b6794c191dcfdc15bf2e65e48ffbe8847f9282b9bce19df42da2988eadfeb784f0f7252e1eee23f53e9ca9f32e36db6a92a266d86c2e1676b89
 MISC metadata.xml 860 SHA256 0fce4fc0233c67076d886f2103083172217f79d36af3d651c3435cad719762ae SHA512 df24c1a19401a50681d32370dfed6b5735b591b9db828b290c39cf1701ce5697f7cad83b4f5410eb063482fecbb1694cc6508ded74d3dcd7bf2cc7f3c6d0db94 WHIRLPOOL 4b04fd631b0c3dc03f06599f81d113bcc7f36d9d54d54fb49c49a741c539248d37ec5c2df24f6f994ddf0bcb55c9b12fa80fe4bec16855a48a53bdf07d813039
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBV4M8ACgkQVWmRsqeSphNwbACffulldi1gyZffpdZBWZxo87xl
-b9MAn2eDNTwEZBwX09ZPf76Up1HLCMXl
-=mbB0
+iQEcBAEBCAAGBQJQddZeAAoJEMOx0zmdw4Z1poEIAJn2mVJso8EQ0XMvHfc4r07F
+9j14URjujuNn0nSoU51+WMHyfkAdUwd9XXsE67o6Gfy3oHM0ngnup6SpwWYGID3H
+0lDmHduxI5Bh2zyuy7sXs2WumZhstmZJMMXEV1rM/HeCvzB7GLPDGbqGgBSbXHM/
+4Fx6JbmGxnFCwoqYwtnKduKn5AVvwO6WVHdS6WM209KxFXuoZV3W6iZrxHyZJpnJ
+Jb+giLVSoVP//LM+TptDcikQF/UykyMAc7rBBY4DUWjJzACRku814HZzpTGSEeac
+KDFVN1fGjTuOFZUzgAQAJV4edWxjRp7mXn9OBrmelBBe+Dwr4kfv/N9URgZE8Xg=
+=NxBD
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.9.1_p2.ebuild b/net-dns/bind/bind-9.9.1_p4.ebuild
index 89386bb95fd6..19c3999ecb25 100644
--- a/net-dns/bind/bind-9.9.1_p2.ebuild
+++ b/net-dns/bind/bind-9.9.1_p4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.1_p2.ebuild,v 1.8 2012/08/19 14:10:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.1_p4.ebuild,v 1.1 2012/10/10 20:11:06 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -24,25 +24,32 @@ 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.9.1-P1"
+GEOIP_PV_AGAINST="9.9.1-P4"
 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/"
 
+RRL_PV="9.9.1-P2"
+
+# GeoIP: http://bind-geoip.googlecode.com/
+# DNS RRL: http://www.redbarn.org/dns/ratelimits/
+# SDB-LDAP: http://bind9-ldap.bayour.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? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 )"
+	sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 )
+	rrl? ( http://ss.vix.com/~vixie/rl-${RRL_PV}.patch )"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc postgres rpz sdb-ldap
-selinux ssl static-libs threads urandom xml"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc
+postgres rpz rrl sdb-ldap selinux ssl static-libs threads urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
 REQUIRED_USE="postgres? ( dlz )
@@ -120,10 +127,18 @@ src_prepare() {
 #		sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \
 #			-e 's:RELEASEVER=:RELEASEVER=1:' \
 #			${GEOIP_PATCH_A} || die
-		sed -i -e 's:RELEASEVER=1:RELEASEVER=2:' ${GEOIP_PATCH_A} || die
+#		sed -i -e 's:RELEASEVER=2:RELEASEVER=3:' ${GEOIP_PATCH_A} || die
 		epatch ${GEOIP_PATCH_A}
 	fi
 
+	if use rrl; then
+		# Response Rate Limiting (DNS RRL) - bug 434650
+		epatch "${DISTDIR}/rl-${RRL_PV}.patch"
+	fi
+
+	# bug 425170
+	epatch "${FILESDIR}"/bind-libxml2-2.8.x.patch
+
 	# Disable tests for now, bug 406399
 	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
 
@@ -163,7 +178,7 @@ src_configure() {
 		$(use_with berkdb dlz-bdb) \
 		$(use_with ldap dlz-ldap) \
 		$(use_with odbc dlz-odbc) \
-		$(use_with ssl openssl) \
+		$(use_with ssl openssl "${EPREFIX}"/usr) \
 		$(use_with idn) \
 		$(use_enable ipv6) \
 		$(use_with xml libxml2) \
@@ -223,7 +238,7 @@ src_install() {
 	newins "${FILESDIR}"/127.zone-r1 127.zone
 	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
 
-	newinitd "${FILESDIR}"/named.init-r11 named
+	newinitd "${FILESDIR}"/named.init-r12 named
 	newconfd "${FILESDIR}"/named.confd-r6 named
 
 	if use gost; then
diff --git a/net-dns/bind/bind-9.9.2.ebuild b/net-dns/bind/bind-9.9.2.ebuild
new file mode 100644
index 000000000000..bcdc1d26ecc9
--- /dev/null
+++ b/net-dns/bind/bind-9.9.2.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2.ebuild,v 1.1 2012/10/10 20:11:06 idl0r Exp $
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2:2.7 3"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit python eutils autotools toolchain-funcs flag-o-matic multilib db-use user
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+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.9.2"
+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/"
+
+RRL_PV="9.9.1-P2"
+
+# GeoIP: http://bind-geoip.googlecode.com/
+# DNS RRL: http://www.redbarn.org/dns/ratelimits/
+# SDB-LDAP: http://bind9-ldap.bayour.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? (
+		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
+	)"
+#	rrl? ( http://ss.vix.com/~vixie/rl-${RRL_PV}.patch )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc
+postgres python rpz sdb-ldap selinux ssl static-libs threads urandom xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+# The rrl Patch does not apply against 9.9.2 yet
+
+REQUIRED_USE="postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz !threads )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	sdb-ldap? ( dlz )
+	gost? ( ssl )
+	threads? ( caps )"
+
+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 )
+	caps? ( >=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 )
+	gost? ( >=dev-libs/openssl-1.0.0[-bindist] )"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
+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}/${PN}-9.7.3-odbc-dlz-detect.patch"
+		fi
+
+		# sdb-ldap patch as per  bug #160567
+		# Upstream URL: http://bind9-ldap.bayour.com/
+		# New patch take from bug 302735
+		if use sdb-ldap; then
+			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
+			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
+			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
+		fi
+	fi
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die
+
+	if use geoip; then
+		cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
+#		sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \
+#			-e 's:RELEASEVER=:RELEASEVER=1:' \
+#			${GEOIP_PATCH_A} || die
+#		sed -i -e 's:RELEASEVER=2:RELEASEVER=3:' ${GEOIP_PATCH_A} || die
+		epatch ${GEOIP_PATCH_A}
+	fi
+
+#	if use rrl; then
+#		# Response Rate Limiting (DNS RRL) - bug 434650
+#		epatch "${DISTDIR}/rl-${RRL_PV}.patch"
+#	fi
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm {aclocal,libtool}.m4
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	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
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		$(use_enable threads) \
+		$(use_with dlz dlopen) \
+		$(use_with dlz dlz-filesystem) \
+		$(use_with dlz dlz-stub) \
+		$(use_with postgres dlz-postgres) \
+		$(use_with mysql dlz-mysql) \
+		$(use_with berkdb dlz-bdb) \
+		$(use_with ldap dlz-ldap) \
+		$(use_with odbc dlz-odbc) \
+		$(use_with ssl openssl "${EPREFIX}"/usr) \
+		$(use_with idn) \
+		$(use_enable ipv6) \
+		$(use_with xml libxml2) \
+		$(use_with gssapi) \
+		$(use_enable rpz rpz-nsip) \
+		$(use_enable rpz rpz-nsdname) \
+		$(use_enable caps linux-caps) \
+		$(use_with gost) \
+		$(use_enable filter-aaaa) \
+		$(use_with python) \
+		--without-readline \
+		${myconf}
+
+	# $(use_enable static-libs static) \
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc CHANGES FAQ README
+
+	if use idn; then
+		dodoc contrib/idn/README.idnkit
+	fi
+
+	if use doc; then
+		dodoc doc/arm/Bv9ARM.pdf
+
+		docinto misc
+		dodoc doc/misc/*
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dohtml -r doc/arm/*
+
+		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 xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+	fi
+
+	use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A}
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r5 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	doins "${FILESDIR}"/named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/127.zone-r1 127.zone
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r12 named
+	newconfd "${FILESDIR}"/named.confd-r6 named
+
+	if use gost; then
+		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
+	else
+		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
+	fi
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# 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}
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	if use python; then
+		rm -f "${D}/usr/sbin/dnssec-checkds"
+
+		install_python_tools() {
+			python_convert_shebangs $PYTHON_ABI bin/python/dnssec-checkds
+			exeinto /usr/sbin
+			newexe bin/python/dnssec-checkds dnssec-checkds-${PYTHON_ABI}
+		}
+		python_execute_function install_python_tools
+
+		python_generate_wrapper_scripts "${D}usr/sbin/dnssec-checkds"
+	fi
+
+	dosym /var/bind/named.cache /var/bind/root.cache
+	dosym /var/bind/pri /etc/bind/pri
+	dosym /var/bind/sec /etc/bind/sec
+	dosym /var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn}
+
+	dodir /var/{run,log}/named
+
+	fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}
+	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,dyn}
+}
+
+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,dyn}"
+	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,dyn}"
+	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}
+	# As of bind 9.8.0
+	if has_version net-dns/bind[gost]; then
+		if [ "$(get_libdir)" = "lib64" ]; then
+			mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
+			ln -s lib64 ${CHROOT}/usr/lib
+		else
+			mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
+		fi
+	fi
+	chown root:named ${CHROOT} ${CHROOT}/var/{bind,{run,log}/named} ${CHROOT}/etc/bind
+
+	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/files/named.init-r11 b/net-dns/bind/files/named.init-r11
deleted file mode 100644
index 8432ff00e107..000000000000
--- a/net-dns/bind/files/named.init-r11
+++ /dev/null
@@ -1,250 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r11,v 1.3 2011/09/14 15:48:50 idl0r Exp $
-
-extra_commands="checkconfig checkzones"
-extra_started_commands="reload"
-
-depend() {
-	need net
-	use logger
-	provide dns
-}
-
-NAMED_CONF=${CHROOT}/etc/bind/named.conf
-
-OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}
-MOUNT_CHECK_TIMEOUT=${MOUNT_CHECK_TIMEOUT:-60}
-
-_mount() {
-	local from
-	local to
-	local opts
-	local ret=0
-
-	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}
-		ret=$?
-
-		eend $ret
-		return $ret
-	fi
-
-	return 0
-}
-
-_umount() {
-	local dir=$1
-	local ret=0
-
-	if [ -n "$(awk "\$2 == \"${dir}\" { print \$2 }" /proc/mounts)" ]; then
-		ebegin "umounting ${dir}"
-		umount ${dir}
-		ret=$?
-
-		eend $ret
-		return $ret
-	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
-		[ ! -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
-		if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then
-			if [ -d "/usr/lib64" ]; then
-				[ ! -d "${CHROOT}/usr/lib64/engines" ] && return 1
-			elif [ -d "/usr/lib" ]; then
-				[ ! -d "${CHROOT}/usr/lib/engines" ] && return 1
-			fi
-		fi
-	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
-		if [ ${CHROOT_NOCHECK:-0} -eq 0 ]; then
-			check_chroot || {
-				eend 1
-				eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
-				return 1
-			}
-		fi
-
-		if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then
-			if [ ! -e /usr/lib/engines/libgost.so ]; then
-				eend 1
-				eerror "Couldn't find /usr/lib/engines/libgost.so but bind has been built with openssl and libgost support"
-				return 1
-			fi
-			cp -Lp /usr/lib/engines/libgost.so "${CHROOT}/usr/lib/engines/libgost.so" || {
-				eend 1
-				eerror "Couldn't copy /usr/lib/engines/libgost.so into '${CHROOT}/usr/lib/engines/'"
-				return 1
-			}
-		fi
-		cp -Lp /etc/localtime "${CHROOT}/etc/localtime"
-
-		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
-		if [ -n "${CHROOT}" -a ${CHROOT_NOCHECK:-0} -eq 0 ]; then
-			check_chroot || {
-				eend 1
-				eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
-				return 1
-			}
-		fi
-
-		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 (max. ${MOUNT_CHECK_TIMEOUT} seconds)"
-			elif [ "${reported}" -eq "${MOUNT_CHECK_TIMEOUT}" ]; then
-				eerror "Waiting until all named processes are stopped failed!"
-				eend 1
-				break
-			fi
-			sleep 1
-			reported=$((reported+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
-		start-stop-daemon --pidfile $PIDFILE --signal HUP
-		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
-}