Version bumps, fixes CVE-2013-2266, bug 463497

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

4 files changed, 457 insertions, 24 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 8ce1256efa9b..3e69e357a13c 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.456 2013/04/14 11:46:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.457 2013/06/30 13:31:19 idl0r Exp $
+
+*bind-9.9.3_p1 (30 Jun 2013)
+*bind-9.8.5_p1 (30 Jun 2013)
+
+  30 Jun 2013; Christian Ruppert <idl0r@gentoo.org> -bind-9.8.4_p2.ebuild,
+  +bind-9.8.5_p1.ebuild, +bind-9.9.3_p1.ebuild:
+  Version bumps, fixes CVE-2013-2266, bug 463497
 
   14 Apr 2013; Agostino Sarubbo <ago@gentoo.org> bind-9.9.2_p2.ebuild:
   Stable for sh, wrt bug #463497
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 6e1970ac094b..f179544ebde3 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 10bind.env 27 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650 SHA512 8ae5326b158b8a3eeaab667c84dd712fefd25d10832598783fa497285183cbdee554796c22d32fec54cd00461469f29ed473a730304a00aacdf06c1bb6c33d55 WHIRLPOOL 8fe00482e9ba95698cd814893784bd502ac0edb318450edac60bff4d2b4810068cd5e1f58cfce1ca5e05d5967d36728bf67cd927ce7d991832d1a07593d27c37
 AUX 127.zone-r1 533 SHA256 0fa4c294640d4191710647d1b18a2099f22ff674b3a35e6e81ff929f921da626 SHA512 c165e903cee1553483e53d917224ce4b1410248ad04602be80af27e87216fea113b6358057369ca167037344ebeda39b71702e84469bb239131656dcadcdf30e WHIRLPOOL e067518f0aa32277911b836c90c6bdb8be2397846d1a94008d8ca1a5931df40e21d74da5e754dcb49113a4c5330764c2cb2f71fb8b1204c0e226b20330a01a67
@@ -13,35 +13,32 @@ AUX named.conf-r6 4120 SHA256 6fb9670beeb34a7a2512a608d0ac8d49d7bdba5fd8c67bc0da
 AUX named.confd-r6 1368 SHA256 704ac6954b2bad5d0bab19281dc703e86d9b4fe94d63dd00be1e525a3e64c492 SHA512 074c37ecfa6d59de4ac70782b4722ffbeb3d66fae7cfa66810a67a06a1915d4e73f03b1f497d6005f125749aff61d11adf2927dcdb5a3d4fc4fb407fafa02dd1 WHIRLPOOL 3347b6887f1c516d3a4b2d40eb42195669b7a2ec01d02df21c7c0d4c27fe8984e1a2985d32f7631c1cd31b16c0f5031e69abfe5fd3d9c9debd156fd04d5c6910
 AUX named.init-r12 6095 SHA256 953e066b5d77f59917db59365cd2103c5bec19889775bd3f6437b946c9d6d936 SHA512 7a576816fb3306c2a66227f78f23301b55b5376f587e6a521b33c2c90dc1499290751c83d5e0e5bc4961a1413480d993c909bf3c448a05762bf7928b43bf9559 WHIRLPOOL e0973117385b6d5d3bdc83c1777a90849da682e89ce716bf69de92528959edf93edbff264b25aa13ad7f73803f3eb403e89badad996c2c01245c5a0f97247b7f
 DIST bind-9.8.3-P1-geoip-1.3.patch 54137 SHA256 9d5716d661fc3d76b3f201a0bcf563f4c1cd1fedf42c8434e4cce31f666866ff SHA512 33ed5855c1e20681667a7def229a6f6a721d309fb7e4a817825c80e652ce24036c220597c5a0252f6f4a11acaf652319868ae79d8eb3236ca52fb5311298a95a WHIRLPOOL b8e97e15c212710ed6efef508a883cc6adda530c1201263371b8208f85c813389ec9fd6c636d7fcc70ca848cfafea8c4f1edc9195b083995732ad4feef2e7dfe
