diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-dns/bind | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'net-dns/bind')
-rw-r--r-- | net-dns/bind/Manifest | 12 | ||||
-rw-r--r-- | net-dns/bind/bind-9.14.12.ebuild | 4 | ||||
-rw-r--r-- | net-dns/bind/bind-9.16.4.ebuild | 9 | ||||
-rw-r--r-- | net-dns/bind/bind-9.16.5.ebuild (renamed from net-dns/bind/bind-9.16.3.ebuild) | 37 | ||||
-rw-r--r-- | net-dns/bind/bind-9.16.6.ebuild | 373 | ||||
-rw-r--r-- | net-dns/bind/metadata.xml | 8 |
6 files changed, 393 insertions, 50 deletions
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index 25efe84735ba..14f9f3683947 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -9,10 +9,12 @@ AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4 DIST bind-9.14.12.tar.gz 6318913 BLAKE2B 38cad65923666afa5d83434c43a1b5577fe9555ca637489f780996a1b439955169c859c690f6fb96b003976eca482fe57c9226797cda5b124dc2073a90ef0515 SHA512 f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf -DIST bind-9.16.3.tar.xz 4573044 BLAKE2B 0630c1225984dbe301ca3e4d768d402e3293eee0ae186257d05e9f9999cdfc9538baf015155471f8abe2e725fe8bdb08c0f45bb8619a4a35b781606ee09e708c SHA512 aded208ab8b10cac275512eb4cb19f4eabd654ef3c14ab0c635f7d09194df4f6dfa84d0b5d69ce93854ceb26a93e21d7122b01ce4f3996da807249ca41d877df DIST bind-9.16.4.tar.xz 3465172 BLAKE2B 0787920793798ecc5d3197e1e51d41c14170f25608077af8275fd60502e2a6f5365670ca9e611a94a53517b6a0bd55cbb37ac37a4f01063fc409def4e34c39a8 SHA512 b1cf0607b0d7569ea594e02848eed601b8faf31c527fc17d379cfff3cd45c0c8b849364af0312e9b65bc14875aad87de379281603c150a07bf021ec740e92860 +DIST bind-9.16.5.tar.xz 3474044 BLAKE2B 6908ba2d86049bc684b4876d09fe799313f0f44cc1f2ed89f0143523b9fd2a863fd8791b650f7001a5be14acde9306b70dee8c0d25b3d0676aea1a4d2878958f SHA512 789fc19f60e81f67ef13ebacd030ea5d8f8cc42cf5f06a01ee2eefe9b7c6d3b10603a3a6a3df85b0e5d770fcf462ce8dddc3a7e5f7f2dab27aa5879ee5380eb7 +DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac -EBUILD bind-9.14.12.ebuild 11349 BLAKE2B d52a02a1f9f9093f256fb8ed44f7e273c9c5bfba3f16951533d0bac23ec285156484c55894520c1100060fb86fd573daba85171686634dec915c57f4c88138a0 SHA512 f4993c4747ecda256fd56637ae9a0e91904af17a25ba9dbdf868c9b7077e10cb5907b7b33dd1105da60f8246daf9e4ce19d7754f1e8f3efa3f2d6981ca7e201c -EBUILD bind-9.16.3.ebuild 11354 BLAKE2B 74241d9d6118e43d1ddf7c0d414c4dfb66011a9bf33a905c9a7dc106282a988be25adfa40a3ed14ffd1d948909627ab210d1c749e02fa2c6a3e2823f594f6e51 SHA512 cb67132274c37d5f1746d6b18067e72c09efd9bfe1232443a92dc27e75812be783b1d8864677cc73415c1b212e035e8070201411fb0388290c5a26137d1ec6c4 -EBUILD bind-9.16.4.ebuild 10518 BLAKE2B e7b6de335262333fd40afeef93cfe65df88c080b617abe9b23f1d3bdb8cfb8920c370b37e07693c60df45a9bc092fb1c3d0444e4ce696703203fe1309389654a SHA512 fca740845b0834bcda2719a1a92448001836070f5dc3eecb28ed9ee6eb3ac9fc3f83163ee458e3831277f80954a88e6642248452dc7eb15aa784ed9ff2c9088c -MISC metadata.xml 1043 BLAKE2B c4b1341082f3bd13a93ea378f61608a65ac7f904273932dcdbcf2a73ea8b4c7610ced855ed4a3fb61c7b02044db23bd0effda02d71b3114c7b4017c06784ac31 SHA512 879eca4059049ced098da9afe6aec250d174fabbc701e55ca6c22cfdf050b7c49289113a7e9ad99fa90685ca62c5f672201e04c7f0c766b55d780e26f8da59a2 +EBUILD bind-9.14.12.ebuild 11192 BLAKE2B c81ec4d1dbcefdff4ca0692757009f7628197a35e84e511dc0e3268721fb46f0afce28eed64ec4c74399689481f83cffccb3f9a2f98bec00c0b5d608d5f4edfc SHA512 750e44fd30c2467e3f71e64005ad072ce6bd07b13e5d7a3704000de46530f6c7252f24bf089d77db2369e7e17533649c0913859ac3acbf4fcb821c9d3a474e4b +EBUILD bind-9.16.4.ebuild 10370 BLAKE2B 1163eed6482b88e52b616f19e55191467134648ead8fdcd29c50ea349e0322d7db41e8cf2add79792756e0d3867b4d328fb3d77b843993c181782d6ffb569c9f SHA512 fe4bc1801f257d4fc4fc23f5e813d0ddb4cdc485ec586aa8b73ea1d91d4484501608002a569dca760a2b0f4d8854eb2980ad7ece12ed13cd46fa7d8c03001c10 +EBUILD bind-9.16.5.ebuild 10377 BLAKE2B 15ae693f70c8390c4b9734f64e8df7061ebef88def6ab0dda2412df50d9808ffd29d78f902d291d6df1b3925c2bcd1ee38f00c8c83981c009ca1d26d941e35f9 SHA512 0b294df5861a16427a5cf3a123b8add0659109c52c3d04e49bd4739209ac1a10f9e5f598de4b8dbf1746f1564169fb8a18cbd287a97cd554ec13b2f1e6a21590 +EBUILD bind-9.16.6.ebuild 10770 BLAKE2B eaf0ea9f707eff20e3a598e2fc1a16659643ba98d212fffbc92ada89a63a15d8281a7ba884033d4efa35bbef51fb9492059e0ee7aaedaf3a59bce6379523428e SHA512 8e647735caee371b1c2d7e0cffc8d5def8a40460853eb39fd626203d700ceb90f40569ff85160a1f26a48c1a38ea53dbe0194cf86ac3e227636b7a275f543788 +MISC metadata.xml 1043 BLAKE2B 3bf699db16f6883700e32e5f0debc534fa2d763aca0cf8fe3878dedcbb110410d88c2dbb69b4d4df09df62943416de3aaed7d53a2371d004b8c19a2a5a609bc1 SHA512 137093eabcbda1feb7cdac0cb0b2eeb808a47062b4e8d114874ee4019847ecbf5996c7b19055981a5ebffd099b5a96ce6ada919719017d83f93bc679334845b9 diff --git a/net-dns/bind/bind-9.14.12.ebuild b/net-dns/bind/bind-9.14.12.ebuild index a82d5e43bf15..1027fa4133c0 100644 --- a/net-dns/bind/bind-9.14.12.ebuild +++ b/net-dns/bind/bind-9.14.12.ebuild @@ -36,7 +36,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" # -berkdb by default re bug 602682 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs @@ -99,8 +99,6 @@ pkg_setup() { src_prepare() { default - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir) -ldl" - # Adjusting PATHs in manpages for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do sed -i \ diff --git a/net-dns/bind/bind-9.16.4.ebuild b/net-dns/bind/bind-9.16.4.ebuild index b7801db811dc..4514f38987ad 100644 --- a/net-dns/bind/bind-9.16.4.ebuild +++ b/net-dns/bind/bind-9.16.4.ebuild @@ -33,7 +33,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" # -berkdb by default re bug 602682 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs @@ -92,8 +92,6 @@ pkg_setup() { src_prepare() { default - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir) -ldl" - # should be installed by bind-tools sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die @@ -108,6 +106,7 @@ src_prepare() { src_configure() { local myeconfargs=( + AR="$(type -P $(tc-getAR))" --prefix="${EPREFIX}"/usr --sysconfdir=/etc/bind --localstatedir=/var @@ -159,8 +158,6 @@ src_install() { dodoc CHANGES README if use doc; then - dodoc doc/arm/Bv9ARM.pdf - docinto misc dodoc -r doc/misc/ @@ -193,7 +190,7 @@ src_install() { newenvd "${FILESDIR}"/10bind.env 10bind # Let's get rid of those tools and their manpages since they're provided by bind-tools - rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die + rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die diff --git a/net-dns/bind/bind-9.16.3.ebuild b/net-dns/bind/bind-9.16.5.ebuild index df80f163de4b..0399c16a1540 100644 --- a/net-dns/bind/bind-9.16.3.ebuild +++ b/net-dns/bind/bind-9.16.5.ebuild @@ -30,13 +30,10 @@ DESCRIPTION="Berkeley Internet Name Domain - Name Server" HOMEPAGE="https://www.isc.org/software/bind" SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )" -# sdb-ldap? ( -# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 -# )" LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # -berkdb by default re bug 602682 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs @@ -95,29 +92,6 @@ pkg_setup() { src_prepare() { default - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir) -ldl" - - # 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 @@ -132,6 +106,7 @@ src_prepare() { src_configure() { local myeconfargs=( + AR="$(type -P $(tc-getAR))" --prefix="${EPREFIX}"/usr --sysconfdir=/etc/bind --localstatedir=/var @@ -161,8 +136,8 @@ src_configure() { $(use_with zlib) ) - use geoip && myeconfargs+=( --with-geoip ) - use geoip2 && myeconfargs+=( --with-geoip2 ) + use geoip && myeconfargs+=( --enable-geoip ) + use geoip2 && myeconfargs+=( --with-maxminddb ) # bug #158664 # gcc-specs-ssp && replace-flags -O[23s] -O @@ -183,8 +158,6 @@ src_install() { dodoc CHANGES README if use doc; then - dodoc doc/arm/Bv9ARM.pdf - docinto misc dodoc -r doc/misc/ @@ -217,7 +190,7 @@ src_install() { newenvd "${FILESDIR}"/10bind.env 10bind # Let's get rid of those tools and their manpages since they're provided by bind-tools - rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die + rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die diff --git a/net-dns/bind/bind-9.16.6.ebuild b/net-dns/bind/bind-9.16.6.ebuild new file mode 100644 index 000000000000..20a3ac039e50 --- /dev/null +++ b/net-dns/bind/bind-9.16.6.ebuild @@ -0,0 +1,373 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# 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=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use 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}" + +# SDB-LDAP: http://bind9-ldap.bayour.com/ + +DESCRIPTION="Berkeley Internet Name Domain - Name Server" +HOMEPAGE="https://www.isc.org/software/bind" +SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz + doc? ( mirror://gentoo/dyndns-samples.tbz2 )" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +# -berkdb by default re bug 602682 +IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi +json ldap libressl lmdb mysql odbc postgres python selinux static-libs +urandom xml +zlib" +# sdb-ldap - patch broken +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +REQUIRED_USE=" + ?? ( geoip geoip2 ) + postgres? ( dlz ) + berkdb? ( dlz ) + mysql? ( dlz ) + odbc? ( dlz ) + ldap? ( dlz ) + dnsrps? ( dlz ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +DEPEND=" + acct-group/named + acct-user/named + !libressl? ( dev-libs/openssl:=[-bindist] ) + libressl? ( dev-libs/libressl:= ) + mysql? ( dev-db/mysql-connector-c:0= ) + odbc? ( >=dev-db/unixODBC-2.2.6 ) + ldap? ( net-nds/openldap ) + postgres? ( dev-db/postgresql:= ) + caps? ( >=sys-libs/libcap-2.1.0 ) + xml? ( dev-libs/libxml2 ) + geoip? ( >=dev-libs/geoip-1.4.6 ) + geoip2? ( dev-libs/libmaxminddb ) + gssapi? ( virtual/krb5 ) + json? ( dev-libs/json-c:= ) + lmdb? ( dev-db/lmdb ) + zlib? ( sys-libs/zlib ) + dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) + python? ( + ${PYTHON_DEPS} + dev-python/ply[${PYTHON_USEDEP}] + ) + dev-libs/libuv:= +" + +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-bind ) + sys-process/psmisc" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +# bug 710840, cmocka fails LDFLAGS='-Wl,-O1' +#RESTRICT="test" + +src_prepare() { + default + + # 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 + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + eautoreconf + + use python && python_copy_sources +} + +src_configure() { + bind_configure --without-python + use python && python_foreach_impl python_configure +} + +bind_configure() { + local myeconfargs=( + AR="$(type -P $(tc-getAR))" + --prefix="${EPREFIX}"/usr + --sysconfdir=/etc/bind + --localstatedir=/var + --with-libtool + --enable-full-report + --without-readline + --with-openssl="${EPREFIX}"/usr + --without-cmocka + $(use_enable caps linux-caps) + $(use_enable dnsrps) + $(use_enable dnstap) + $(use_enable fixed-rrset) + # $(use_enable static-libs static) + $(use_with berkdb dlz-bdb) + $(use_with dlz dlopen) + $(use_with dlz dlz-filesystem) + $(use_with dlz dlz-stub) + $(use_with gssapi) + $(use_with json json-c) + $(use_with ldap dlz-ldap) + $(use_with mysql dlz-mysql) + $(use_with odbc dlz-odbc) + $(use_with postgres dlz-postgres) + $(use_with lmdb) + $(use_with xml libxml2) + $(use_with zlib) + "${@}" + ) + + use geoip && myeconfargs+=( --enable-geoip ) + use geoip2 && myeconfargs+=( --with-maxminddb ) + + # 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 "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +python_configure() { + pushd "${BUILD_DIR}" >/dev/null || die + bind_configure --with-python + popd >/dev/null || die +} + +src_compile() { + default + use python && python_foreach_impl python_compile +} + +python_compile() { + pushd "${BUILD_DIR}"/bin/python >/dev/null || die + emake + popd >/dev/null || die +} + +src_install() { + default + + # don't create /var/run + rmdir "${ED}"/var/run || die + + dodoc CHANGES README + + if use doc; then + docinto misc + dodoc -r doc/misc/ + + # might a 'html' useflag make sense? + docinto html + dodoc -r doc/arm/ + + docinto contrib + dodoc contrib/scripts/{nanny.pl,named-bootconf.sh} + + # some handy-dandy dynamic dns examples + pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die + tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die + popd 1>/dev/null || die + fi + + insinto /etc/bind + newins "${FILESDIR}"/named.conf-r8 named.conf + + # ftp://ftp.rs.internic.net/domain/named.cache: + insinto /var/bind + newins "${FILESDIR}"/named.cache-r3 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 + + newenvd "${FILESDIR}"/10bind.env 10bind + + # Let's get rid of those tools and their manpages since they're provided by bind-tools + rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die + rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die + rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die + rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die + rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die + done + + # bug 405251, library archives aren't properly handled by --enable/disable-static + if ! use static-libs; then + find "${ED}" -type f -name '*.a' -delete || die + fi + + # bug 405251 + find "${ED}" -type f -name '*.la' -delete || die + + use python && python_foreach_impl python_install + + # 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} /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 + systemd_dotmpfilesd "${FILESDIR}"/named.conf + exeinto /usr/libexec + doexe "${FILESDIR}/generate-rndc-key.sh" +} + +python_install() { + pushd "${BUILD_DIR}"/bin/python >/dev/null || die + emake DESTDIR="${D}" install + python_scriptinto /usr/sbin + python_doscript dnssec-{checkds,coverage} + python_optimize + popd >/dev/null || die +} + +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 || die + chmod 0640 /etc/bind/rndc.key || die + 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} || die + mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die + mkdir -m 0750 -p ${CHROOT}/etc/bind || die + mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die + + chown root:named \ + ${CHROOT} \ + ${CHROOT}/var/{bind,log/named} \ + ${CHROOT}/run/named/ \ + ${CHROOT}/etc/bind \ + || die + + mknod ${CHROOT}/dev/null c 1 3 || die + chmod 0666 ${CHROOT}/dev/null || die + + mknod ${CHROOT}/dev/zero c 1 5 || die + chmod 0666 ${CHROOT}/dev/zero || die + + if use urandom; then + mknod ${CHROOT}/dev/urandom c 1 9 || die + chmod 0666 ${CHROOT}/dev/urandom || die + else + mknod ${CHROOT}/dev/random c 1 8 || die + chmod 0666 ${CHROOT}/dev/random || die + fi + + if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then + cp -a /etc/bind ${CHROOT}/etc/ || die + cp -a /var/bind ${CHROOT}/var/ || die + fi + + if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then + if use geoip; then + mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die + elif use geoip2; then + mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die + fi + 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 13f1a21373a7..e9cc55bb874b 100644 --- a/net-dns/bind/metadata.xml +++ b/net-dns/bind/metadata.xml @@ -2,13 +2,13 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>idl0r@gentoo.org</email> - <name>Christian Ruppert</name> - </maintainer> - <maintainer type="person"> <email>zlogene@gentoo.org</email> <name>Mikle Kolyada</name> </maintainer> + <maintainer type="person"> + <email>chutzpah@gentoo.org</email> + <name>Patrick McLean</name> + </maintainer> <use> <flag name="dnstap">Enables dnstap packet logging</flag> <flag name="dnsrps">Enable the DNS Response Policy Service (DNSRPS) API, a mechanism to allow an external response policy provider</flag> |