diff options
author | Christian Ruppert <idl0r@gentoo.org> | 2014-09-30 18:44:00 +0000 |
---|---|---|
committer | Christian Ruppert <idl0r@gentoo.org> | 2014-09-30 18:44:00 +0000 |
commit | 570e647b5a474702562c5963f3cf1b7f56c1acb5 (patch) | |
tree | 3177bca7ac1f2c21443971880f047fac28404586 /net-dns/bind | |
parent | Install patched config file, instead of original, bug #523892 (diff) | |
download | historical-570e647b5a474702562c5963f3cf1b7f56c1acb5.tar.gz historical-570e647b5a474702562c5963f3cf1b7f56c1acb5.tar.bz2 historical-570e647b5a474702562c5963f3cf1b7f56c1acb5.zip |
Version bump, also fixes bug 523470
Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8
Diffstat (limited to 'net-dns/bind')
-rw-r--r-- | net-dns/bind/ChangeLog | 8 | ||||
-rw-r--r-- | net-dns/bind/Manifest | 20 | ||||
-rw-r--r-- | net-dns/bind/bind-9.10.1.ebuild | 400 | ||||
-rw-r--r-- | net-dns/bind/metadata.xml | 1 |
4 files changed, 419 insertions, 10 deletions
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index e17c395ffa03..461a868795c1 100644 --- a/net-dns/bind/ChangeLog +++ b/net-dns/bind/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dns/bind # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.506 2014/09/10 20:09:58 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.507 2014/09/30 18:43:54 idl0r Exp $ + +*bind-9.10.1 (30 Sep 2014) + + 30 Sep 2014; Christian Ruppert <idl0r@gentoo.org> +bind-9.10.1.ebuild, + metadata.xml: + Version bump, also fixes bug 523470 10 Sep 2014; Christian Ruppert <idl0r@gentoo.org> bind-9.10.0_p2.ebuild: The MySQL reconnect patch is no longer required, thanks to BtbN via IRC diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index 7ea965f2de52..aa3dc106662c 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -14,6 +14,7 @@ AUX named.confd-r7 1364 SHA256 3cf1ab72446cb9417de916e4cd732f2056fb74d2c6f03da67 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.0-P2.tar.gz 8335644 SHA256 335722ed66ae2cc9ffb2249f47f5cf39c86ebddd0a8ae86ac8282fec17df1e2b SHA512 6595346d6571e3efb070f3edc2ce004906c3950f7ed07fa8e23695a5a4bd1654e7af56c03c4ca96e4e10900ecde9eaff8da74468dd5874798b97f5fb09cebcf1 WHIRLPOOL 749fbe32fc0f713b725e20b1aa502b2bc026b31a59a619551b59397c4a07c50ab6494d164269d3209d8be0535b221499d5f7c4bd33edcbe1a43ca7b733d397ea +DIST bind-9.10.1.tar.gz 8353313 SHA256 5361eca2b8b6bc0b13904b0f964336a478dfbc165711547f6cc3f8752ac60181 SHA512 16b05e3dbda72b6f5b7436271dd9cadbe0da9207b65b5ecbb6abe7042436c1baf740fb04ecaeefcff5f14e9f4747150faf9251deac68437323f05e80631e8723 WHIRLPOOL dd5f18e950d5289b0df96694ee130e3bca0d788f7d5212144f096882195fec054753fac750c405d620d1730709bf5ec221b9d97056a32e666e092870c004394f DIST bind-9.9.5-P1-geoip-1.4.patch 60725 SHA256 a23e950c8d60a6ef10b5981c4472d7090f2421e588fdfd3872767c15ac80ffd0 SHA512 ce70996d176df5f135b030d17981a89a3d2523d37df6ea91cfeb1bd9f00704ca4678c2270ca5f05b727f3f30f5ad1dbfbffb674ec9669df275c1fb49f47a788f WHIRLPOOL 52e8abfa9a8b79fe5ce10381fc303ff373e083fe716ec2e6b8a1c5e625a2169a7b8e6aafed56fb37698cd3338276af5ef47a23f8555d19659054d3b521245eb7 DIST bind-9.9.5-P1.tar.gz 7730150 SHA256 a41f7813f3a6eb0dcae961651ec93896fd82074929bc6c1d8c90b04a2417b850 SHA512 214e94704cfa5c58c71285f4838888233651d789ff31dafdd581369c2b317c0bdb007de96bf13f08a0ce17fb03b5ac5810db847f19ce3a8c1c6a95868a8520bc WHIRLPOOL f045085611946127e4cfce04653550deb8421e4f3ec54e95672e8be1df9e653709b02da582da6684226132d11176aa394c2faa7b22898951b5f747faef5c5637 DIST bind-9.9.5-geoip.patch 54901 SHA256 df713fd431f01f119bdaabb732401b80b553cd1f768838b5aa59ffcbc1a6a39e SHA512 0068463fe5c25c00e1407dce9588718fea45e730a2dc034783a8159a1eb457554ee4d34ea18550b0e737c0ca46fffe851d4eb2dce1b8f887e83550173f4e3ee2 WHIRLPOOL 2422ace7d86789f39bb1b1eda55f8a4c789a1195596543ed6e15696bcd219f4960f4c1d9ddf0c1be5d1ff946840ef9194f5232eb9f07c955c50e17aaade4b28e @@ -22,18 +23,19 @@ DIST bind-geoip-1.3-readme.txt 10040 SHA256 380ce89f1a614f46571ad59bddf0f2682756 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 EBUILD bind-9.10.0_p2.ebuild 11860 SHA256 9e313c7ba74407b327375433b1cc8674b69d92a9d0e40ee4548e00328b9baf7c SHA512 ef0e30cf96d4e0f606704aaa981efc50de4df9b618cd2e08c976b12e8b20f94e2b5030e953008a7548d44e6357e3cc52b679dcf5e219dca82cffb29542737cfd WHIRLPOOL a5e5b49b28a2040e60901b6e931897cbf763a1dfc728f3d877b824576c2a58790afcaed1020541b1912d9751f670600ea46db5a4a40a7275156ea43249fec5e3 +EBUILD bind-9.10.1.ebuild 11838 SHA256 52de5b3838e9c07078dd314f4d893d4f4d835dac75d65aafecff3950f2d88c32 SHA512 5f04c051ddea33a22f8a8d01bd0ec175d0a0fa7181519967daac145a9fd2b852d8710c09f5ec2cfd689071863b61f2e605739046db19c044283a58723ac94709 WHIRLPOOL 4c0da565ab1f2d2c14bd0cacffe00b0bedf8fcb0262f231edb2a7d1468b38c94b5449b983d3b3f99384e1ed09c6cda5cb64006b42f8946fe00575c743a20073c EBUILD bind-9.9.5-r3.ebuild 13831 SHA256 db4518468e066cad4611b3decfa393e086f1f48d3a4942ac7a8f8f47638542ec SHA512 7667abaae2586bc35b63e03d02e42ed61901c7e4ad00b8ade9011cc5e8be64442c2303b741cc78617a3a9b4b936bb7a32a00c213d7436a5fa9bee68cabf9dcdd WHIRLPOOL f9a4cc48cd840c453562c41cf1fea00ff1c224862d3bb7f96017e1faa3b35a2ff45552cdbe8b6b89ba099333f51ebd5b246062c9613aef6bfbf2b6e8c4b76e8c EBUILD bind-9.9.5_p1.ebuild 12823 SHA256 63a2ecbab24c3a34b681b149aa225a2d7f3f20f5978e8333f0e27351fb27a118 SHA512 6a00b5382563c4caf315a2d42fdf53040543c0dfc1007442a740a835781ee7dd519f2a2cab6fcbba9d653c02f4cf6ea409e4f06e326670cf193cb007b07e526f WHIRLPOOL 74415fb5cb09c0d926ea92926e329a8cf0c3253e361e1c66ba3b603fa6d35f39a0c33c4355e7d2da9f5d93d8f800de71dcb44814d05cec2357c18067b7351225 -MISC ChangeLog 80749 SHA256 9619dbb30d6c09fbbca320800ae92c53b592abf305b24dac10cf1b4b853307a0 SHA512 b613f03a682199f20af5f4ab55d8577eae38ee7cdccdef777f0d262587147f3da194a12ad191406d2426892d85ceae0c92089404a364bd7ba9d53b52c9fb6853 WHIRLPOOL 735ed0ca261c7fddd27a110cd77e4bb52971fa223e1179eeb1ab91c251287d4be473302749fa353f00c0209c2b5df084461dc40bc84afe62d0e928db81675cee -MISC metadata.xml 990 SHA256 83944dc5d561460b8e06f9117ea79ab33fd9676f25e8199428a8c505c8e7e9f7 SHA512 fd513f335dfa301d5a2cb973f3508e95d2cdd6db8d5af11d9d420690fdb29856f9476f59e13ce4a2e73da39b091cf50b688fea68ef159c3cf10b4dfa8ecba05f WHIRLPOOL 1630de584bb3969e8f2aa48d438a4fb868edf33f007d26baf37cdd0ffac3a7ae81a1d859d68374888e27737d9fd30b96fcad2c241f936b25b5fe4a5e87f45ddc +MISC ChangeLog 80905 SHA256 fecb3bd00102aa5f3f451be13fee71c5e7a4827d93bdcfa9441e26a9bfb9d858 SHA512 374b311879471111286fded1e9d430b959f5c9da084de863c18a3043b6273d5814ec05f8a2dc90e7a16cf90297ae46687c38e34b2f6777f554157178065c1e94 WHIRLPOOL 5e3357ac95330046207f72833bf68188bb0e4351e5c63de1bdabbd10047e33a7d0aab95ecf73a5f16d00631d0d90022da955fd191f95805f3a6d90f5aabd3ff2 +MISC metadata.xml 1091 SHA256 0cbbcee4db61f456c451c9fbc25566eb6fa1a3a98511e31311ff2ef14591d5ee SHA512 c7fcce7b0d1a9424780c19ba8cf891de57c41d5b0ea0ef5d4b44012a6ffc6bfb130912852dba9b1f72e7d31c08391007e3ac81258ab50ef28de83210786780ad WHIRLPOOL f46f4e8a9f897c9de5f9fefe838cf2c71ef8bbc57f3f712874400678b260fc19f7a3d2222d0f9948a3addae7b9e13cb5f625f46e81508f5f69171a7971de65c8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUELAbAAoJEMOx0zmdw4Z1zaQIAJJhE9zQoms5bd4PDIW/yo5U -TFm7JLE10eFs0SC/ueY9RT5zRYUHPD+MLrG7lFpSbraW4vO/Ho9vw3mhskOGmbRw -6rYKWpHUNXtcg1h7rdgl8aDhSazJxUFyPTlx8F61pn3p7iXEzxsIKssjcnKAxd4f -+U8xbWM+Fc32K7puXtyjs3k9fSXMop5fXABVySGKVa0fYaBZjs4gjtM+Q0Fei6OJ -VZcSQ6XlSJYqo0NDWrOaENtyUqKr4+SE9Na0UjUCLuY8KJp9nbDOuM91CTXKN1an -uZi+vGBljZQaFxiADDwSGx76NYYWaQt/uQAsGcCXbxd6dz/gT0uNkOz/mpigJLY= -=zBxf +iQEcBAEBCAAGBQJUKvnvAAoJEMOx0zmdw4Z1jBIH+gLc47Efs3wa5rWAJqZ5f9KO +VguNVn5HXsYA76IS6cMexgroIpL9n+LvJG0kmoYIUWwh3uWsxzjFDxXiKRFfIlpP +tGiNpYBAwk5LIjBjcJcSk+P6B2bknLh52LwybyCq3lXH6y9uCb9eLNqB0rU7WzY3 +6IOphIQmsh34mhf+t4fr+Qk6dHx52Me9H0dZOK1/AR9JhbXYC5LU0PaQKHlxxrmi +JAd6vFiXTX+X60ktFybL0DLd+1ZIEuuLCoSo4P8ZT5CDNpRc7LH7JRZkj6cFM2Na +GV6bZEX/OCDgrcJdTnTjOP9dHIezXT/nNcnMAtjnoCJRNJfRGCHNOKq+XXzuShA= +=a07u -----END PGP SIGNATURE----- diff --git a/net-dns/bind/bind-9.10.1.ebuild b/net-dns/bind/bind-9.10.1.ebuild new file mode 100644 index 000000000000..1e87d9aa8933 --- /dev/null +++ b/net-dns/bind/bind-9.10.1.ebuild @@ -0,0 +1,400 @@ +# Copyright 1999-2014 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.ebuild,v 1.1 2014/09/30 18:43:54 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_2 python3_3 ) + +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="~amd64 ~arm ~mips ~s390 ~sh ~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 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-base ) + 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 )" +# 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) \ + --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/metadata.xml b/net-dns/bind/metadata.xml index 192fcec2f8f0..a917d4a721d8 100644 --- a/net-dns/bind/metadata.xml +++ b/net-dns/bind/metadata.xml @@ -15,6 +15,7 @@ <flag name="nslint">Build and install the nslint util</flag> <flag name="rpz">Enable response policy rewriting (rpz)</flag> <flag name="rrl">Response Rate Limiting (RRL) - Experimental</flag> + <flag name="seccomp">Enable use of <pkg>sys-libs/libseccomp</pkg> for system call filtering</flag> <flag name="sdb-ldap">Enables ldap-sdb backend</flag> <flag name="urandom">Use /dev/urandom instead of /dev/random</flag> </use> |