-DIST bind-9.8.4-P2.tar.gz 7129690 SHA256 e772edfb41036a25e1392ab15ff4d3754f03c301b4b059d64afd8d8dadd18193 SHA512 a0c24d3f5a5291aaf1b0f39fe094c913e2d105cf99d2e9540c28392e860350129e477e91a95ec769fc73f478460c6c23da420b7c5b4323e4d2cf4af0038af93d WHIRLPOOL d1370c2faf3738257eb80ec379a73bd99a0eab76dc6a641f80cb0d79c613f136c3da16378b13ff17048eb56eba6d3ccd4bcd7730d759416e99e8003be7d3237e
+DIST bind-9.8.5-P1.tar.gz 7263322 SHA256 f1aa010cef49c453e24f0cadedd1866dc7e3c9fd385f39ee3e68f3a4ba226cc6 SHA512 d2c47a0dcfc438b6a84f015b7e16fc1d132da27cdece82707d7d900fbb17bf7ea453f3747d6bafd5a6c6f02a985fdad07f76d27077c36637bee0eefb697ae080 WHIRLPOOL 62e1952bb3bbb2754b902c9553f54de3183c1a1499c2aee7a140618bfc48bdf3e80bb23c625aff4db96985f0bcbf4f447b6f783ed051c1bb8eba940deabd0eae
 DIST bind-9.9.2-P1.tar.gz 7277498 SHA256 4bce7c020402623333b655be5167ae8c52f30a6bfe9750caa3ab70da7d90219c SHA512 38bc2d878c7c75056d75c86d44a17815863064d3d69eb2eccaf9c3e1a4686045dc825352052ec1937d670bcb9a9b6ce6ddb6f87af56a2f1350dced55fa53ec15 WHIRLPOOL 4dc9ca276a5d955cef3c51129e44b3a8e092bbfcefc66c0088f4a1ee3987ec6ef8400f6a74e67a469a4f73bb788f4b25f3e54f8e6354969395731ed3ca597361
 DIST bind-9.9.2-P2.tar.gz 7277958 SHA256 ff822734e3550969251411e20f6f7397d14a912613a42af423752e93fdb565d2 SHA512 d790e378444410d8e42ab6ca028f9a30b3c5c5f0f41b2ccef1a706a84d3d0115d505268a41c0ee4cfd33dcc6249d7a61bcd60346165076fed1331dd02e5520e8 WHIRLPOOL 170faff81d861d67d4526622658ec5e675ded6818d1ffb5bf66e65add35450660254be8ded96c7119b3b5c1a3ac97bff179655ee2c6cd74164220cfde56ba31a
 DIST bind-9.9.2-geoip-1.3.patch 54328 SHA256 0d87a1b547b42c775ffb591bc8104f92c18e99ebe2ab3a97e8c5bc5731be6fba SHA512 7673b3001bc7d64e80ee548c63ab083141affdd76edf6704da6980c26de341be7341d7566dd9bc8d3b02a0a08934ccd513bd61d2a426f61b3b47959ec14d21ae WHIRLPOOL f561baae427ff4141022b94ca557e2c3fba58434531f45c28b153ada537cadec2388694689b30c1a5b5db9c10e9cbaaad6c7a42797effc7c429c4403c6516404
+DIST bind-9.9.3-P1.tar.gz 7459819 SHA256 1baa22e47c3b307c5fcc7aaf6700dd5953b5b9b7737d1e36117545af7bdbb435 SHA512 946cfeb80a05898fb3143fde653655e1ba0c98d28ad7544356fbe1ca33ca4d01dc3ba1fb31a44ae7def02687940c42a10696ad7110a7ab9d86ec3df503eb2ff5 WHIRLPOOL a99ee2ca82fbb57039e12fc1675280d15ade3496465f8acce2fc2bff2928324e56f231ac5f03f3ee0f0b4f3be2e76349b5141c2a104e6b2c5e7f1f3598f066dd
 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.8.4-P2.patch 100510 SHA256 413743e5bab8310d33412c2b596d43d48a3df57dac693dc23f478646828ed141 SHA512 2b9f70065f2dffde3294aea523c960537a15af584063a6413b1eb73dda90ecff343e351173218a0fbbf8705823b941321b9b02e03e4122091bef2230e8daeab2 WHIRLPOOL 96562e615317b12fbe969afb4102277f74a1b546f805e1d3e94d9181f8fc30650974de9bd85d133d9c3577cba7ced3f910868c4a937549a7c78cac55b953a156
