From 914aadcf2ae3e4f3a8d7f192df92b3f9a0b40f16 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Thu, 30 Jul 2015 18:52:54 +0000 Subject: Security bump, bug 556150. Cleanup Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xB427ABC8 --- net-dns/bind/ChangeLog | 9 +- net-dns/bind/Manifest | 33 +-- net-dns/bind/bind-9.10.1_p1.ebuild | 402 ---------------------------------- net-dns/bind/bind-9.10.2_p3.ebuild | 407 ++++++++++++++++++++++++++++++++++ net-dns/bind/bind-9.9.5-r3.ebuild | 433 ------------------------------------- net-dns/bind/files/127.zone-r1 | 12 - net-dns/bind/files/named.conf-r7 | 172 --------------- 7 files changed, 425 insertions(+), 1043 deletions(-) delete mode 100644 net-dns/bind/bind-9.10.1_p1.ebuild create mode 100644 net-dns/bind/bind-9.10.2_p3.ebuild delete mode 100644 net-dns/bind/bind-9.9.5-r3.ebuild delete mode 100644 net-dns/bind/files/127.zone-r1 delete mode 100644 net-dns/bind/files/named.conf-r7 (limited to 'net-dns') diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index 559074e72a56..fa16a7e781c1 100644 --- a/net-dns/bind/ChangeLog +++ b/net-dns/bind/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-dns/bind # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.539 2015/07/23 09:35:28 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.540 2015/07/30 18:52:47 idl0r Exp $ + +*bind-9.10.2_p3 (30 Jul 2015) + + 30 Jul 2015; Christian Ruppert -bind-9.9.5-r3.ebuild, + -bind-9.10.1_p1.ebuild, +bind-9.10.2_p3.ebuild, -files/127.zone-r1, + -files/named.conf-r7: + Security bump, bug 556150. Cleanup 23 Jul 2015; Agostino Sarubbo bind-9.10.2_p2.ebuild: Stable for sparc, wrt bug #553584 diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index 490691ff9a6b..651d493817a9 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -2,43 +2,30 @@ Hash: SHA256 AUX 10bind.env 27 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650 SHA512 8ae5326b158b8a3eeaab667c84dd712fefd25d10832598783fa497285183cbdee554796c22d32fec54cd00461469f29ed473a730304a00aacdf06c1bb6c33d55 WHIRLPOOL 8fe00482e9ba95698cd814893784bd502ac0edb318450edac60bff4d2b4810068cd5e1f58cfce1ca5e05d5967d36728bf67cd927ce7d991832d1a07593d27c37 -AUX 127.zone-r1 533 SHA256 0fa4c294640d4191710647d1b18a2099f22ff674b3a35e6e81ff929f921da626 SHA512 c165e903cee1553483e53d917224ce4b1410248ad04602be80af27e87216fea113b6358057369ca167037344ebeda39b71702e84469bb239131656dcadcdf30e WHIRLPOOL e067518f0aa32277911b836c90c6bdb8be2397846d1a94008d8ca1a5931df40e21d74da5e754dcb49113a4c5330764c2cb2f71fb8b1204c0e226b20330a01a67 AUX bind-9.7.3-odbc-dlz-detect.patch 517 SHA256 69797543bf723e3e3e7405f0130d14754ad26830d45977efebdd35848b7b03aa SHA512 d3505beb1a87059aa30e03c205b6c1144900dc76b362b684f6ce875297bf77b6f92ad1d779ae08ac6752bd47d46a447d7731caa8c60e250bc3f4591305385810 WHIRLPOOL 56c476d669a314d9b8342d634ce9bc2d6a58cc0cb3b8afd38fb210c4ee6810ee2eee2631637836b33990291367a4866c60d53e72349955317b563858388e7587 AUX bind-dlzmysql5-reconnect.patch 1842 SHA256 7376ac37c2d3fbcf5d8e886008639bdbe642f44c9021f435af370bddd3f03bd4 SHA512 0b3faed4d1736cc8f641e88532ccc4e402b3f67ba4dea124e6b1b0ce6ec75e895d514e69887d44a5869c5ae4e53e82d3b27e029855f2c3861cd2e7fda8428e01 WHIRLPOOL f85ff8ee5c9f4b5f8443698cb0e1a4e542347242e455f108a8c4cd97b62c76b08a9a2ead324bbd9b1d9974df6cf01ff2e4a4f79c6723aeffb5f1e24644d28002 AUX generate-rndc-key.sh 183 SHA256 7d9c010a62db7561770fefdfb557bdae17f18835e62bfb9761680054d851ab44 SHA512 6c611120185c1a61b2b6da228efc28302ebd36c819b97793920543ce2cfff4da84f43ec53ddd072f008b04c7087cc19108c4279cb962d12a7e073b47235d14ee WHIRLPOOL d071d473faa6e1feca55ce6e4dd68d76b566372b8cee2e27fd89b48fd4651fe3cff957ac66ad895dccdba1373f18b75f67daeb9bc292dc9a7bc6f3f6da330f91 AUX localhost.zone-r3 426 SHA256 3f39e9b5be72435e961cd6f5acdfe396b05640bf370969acf918a939575122bc SHA512 979d8693046033c24490dca536f0d649795bbdf57eed32017b32d07d7d3c51b35197e4edd79d8258074a1bf14b71376472ba6ae749f62ceaf74d7a6a0559fa89 WHIRLPOOL 0b7bba480e8bb8cc61e0c9efe2eaba4288fd05b9ae6aeda5e691ad50fc2741bc19b7669a4de56821de2a792df0fe4501d98ff92287dc79cc0bdf766526d365bd AUX named.cache 3048 SHA256 2e19682ad79bee201e3fc0454b73d45d04be7ba7dceb28612ec71fff0add6de4 SHA512 f84a7c83b424fa59126617062c1442dd8fb28905cd082f5f60087da03fe0e10c55a2c20fc398d9c69af7c1f75f7c72f78f4c203503cf51a6c06be22df8132996 WHIRLPOOL 6d3a843535cd0685703b99474be5eb599ba13b81be98d337236ef826e672aa534d4cdf4fe54f3aa0e838c8e7568a4201764c423d3bb490a9f842c446a58c1722 -AUX named.conf-r7 4116 SHA256 4aa2617f7990101d3262d0422636c5d967e78be6ee2582568e31680684dd9948 SHA512 3e1cea45ddb9df92658c35948eb00bd823087af0d48102751edf1c248e7d6c1ae03aa2a1b7d1d0ce3d7837219ff4c2e05cbb7f299caaa97688ca876f2b0af80b WHIRLPOOL e26b4be274f4b072485dbe247f4ba226ce379551e285fc133dd21b2e49179c12d0ff32600fd86b0085cc333283d5c6301758a5d929dce65e41c552d6ab6d01c5 AUX named.conf-r8 4020 SHA256 c1f93d78f46aa6a562d1530ae1697d16fe9020435b835e192cafcb66ff22d7fc SHA512 60ab117e488604810a6e42a627eae465f6241208e726e763127f84102d05a661cceeddd00bc9d8d92c3da7d73d034ef876ace6744a0516b2bcadbaff1d9c82ad WHIRLPOOL 005f5185451a5a20ab9f7d5e0374b051e051315f6a28245241c74bfc1d6a6f3ca2b742a2a774a8dd6e04cef887c69b07bbef31896db02031bdf3e99569274178 AUX named.confd-r7 1364 SHA256 3cf1ab72446cb9417de916e4cd732f2056fb74d2c6f03da6741b7bae8c415448 SHA512 68fa7c8963ac59349de3d05972c07aa0123b7bebbe0ba9604463ccfd1b377c2babe01eed4745cbe0f7d3831d1b47c2fa620f8092c67465fb771cae4932b0861a WHIRLPOOL 53ae821e10b8ee9becc265030a1cd7758706c1348ffe857edfde744d3214dbc0d648550d83801f4340fe06884ac8edaddbf2e39b8440d007c36b0895f201609a AUX named.init-r13 6083 SHA256 55024fe0e2b491b5cb490a9f575bad3096d446f20f8d52778d778fd26a415d52 SHA512 9d557b1b30989b21d9ae9c3f4e2a886f59de728cd5893a7538be3bc424bf17b249165ed939c87db02f0b760faf46a5503c5bf523386b84ddfe8128e76f79930b WHIRLPOOL 8566abd7dda75fd3be7f3cf21baec149ce280a78ea400709272e6ad419417c14f6b1bc859ae2809a44c24aab382d6e6d10323c8df430884d306243275c35d77d AUX named.service-r1 327 SHA256 5c57f181cbb153fe6beb9385c56b874ea56afc19cca105ea3c5cadf2138c349d SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4 WHIRLPOOL fbfbb8ec1bd7bf1796be0daa66ec0918b175f3953b0312c492a09097f4e7c9b60d303330f525c03d1aa7b0934c2bc134e90800afb7e40e06f77f865c8710dd66 -DIST bind-9.10.1-P1.tar.gz 8356463 SHA256 974343108d32f253a130383d0ba51290fb7bf372092f1451f264a9e3ac09898d SHA512 5fedff46d9cb0ff2544624c6d998f4f4bcd82152730e8e936c2611847fe443018b5c5c1dfb1dc49888dde5e3e30c3814f08369525612f0770575d54a3133ed48 WHIRLPOOL 6f39ff0e15676ed68f6d48d2ec5894b00de5192edbbbff94444f62dcf83e62a1e72019d575da97b6e6cde91b8918da78721c48510dbaad88095d4f2b3af375eb DIST bind-9.10.2-P2.tar.gz 8469608 SHA256 b1e6f0af88634aaf48fb9d06bbf82968264f49b8e2685f061dd3fd4c1ab76c5f SHA512 f59a4e7ef268cd95be9c31b8f908a77b261c76bfad0572608f503175e4e06e69c22ee88f4b6ae9578cd096aa069d9401f76084c7e07b3e98e9dbbb40d535695c WHIRLPOOL 10b035f790a43552b22eed13a98b8dcfdc0cc0614342ae221ce23ba655fb40a46e336cca8575460bf26a792303c6eba61e184ca5deb219372fdd09609b4c9798 -DIST bind-9.9.5-geoip.patch 54901 SHA256 df713fd431f01f119bdaabb732401b80b553cd1f768838b5aa59ffcbc1a6a39e SHA512 0068463fe5c25c00e1407dce9588718fea45e730a2dc034783a8159a1eb457554ee4d34ea18550b0e737c0ca46fffe851d4eb2dce1b8f887e83550173f4e3ee2 WHIRLPOOL 2422ace7d86789f39bb1b1eda55f8a4c789a1195596543ed6e15696bcd219f4960f4c1d9ddf0c1be5d1ff946840ef9194f5232eb9f07c955c50e17aaade4b28e -DIST bind-9.9.5.tar.gz 7729695 SHA256 d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1 SHA512 2639e73c0b57a6a34727e65e44a6d4c90e8682145f92a0a543f80fe0d3cdf707287b67d7ff9f1da5cf91a3c23861033b542871bc909ce0f538b4d3d368932574 WHIRLPOOL ad25df5dfebe06db950755d46531ceb36ae5f8dde38d1a53a3ca593bbd62161535b8a611c6a89701ff5853c740a5a2ff5e7f83da3841ea5482718e569b9f9c71 -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 bind-9.10.2-P3.tar.gz 8469831 SHA256 78079a66dda455ffecfe93ef72d1ffc947f17b1c453d55ec06b860b49a5e1d4a SHA512 cf33c3f83ab7c46f5919c16719870310f9e82237df4ed7ba4f7eb76ddae14b9644bd67dbb6c46e75650f59185aee391d3ac6fee45b2edb88473f9dbc578bb016 WHIRLPOOL ff7e1c827bfb62e229b8d93c299ff0647614f8403ba84cd3ebdbcafd51d37fdfcee7afd3feaf73036dfc46904b9b506b1da7c7e8ae73e167fe6f1f0246dc6163 DIST dyndns-samples.tbz2 22866 SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac WHIRLPOOL 08d4e6a817f1d02597631e18152dbd55ea1bc4c82174be150cc77efc9e1f0f03b6471d1cefbe4229cd3161de752ef232a43ca274a07b78e9c974ceb04cfe99a2 -EBUILD bind-9.10.1_p1.ebuild 11931 SHA256 14e4f8d6c27dc4c5f001565c7ae504311d275aa8d4ffa5169cbb442ad6de8303 SHA512 2a9ca43a4fcb5f0fceacd829c84dcdcd5485286e3c44be2f90b10a7654bef396d466d482515bc6f78bc1f16bcc44f5a71a632e6c0abfe1962d9e867a3e47800f WHIRLPOOL 7560ced698df09425afc28ddde84e5a9610c8e9addbda6f513820bec2230a04b568522b45413b0b6caa0648e3a2548571d86d57b8113e9767e6729485dacac71 EBUILD bind-9.10.2_p2.ebuild 12080 SHA256 91d04ef531d1cd074575bc245ed4304eaa32b817639c605591959fae77c71c7d SHA512 e0e5a30360c2dfc44ebc4c41583c7f2b4ac7597a3eee7b108b26e4e498addc20eade3841415bfdea1f0ac0d3591c3dc3ff02f51d3ec031b488a376c467e0cac1 WHIRLPOOL d345697a87035a8a4b423e2077652d376fc23a12259d1f327eef327b38dcd17a09ebd3f77bcec01285985435ad163c41b27ccfa0ac0a8d5ca58694e4241b46c1 -EBUILD bind-9.9.5-r3.ebuild 13810 SHA256 45354bdd65c0a49bb086a6f5fd90a737d9c36b2cb18c7383aa3fec0328796b24 SHA512 60e13126851722ff98b419d734f7bcc5d5e20a069314fcbef9559e0d89e1db32586cd8012954f689711d71eee01ff27392f36beba86fac95dbebb114c97894c5 WHIRLPOOL c9b1dac4ff0e07c718647c6a9774949ae9c504b0510c85c5303f6a8f497d21ada507675fe4850f308d21dfaac3a83a52040c71000aa6ce7a6ab17ffcd5cad69e -MISC ChangeLog 84718 SHA256 ccf147e8defa8b9a3689f4e9288d817804f4c0884851c5a6c4cfab292608cc4b SHA512 9883ab7cfb8bff069ed0d98c82dac819b11ca0b75e4bf183fdabc824587caac264509b052260c3f0193503cf2774716ebf4c5f6672df73694f6b24b87a4fec8f WHIRLPOOL d5270fa24e239906217d0218d086cb01b71c045955594c8a973a3a9c847d4bd6aa71bebf033418f50aaa06d760af2e0e0bc74ec71865ac08230c576a21f8a71c +EBUILD bind-9.10.2_p3.ebuild 12091 SHA256 5e169cb2a923061ee37fea4920aaee3423b379da751a01e8affea44f595b5bcd SHA512 d06baddad0d709ca248f769b0050332abc15ce79ac375e4eeb13e91a96b527215ce188e4d33e9f2d4c79cc49b94c3d33525f09fccd94b72ea6d7a77839181782 WHIRLPOOL b4eb2a09273a320d760e49708583928cf70faf56949f0c34e0d2cc2b77d50a5641394e44320ed10dfa3b34464b4c172f4066c165abb8f24f83050d554a2dd18b +MISC ChangeLog 84958 SHA256 d15574266ca65cea46b9a3898cdf10b949e6eb91faaaf0cdf18809afc3a34e4f SHA512 6371bf5bc3b5c53110ac001a0eebae1af74b731de3a6068828f6b6345ff8426a6b4d9316e1fd6e9833c1054848e9b8b41d525db94a864f53c73b67b875fcd7c9 WHIRLPOOL 9f349bccdd0e9728ef25e9963273fedd2253250f8f2faa102aeb73a33735289e467a335e56cff94bcd9c950b1325fd592b97a5e71a9ff1fdb1af316eb8b216ca MISC metadata.xml 1048 SHA256 ae9bee58fa7f989b8bfa5bb60043c37cc51abfb15906ca1ab8aa979aff842cb8 SHA512 9e95433aeadce4f66cb2c3acb5d46379219c24855d3085d5b988899bacd760e2d56f50f47abfbbcb5c38f1d8297b09812adf8fcdc7a0e7ee8f277ff74806136b WHIRLPOOL eaad1de85030acbaeb70984fceedb06b1946110b1d669d07fc26437015fe18c3f93edbc5b497e2e9a463bb65acda2b379807aaf2c283bc3bbc7049a79481e2c5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVsLVhAAoJELp701BxlEWf8HAP/0z1amgvSCVh+s6yoaqlvXEw -Uen4/3oKfKz0T/NYmmjnnUpYjbNrhNlU+0ZHIcU2F/g3jJ876mvXzP8X+a7Rhnxc -csfBXBKitBklRBWzAwzi85WJ1R0XS3dDSwlQ0HBVH8OYuP4piIOQa6zoUsSvAueo -/hHZAyTgWh061PhXy531xR5bU6lFrq68JS/hx1Lk2sAOAns15AzM6DW07aQv3RTu -3V8+p7RxXy5N5P7KjljjS8+C/pOlIPWMFYRjh0rS9NQb/s7it4At0MxByB+hqCU+ -jgA4SRAwlVzWLJAbTTf7nHiho9YAcrABe3iXPVUxYZwZbdVE/ZOZKSYtH80gFQV7 -C8SiLf1vHXm9xhGTHQXwe7ZP4plPeHtod/nS/cI1mEQY+23nNM36XpUV608D8GsC -BWx1ROEH4UyZFqwNhKcnn/leJ/E53nkGOHMSNHmba2lFPSQ8zDGGT6iNH4V9RySP -/a8BRYGVxgi7Lap5dFhS1rtRd0b0pwFQgu25VKEJjSNbtSql3V2Oll01URxeRmfL -nG1Gx2X3Hu3ii9lZuZagpeviDtqcOdnZeWfNXejCR8+QHccKeErs2+IrusNDUXDa -Ui5sd7ZfFlhW2nq2eytb4fVd2dmX/6GfgBW9meLMQthrW1hXyIn9VDN8zF8bqvyH -C3zdQQbY8WTooJnDm4KG -=c8L6 +iQEcBAEBCAAGBQJVunKEAAoJEMOx0zmdw4Z1itsH/RkaaafLTNqIgtmU6/yMpARJ +ox9DM6fsLe5/92yy63EEhxp90TweHy+//1OJAggAh12Fgf9vyTaRMthRIkqpw4WV +R1Hyb9LzwWCm6qdC1L+Yu4m7KBYj4adgf6+QLzihE03bnT3PoIglp6c/7COVJqia +wX3SRzvfNOPqwRn9/CPRb0su8LuFB2chYd1gJsG/fWHcrmEEjGlf15fVWklzrTsG +lWv74gy4jBtF/jeaQ948I8ZBVczF05bIHXYgxXKAIcTwfjH/M+5q2NwvhoGWabI7 +dWRJNA1VDkw+lb64fDETpaCLMAeC6FV3ACiaTBtLHsoFqyfNVqh8npiPzUDcbDw= +=xkJa -----END PGP SIGNATURE----- diff --git a/net-dns/bind/bind-9.10.1_p1.ebuild b/net-dns/bind/bind-9.10.1_p1.ebuild deleted file mode 100644 index 0e23e435ce8b..000000000000 --- a/net-dns/bind/bind-9.10.1_p1.ebuild +++ /dev/null @@ -1,402 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.10.1_p1.ebuild,v 1.15 2015/04/08 18:16:54 mgorny 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="5" - -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) - -inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd - -MY_PV="${PV/_p/-P}" -MY_PV="${MY_PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -SDB_LDAP_VER="1.1.0-fc14" - -RRL_PV="${MY_PV}" - -NSLINT_DIR="contrib/nslint-3.0a2/" - -# 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 )" -# sdb-ldap? ( -# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 -# )" - -LICENSE="GPL-2 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 fixed-rrset geoip gost gssapi idn ipv6 -json ldap mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs -+threads urandom xml" -# sdb-ldap - patch broken -# 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 ) - gost? ( ssl ) - threads? ( caps )" -# sdb-ldap? ( dlz ) - -DEPEND="ssl? ( dev-libs/openssl:0[-bindist] ) - mysql? ( >=virtual/mysql-4.0 ) - odbc? ( >=dev-db/unixODBC-2.2.6 ) - ldap? ( net-nds/openldap ) - idn? ( net-dns/idnkit ) - postgres? ( dev-db/postgresql:= ) - caps? ( >=sys-libs/libcap-2.1.0 ) - xml? ( dev-libs/libxml2 ) - geoip? ( >=dev-libs/geoip-1.4.6 ) - gssapi? ( virtual/krb5 ) - gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) - seccomp? ( sys-libs/libseccomp ) - json? ( dev-libs/json-c )" -# sdb-ldap? ( net-nds/openldap ) - -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}" - -# bug 479092, requires networking -RESTRICT="test" - -pkg_setup() { - 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 -# # 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|delv) ::g" bin/Makefile.in || die - - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die - - if use nslint; then - sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:' ${NSLINT_DIR}/nslint.{c,8} || die - fi - - # 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 \ - --enable-full-report \ - $(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_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_enable fixed-rrset) \ - $(use_with python) \ - $(use_enable seccomp) \ - $(use_with json libjson) \ - --without-readline \ - ${myconf} - - # $(use_enable static-libs static) \ - - # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h - - if use nslint; then - cd $NSLINT_DIR - econf - fi -} - -src_compile() { - emake - - if use nslint; then - emake -C $NSLINT_DIR CCOPT="${CFLAGS}" - fi -} - -src_install() { - emake DESTDIR="${D}" install - - if use nslint; then - cd $NSLINT_DIR - dobin nslint - doman nslint.8 - cd "${S}" - fi - - 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/scripts/{nanny.pl,named-bootconf.sh} - - # 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 - - insinto /etc/bind - newins "${FILESDIR}"/named.conf-r8 named.conf - - # ftp://ftp.rs.internic.net/domain/named.cache: - insinto /var/bind - doins "${FILESDIR}"/named.cache - - insinto /var/bind/pri - newins "${FILESDIR}"/localhost.zone-r3 localhost.zone - - newinitd "${FILESDIR}"/named.init-r13 named - newconfd "${FILESDIR}"/named.confd-r7 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 '*.a' -delete || die - fi - - # bug 405251 - find "${D}" -type f -name '*.la' -delete || die - - if use python; then - install_python_tools() { - dosbin bin/python/dnssec-{checkds,coverage} - } - python_foreach_impl install_python_tools - - python_replicate_script "${D}usr/sbin/dnssec-checkds" - python_replicate_script "${D}usr/sbin/dnssec-coverage" - 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/log/named - - fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn} - fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} - fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} - fperms 0750 /etc/bind /var/bind/pri - fperms 0770 /var/log/named /var/bind/{,sec,dyn} - - systemd_newunit "${FILESDIR}/named.service-r1" named.service - exeinto /usr/libexec - doexe "${FILESDIR}/generate-rndc-key.sh" -} - -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 -} - -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/log,run} - mkdir -m 0750 -p ${CHROOT}/etc/bind - mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/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,log/named} ${CHROOT}/run/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/bind-9.10.2_p3.ebuild b/net-dns/bind/bind-9.10.2_p3.ebuild new file mode 100644 index 000000000000..55bc41074fee --- /dev/null +++ b/net-dns/bind/bind-9.10.2_p3.ebuild @@ -0,0 +1,407 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.10.2_p3.ebuild,v 1.1 2015/07/30 18:52:47 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="5" + +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) + +inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd + +MY_PV="${PV/_p/-P}" +MY_PV="${MY_PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" + +SDB_LDAP_VER="1.1.0-fc14" + +RRL_PV="${MY_PV}" + +NSLINT_DIR="contrib/nslint-3.0a2/" + +# 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 )" +# sdb-ldap? ( +# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 +# )" + +LICENSE="GPL-2 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 fixed-rrset geoip gost gssapi idn ipv6 +json ldap mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs ++threads urandom xml" +# sdb-ldap - patch broken +# 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 ) + gost? ( ssl ) + threads? ( caps )" +# sdb-ldap? ( dlz ) + +DEPEND="ssl? ( dev-libs/openssl:0[-bindist] ) + mysql? ( >=virtual/mysql-4.0 ) + odbc? ( >=dev-db/unixODBC-2.2.6 ) + ldap? ( net-nds/openldap ) + idn? ( net-dns/idnkit ) + postgres? ( dev-db/postgresql:= ) + caps? ( >=sys-libs/libcap-2.1.0 ) + xml? ( dev-libs/libxml2 ) + geoip? ( >=dev-libs/geoip-1.4.6 ) + gssapi? ( virtual/krb5 ) + gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) + seccomp? ( sys-libs/libseccomp ) + json? ( dev-libs/json-c )" +# sdb-ldap? ( net-nds/openldap ) + +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}" + +# bug 479092, requires networking +RESTRICT="test" + +pkg_setup() { + 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 +# # 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|delv) ::g" bin/Makefile.in || die + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + if use nslint; then + sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:' ${NSLINT_DIR}/nslint.{c,8} || die + fi + + # 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 \ + --enable-full-report \ + $(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_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_enable fixed-rrset) \ + $(use_with python) \ + $(use_enable seccomp) \ + $(use_with json libjson) \ + --without-readline \ + ${myconf} + + # $(use_enable static-libs static) \ + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h + + if use nslint; then + cd $NSLINT_DIR + econf + fi +} + +src_compile() { + emake + + if use nslint; then + emake -C $NSLINT_DIR CCOPT="${CFLAGS}" + fi +} + +src_install() { + emake DESTDIR="${D}" install + + if use nslint; then + cd $NSLINT_DIR + dobin nslint + doman nslint.8 + cd "${S}" + fi + + 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/scripts/{nanny.pl,named-bootconf.sh} + + # 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 + + insinto /etc/bind + newins "${FILESDIR}"/named.conf-r8 named.conf + + # ftp://ftp.rs.internic.net/domain/named.cache: + insinto /var/bind + doins "${FILESDIR}"/named.cache + + insinto /var/bind/pri + newins "${FILESDIR}"/localhost.zone-r3 localhost.zone + + newinitd "${FILESDIR}"/named.init-r13 named + newconfd "${FILESDIR}"/named.confd-r7 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/nsupdate.8* + rm -f "${D}"/usr/bin/{dig,host,nslookup,nsupdate} + rm -f "${D}"/usr/sbin/{dig,host,nslookup,nsupdate} + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + rm -f "${D}"/usr/{,s}bin/dnssec-"${tool}" + rm -f "${D}"/usr/share/man/man8/dnssec-"${tool}".8* + done + + # bug 405251, library archives aren't properly handled by --enable/disable-static + if ! use static-libs; then + find "${D}" -type f -name '*.a' -delete || die + fi + + # bug 405251 + find "${D}" -type f -name '*.la' -delete || die + + if use python; then + install_python_tools() { + dosbin bin/python/dnssec-{checkds,coverage} + } + python_foreach_impl install_python_tools + + python_replicate_script "${D}usr/sbin/dnssec-checkds" + python_replicate_script "${D}usr/sbin/dnssec-coverage" + 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/log/named + + fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn} + fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0750 /etc/bind /var/bind/pri + fperms 0770 /var/log/named /var/bind/{,sec,dyn} + + systemd_newunit "${FILESDIR}/named.service-r1" named.service + exeinto /usr/libexec + doexe "${FILESDIR}/generate-rndc-key.sh" +} + +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 +} + +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/log,run} + mkdir -m 0750 -p ${CHROOT}/etc/bind + mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/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,log/named} ${CHROOT}/run/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/bind-9.9.5-r3.ebuild b/net-dns/bind/bind-9.9.5-r3.ebuild deleted file mode 100644 index fd4dc59686b0..000000000000 --- a/net-dns/bind/bind-9.9.5-r3.ebuild +++ /dev/null @@ -1,433 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.5-r3.ebuild,v 1.14 2015/03/21 21:34:40 jlec 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="5" - -PYTHON_DEPEND="python? 2:2.7 3" -SUPPORT_PYTHON_ABIS="1" - -inherit python eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd - -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/ -# SDB-LDAP: http://bind9-ldap.bayour.com/ - -# geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A} -# ${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} ) - -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} - http://dev.gentoo.org/~idl0r/${P}-geoip.patch ) - sdb-ldap? ( - http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 - )" - -LICENSE="GPL-2 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 fixed-rrset 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[-bindist] ) - mysql? ( >=virtual/mysql-4.0 ) - odbc? ( >=dev-db/unixODBC-2.2.6 ) - ldap? ( net-nds/openldap ) - idn? ( net-dns/idnkit ) - postgres? ( dev-db/postgresql:= ) - 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: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}" - -# bug 479092, requires networking -RESTRICT="test" - -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=2:' \ -# ${GEOIP_PATCH_A} || die -# sed -i -e 's:^ PATCHVER=2: PATCHVER=4:' ${GEOIP_PATCH_A} || die -# epatch -F0 ${GEOIP_PATCH_A} - epatch -F0 "${DISTDIR}/${P}-geoip.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 \ - --enable-full-report \ - $(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_enable fixed-rrset) \ - $(use_enable rrl) \ - $(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-r7 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-r13 named - newconfd "${FILESDIR}"/named.confd-r7 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 '*.a' -delete || die - fi - - # bug 405251 - find "${D}" -type f -name '*.la' -delete || die - - if use python; then - install_python_tools() { - python_convert_shebangs $PYTHON_ABI bin/python/dnssec-checkds bin/python/dnssec-coverage - newsbin bin/python/dnssec-checkds dnssec-checkds-${PYTHON_ABI} - newsbin bin/python/dnssec-coverage dnssec-coverage-${PYTHON_ABI} - } - python_execute_function install_python_tools - - rm -f "${D}/usr/sbin/dnssec-"{checkds,coverage} - python_generate_wrapper_scripts "${D}usr/sbin/dnssec-checkds" - python_generate_wrapper_scripts "${D}usr/sbin/dnssec-coverage" - 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/log/named - - fowners root:named /{etc,var}/bind /var/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/log/named /var/bind/{,sec,dyn} - - systemd_newunit "${FILESDIR}/named.service-r1" named.service - exeinto /usr/libexec - doexe "${FILESDIR}/generate-rndc-key.sh" -} - -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 =bind-9.7.x only */ - //bindkeys-file "/etc/bind/bind.keys"; - - listen-on-v6 { ::1; }; - listen-on { 127.0.0.1; }; - - allow-query { - /* - * Accept queries from our "trusted" ACL. We will - * allow anyone to query our master zones below. - * This prevents us from becoming a free DNS server - * to the masses. - */ - trusted; - }; - - allow-query-cache { - /* Use the cache for the "trusted" ACL. */ - trusted; - }; - - allow-recursion { - /* Only trusted addresses are allowed to use recursion. */ - trusted; - }; - - allow-transfer { - /* Zone tranfers are denied by default. */ - none; - }; - - allow-update { - /* Don't allow updates, e.g. via nsupdate. */ - none; - }; - - /* - * If you've got a DNS server around at your upstream provider, enter its - * IP address here, and enable the line below. This will make you benefit - * from its cache, thus reduce overall DNS traffic in the Internet. - * - * Uncomment the following lines to turn on DNS forwarding, and change - * and/or update the forwarding ip address(es): - */ -/* - forward first; - forwarders { - // 123.123.123.123; // Your ISP NS - // 124.124.124.124; // Your ISP NS - // 4.2.2.1; // Level3 Public DNS - // 4.2.2.2; // Level3 Public DNS - 8.8.8.8; // Google Open DNS - 8.8.4.4; // Google Open DNS - }; - -*/ - - //dnssec-enable yes; - //dnssec-validation yes; - - /* - * As of bind 9.8.0: - * "If the root key provided has expired, - * named will log the expiration and validation will not work." - */ - //dnssec-validation auto; - - /* if you have problems and are behind a firewall: */ - //query-source address * port 53; -}; - -/* -logging { - channel default_log { - file "/var/log/named/named.log" versions 5 size 50M; - print-time yes; - print-severity yes; - print-category yes; - }; - - category default { default_log; }; - category general { default_log; }; -}; -*/ - -include "/etc/bind/rndc.key"; -controls { - inet 127.0.0.1 port 953 allow { 127.0.0.1/32; ::1/128; } keys { "rndc-key"; }; -}; - -zone "." in { - type hint; - file "/var/bind/named.cache"; -}; - -zone "localhost" IN { - type master; - file "pri/localhost.zone"; - notify no; -}; - -zone "127.in-addr.arpa" IN { - type master; - file "pri/127.zone"; - notify no; -}; - -/* - * Briefly, a zone which has been declared delegation-only will be effectively - * limited to containing NS RRs for subdomains, but no actual data beyond its - * own apex (for example, its SOA RR and apex NS RRset). This can be used to - * filter out "wildcard" or "synthesized" data from NAT boxes or from - * authoritative name servers whose undelegated (in-zone) data is of no - * interest. - * See http://www.isc.org/software/bind/delegation-only for more info - */ - -//zone "COM" { type delegation-only; }; -//zone "NET" { type delegation-only; }; - -//zone "YOUR-DOMAIN.TLD" { -// type master; -// file "/var/bind/pri/YOUR-DOMAIN.TLD.zone"; -// allow-query { any; }; -// allow-transfer { xfer; }; -//}; - -//zone "YOUR-SLAVE.TLD" { -// type slave; -// file "/var/bind/sec/YOUR-SLAVE.TLD.zone"; -// masters { ; }; - - /* Anybody is allowed to query but transfer should be controlled by the master. */ -// allow-query { any; }; -// allow-transfer { none; }; - - /* The master should be the only one who notifies the slaves, shouldn't it? */ -// allow-notify { ; }; -// notify no; -//}; -- cgit v1.2.3-65-gdbad