+DIST rl-9.8.5-P1.patch 103398 SHA256 5bbae9739f5e1ef4fa0477290422854059780bbff53fd8a69996fce07593bdca SHA512 723384e4327fed860f3021d82f3f791baae164f09e166fe873a867c68e6b57cf539995df92942c6418161c0cfd7e1f82f701db3412299eb50f1c483448e00595 WHIRLPOOL e454243c16fe4272288ea433c3bdd6aafe062caf5def914ca9f4c57ef8231282e4fca24938888321c644e69be4b7dc0b088ca3c2e780d4949a4e57f10168cab6
 DIST rl-9.9.2-P2.patch 100619 SHA256 a4c814eb842a84afd3f138187786efd9f593bc2902b21fe3298f4fe6eed9ce40 SHA512 f68d6d32e685c1535d9eaa4bbec4fae05133d5eb8fc6d4274048bf96704b8ce90bcdffd9a3b7f0df681ac7dd3b83459f95a682eb2ec540b41f037726195b5107 WHIRLPOOL 4a9f93f951f20a6b5a7cbcd1c6e4cb4955553ad7b87096d5674469abdc7e0bb0178d75debf2fe24bd6b6d958052e75d531c298791df9efbc7a44735fa07b493a
 DIST rl-9.9.2.patch 91993 SHA256 0bf1935ce77cfbc7cf6fa9bdb3798545c612d6fa30f6bb097ad23258ea83ac2d SHA512 9e1ace18b4dc41bf2f2e292eb0b56ee1d12a256ac2714bd8aebe9f8b249254aea450571009e2c95f96d6fa478f0508e89fc1273000ce1e09e58298578b53cd0c WHIRLPOOL 8cdd514f98241a055ed8bdcf8bc808a95c022e0c54af3c953e3d7372b1410f3b62bc39ee81a6a72ba568ba7b7ee41d7082465f29bbbbe063982cd0cff3428523
-EBUILD bind-9.8.4_p2.ebuild 12901 SHA256 3c64dfe4b1ecf6fe12cad927a04cd7fdda80eec76047ce2e914f30a624a0634e SHA512 6d03576f32595d4013becba90b7f200953c1a5a26c67cbeb7da3605892077ddd48b7b1067dbcf319af15405aedf4ac5d77c527015ebc730a610e275aa548fca0 WHIRLPOOL 7b7e488db204cbbb06a8e59550dcac04b2c6df031d40b4173f100ad691d766b58a017330d68e306ec2a3fb469792fee81842ded6b6ca405f07d952785274c63e
+DIST rl-9.9.3-P1.patch 103910 SHA256 acbcc5651565e916ff30d652241e687b051ae6eb79aa55298d9183586123a2f8 SHA512 8d10b1ad60fd2a68af5161de1c7a71cde674b57d43ba178e2048b308f99a32a15a35000c0aea2d7f05811b885d2757199904d8e20f98c6d18f63f5aa144dfe0e WHIRLPOOL 0d1b5a025100899464240b3165b7259aa2ddef777f823d1f61a33cba5d77719d4e22ba7de91f511beb0bcc991b3c30f8264b34a34c3e57ba6e5ba2907b8d513c
+EBUILD bind-9.8.5_p1.ebuild 12941 SHA256 dd68f88e351044bfc926af64c4ca1a4d9b5951fcc2d155e1f31fa85a0e3f9b1a SHA512 83c3b7b1befe3970dd135d91c609c9d2a8b24c449d6d71b81641cff7e1e25c2e6ec721fc700b8dc7f7f20730304499f7aa0bd04177e8e6433ba53180c4c2dc0e WHIRLPOOL cc0cafe2f2a45cf6efe97ebd22fbee78da88af8310d26748da7c4384773b2874580fe1c7ba112835db8093225a563fd5733d0f9bf49ced1cedae60a2871254f9
 EBUILD bind-9.9.2_p1.ebuild 13470 SHA256 81c91d2c673381308dca9a9ecb16b2338a281f99fc8c02f9b1336e102d845db2 SHA512 23d127a544aecb92ccbae9dc8d717ee22e2c78d7f1cebb4d5af1051a9327c5977b7eb73482f42473113ca1d9e36818af41455c9f36bb97cc0361223ba1813a07 WHIRLPOOL 7613bc31ddd98f30d5c619c7c11b80e9850b4764cf44b7bffa855b1ec4297a3f0269471bad13975ded31c9bcc60799790b6ef66e550d283f0d46523f9423c63e
 EBUILD bind-9.9.2_p2.ebuild 13571 SHA256 5031cf77ecd7b2de513276007fb4cbd4224cd73fb05e7e59e8faaa4261f15c2d SHA512 18e072bc7af82903ceda969743b28914df8c7679250218f9130fb616fde2c492b183df50beacd8298de22696b5e62b08b21370a8528e7a470b863ad8f153d860 WHIRLPOOL 373b270be193b239ff0149108e945ec989515010d8430eb69be5257cde10121ac818df0574dee5ab2d8ca51df58d57327bf35fda9ad7d692b8f68474ad98f80a
-MISC ChangeLog 73963 SHA256 51decbb36121505e93e9fefe9c83e51d91138aba80f5dd79579d7684b7e12bee SHA512 e5b3e282df6f2db80bfcce1893d2d62bed1d27a6745aa097f929b9bb6cbfee4b318ed520caa82ed4b0711ded95b2547ba9555e93da61a23a7cb734827c7ed649 WHIRLPOOL 0124ee5fe47021884c178d15560aabcd672ca35eb99ab5ebc827052d9bf93d29d4dd8a32c20def291f61d2dac22667b9c119e44054c76d488eb00fb45a7d5894
+EBUILD bind-9.9.3_p1.ebuild 13557 SHA256 c4899d38fcfa080fc6a644a8c4ccada1f8263f4a7b837b951affa25b8f885001 SHA512 8096e329c559f6329612a6e37c3567bbd3afe507018276d3f29ffa2813e954363add010806c3f4b5052d88de936ab0346f3ff57d05be05d8f45a6b700cf468e1 WHIRLPOOL 1a49bd13b42092c291025ad3f789bdfc23de5351dd6fd18a713b1d434834ee6546111846a7312afe9126609010d9e0207ef8fd62eb765361f0d26059d5381460
+MISC ChangeLog 74197 SHA256 162b76a9bb3d83b993a7c2ed7f46aeab176caf1878e6de618ebb3a8beedd7b9c SHA512 71f9689e2b26a50a24b670081958d01ae3f78505aaa97a1b9e00ddbe3ad92f2ba03b635673b04ccc861cea4fc934009495c719576e39cedc62e8e42f4a61f1ec WHIRLPOOL 6f4d1ef44ffad345d51f5bad07ed2d4d51cdc99c3e59d79ad8bcdff9f995216f9e30069372e07d6f34fc1958375fbee195ff9f98e17b3f6a50318aea548f254f
 MISC metadata.xml 860 SHA256 0fce4fc0233c67076d886f2103083172217f79d36af3d651c3435cad719762ae SHA512 df24c1a19401a50681d32370dfed6b5735b591b9db828b290c39cf1701ce5697f7cad83b4f5410eb063482fecbb1694cc6508ded74d3dcd7bf2cc7f3c6d0db94 WHIRLPOOL 4b04fd631b0c3dc03f06599f81d113bcc7f36d9d54d54fb49c49a741c539248d37ec5c2df24f6f994ddf0bcb55c9b12fa80fe4bec16855a48a53bdf07d813039
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRapaKAAoJELp701BxlEWfEDkP/ig1Dp848Otip1GoRL9Hqfzq
-GGgh3siYZfLvVBoYd/CYaDsZQwuoLzNl+qK8jV8SbPEERfthSA+y/umNDlSjk52Y
-I0fH0VI13bMcQ/ZEPjgm8AOW5CkXagqforKLNSSNaH/LBmSV4w+Th2vrdMKvSVEX
-1gAvinKaUrgCSV8y8tWoAMAE1jIMxPIpCnjZqxqatV25V5IUTNECs4DkbxOldzK5
-SLBC7NyL4TqwMolUCFs7OiivhOm/qnq/XYLy/ypYBCcqdbncq9QF8mnGX8UmvDXV
-zyt0c948Oomx6yFnAPE2BE/vWBzoqBf9MoPX13kxhk151/2lGXUeSssg6ks46y6n
-f0rt5WLP8+IqM6Rn/eNlPejVjy2wWxOetaTv1VVuJKHUNmxhvwFQlW1dhK33jCNW
-21k36VkistayNXJ7+5lRp+NqY3j6U5Xo62sow9SIWGIyv2obFngRHRPNHCAcVi30
-yDF9YH4o9WBViOvQkSzml/ubpoPuUgrqhRcWsdaGQBBr2rVYXI7g2amUwKZqGcew
-mVHQ8fkYzg3A6mlvWnTxPoQu3eT9LKh4wpXUA0WkNMIStFVNMsO419BRsaDKStpK
-4M/3wWS0uCmfAC0Cempbf2gkYDh26J3Se63TYBbUEtCaRtDqKl1lPobTpB8uQcFx
-Ny0PnrFuobmZvvLl4RQt
-=Md0W
+iQEcBAEBCAAGBQJR0DMsAAoJEMOx0zmdw4Z1QawH/1XbJ7DBMX80pUqyX6h3g/G0
+SGG0dzURfOdfoUU9UpUdSBQHxAfPQNBr00EW7TQXDqbw1/x4F2XoznOjc5Jdt5Gh
+9UNkIu/J7VOxINenI27Wy2j00Y/owxpXJfx7vtWVUVGWFCEfNqR/AQ7YZDJOxsGq
+6oTHRHLmIzkj7OgxsmlCbROoB/6/NGs0cg2LJU4EN4minar/zlfJhLsfZ6L5YDDu
+dXGQeIFD2Hwo4/hKP//Bgs+CqatPYgUjIf49JQb0NzJ8yq6DyB/r/4wc+I+g+E5v
+K12ShlcUcKoOvanQ/45g+MlC1ApW/+fvhvBiynwNQkJv/ogejFpbgQ/x3lUN1sA=
+=9+nc
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.8.4_p2.ebuild b/net-dns/bind/bind-9.8.5_p1.ebuild
index d39b74f7cc50..1139ce5b6ba2 100644
--- a/net-dns/bind/bind-9.8.4_p2.ebuild
+++ b/net-dns/bind/bind-9.8.5_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.4_p2.ebuild,v 1.2 2013/04/08 05:41:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.5_p1.ebuild,v 1.1 2013/06/30 13:31:19 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -129,8 +129,8 @@ 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=1:RELEASEVER=2:' \
+#			${GEOIP_PATCH_A} || die
 		epatch ${GEOIP_PATCH_A}
 	fi
 
@@ -148,7 +148,8 @@ src_prepare() {
 	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
 
 	# bug #220361
-	rm {aclocal,libtool}.m4
+	rm aclocal.m4
+	rm -rf libtool.m4/
 	eautoreconf
 }
 
@@ -184,6 +185,7 @@ src_configure() {
 		$(use_with ldap dlz-ldap) \
 		$(use_with odbc dlz-odbc) \
 		$(use_with ssl openssl "${EPREFIX}"/usr) \
+		$(use_with ssl ecdsa) \
 		$(use_with idn) \
 		$(use_enable ipv6) \
 		$(use_with xml libxml2) \
diff --git a/net-dns/bind/bind-9.9.3_p1.ebuild b/net-dns/bind/bind-9.9.3_p1.ebuild
new file mode 100644
index 000000000000..ec9c6484b057
--- /dev/null
+++ b/net-dns/bind/bind-9.9.3_p1.ebuild
@@ -0,0 +1,427 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.3_p1.ebuild,v 1.1 2013/06/30 13:31:19 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="${MY_PV}"
+
+# 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.su/~vjs/rl-${RRL_PV}.patch )"
+
+LICENSE="ISC BSD BSD-2 HPND JNIC openssl"
+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 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 )
+	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] )
+	python? ( virtual/python-argparse )"
+
+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
+		cp "${DISTDIR}"/rl-${RRL_PV}.patch "${S}" || die
+#		sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \
+#			-e 's:^ RELEASEVER=: RELEASEVER=1:' \
+#			rl-${RRL_PV}.patch || die
+
+		# Response Rate Limiting (DNS RRL) - bug 434650
+		epatch 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.m4
+	rm -rf 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 ssl ecdsa) \
+		$(use_with idn) \
+		$(use_enable ipv6) \
+		$(use_with xml libxml2) \
+		$(use_enable xml newstats) \
+		$(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
+		pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null
+	fi
+
+	use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A}
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r6 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
+		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
+
+		rm -f "${D}/usr/sbin/dnssec-checkds"
+		python_generate_wrapper_scripts "${D}usr/sbin/dnssec-checkds"
+	fi
+
+	# bug 450406
+	dosym 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\"); };"
+}