From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- net-dns/bind/Manifest | 8 +- net-dns/bind/bind-9.14.4.ebuild | 36 ++-- net-dns/bind/bind-9.14.5.ebuild | 372 ++++++++++++++++++++++++++++++++++++++++ net-dns/bind/bind-9.15.2.ebuild | 14 +- net-dns/bind/metadata.xml | 1 + 5 files changed, 401 insertions(+), 30 deletions(-) create mode 100644 net-dns/bind/bind-9.14.5.ebuild (limited to 'net-dns/bind') diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index f756aef81282..c5d06852a638 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -8,8 +8,10 @@ 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.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932 +DIST bind-9.14.5.tar.gz 6313555 BLAKE2B 46bde0f6f78ee15357bca0129022a6dd88941f633513a8d768b53d9c3bc0f4f7af4d8dc8cc4b1d6119d148700703b2fa27b6834671dcb5df9b544e4a2025452b SHA512 1b18eda5dea639f9b34e1c41b534704b0d5f64c036b766c9cfccf9bbeb586ce4ea7f0d098a5b2747e88aa403e48ad8ae0b6e560e93348f0dc7616f914671d084 DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac -EBUILD bind-9.14.4.ebuild 11630 BLAKE2B 8552b9a50399c437b8f66582b9379b382bcf2a0348661fae0a651cc0f831e33b666bb966b0ba54ccaaf833214bda2bc3f607f1ab051bd4807b22bc30b35cee17 SHA512 db8e49ebebb3c99c8d295301df04eca01d37b5803898c79d55118e92891f76a48800bc804639d002d13a7f22bd37140fb3252975a6fdcaff8ce25965a3578f9b -EBUILD bind-9.15.2.ebuild 11440 BLAKE2B c30e7efb317373682f1bcfebd8a4e7226f264907f93085bf711a4777e7be94cc73166159dd3ec7b15d64d94c92c8ec57f953b4d822a60e14baf6a83c1b3115c8 SHA512 4cf463d5226da0ac27e7b0c0334efdc300b79e9fc2eace784122c7106e258417a8ed9d60f0d42b4d2b23b3438cc556ce2848092da0fc5f0a44d05a673cdcfaf8 -MISC metadata.xml 1128 BLAKE2B 8d48c81803010ad0c5f3cc98da7a42b1a684c267f0422c8615fb02f9a9f59d368b923a888f3dd115ea00be7693e4ee292148bb8493f097666e9ff5bbc5e0e4a5 SHA512 80b67f58f87e6bb11ec12de7460cfbcdcca1494a0d0b9a64057dad43a5a9883ac222608dd717b49b4e56e513b2be57ccb70cfd30c987a436fdfa0f7cbe01fe97 +EBUILD bind-9.14.4.ebuild 11612 BLAKE2B ec1aed9cca707a5bf5248dbf0d7be564b68c4ca011235799dca4621827b35f19f5ede9a161b4caf3e0bf2f2790d3d2ee708b40bc96026a58fc27badd6891d5ba SHA512 acc4a3b1eea4fa388f3220f360433217a6697bd4d142d83d4bb6f05ed73edeebb14a6c0c94f112c635f2daad0421663ba931f682de6a90a0c8a0c82512296b78 +EBUILD bind-9.14.5.ebuild 11321 BLAKE2B d7dedb82cfa5ef77f53715e24e100e2c1add21ceb03607126e4a8fcc99ffcfe0b08f57b9296f7811186882c3d12a9f247accb78049d584f247d1a31a229f5c11 SHA512 5476cecbcc8198e6b57a33b8092cf02b495fb2259af9ebec0e8b79ae0e61f6323e30bbbed67b1247349bc358839785ec7a306eaca3297ccfb801c2b0de8b4bc4 +EBUILD bind-9.15.2.ebuild 11417 BLAKE2B 89c03b4ef7bb016be184503812513e270fd6608d6121525f241e60dcec1131c8206179ecc28fd152c1ec529c490ee8e13539b48b2c897cd0f9b6e219c916746a SHA512 298b38b6701f10d07d9860b6fdeafca10c46711b0a97520ca8b80d21e96dd6b9319114f86dab9a1002781b9b8344d19c676100ee0ca482540c73de408a182454 +MISC metadata.xml 1188 BLAKE2B 6da9a02bb959544829b980c3edfbe859b73e9f21485e78a23c00d9351fd933de5ba668ebffcffbec7da118116d95232ccaae7d4528de9c2dac6565cabc4f29cc SHA512 0589922970d0998c59e48e485c4475eede9a04cc5b029e1c4c2988d478e72287230613003777034b1df98042c0e7b4f79cfe22585c108b2c668d20710d43c655 diff --git a/net-dns/bind/bind-9.14.4.ebuild b/net-dns/bind/bind-9.14.4.ebuild index 73486f000eed..56b57d6e2972 100644 --- a/net-dns/bind/bind-9.14.4.ebuild +++ b/net-dns/bind/bind-9.14.4.ebuild @@ -39,7 +39,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 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" # -berkdb by default re bug 602682 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi -json ldap libressl lmdb mysql odbc postgres python selinux ssl static-libs +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 @@ -53,11 +53,8 @@ REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} )" # sdb-ldap? ( dlz ) -DEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0[-bindist] ) - libressl? ( dev-libs/libressl ) - ) +DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) + libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) @@ -78,7 +75,7 @@ DEPEND=" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-bind ) - || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )" + || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )" S="${WORKDIR}/${MY_P}" @@ -95,6 +92,8 @@ pkg_setup() { src_prepare() { default + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" + # Adjusting PATHs in manpages for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do sed -i \ @@ -152,7 +151,6 @@ src_configure() { $(use_with postgres dlz-postgres) $(use_with lmdb) $(use_with python) - $(use_with ssl openssl "${EPREFIX}"/usr) $(use_with xml libxml2) $(use_with zlib) ) @@ -211,19 +209,19 @@ src_install() { if use gost; then sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' \ - -i "${ED%/}/etc/init.d/named" || die + -i "${ED}/etc/init.d/named" || die else sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' \ - -i "${ED%/}/etc/init.d/named" || die + -i "${ED}/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 "${ED%/}"/usr/share/man/man1/{dig,host,nslookup}.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 + rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.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 @@ -244,16 +242,16 @@ src_install() { } python_foreach_impl install_python_tools - python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds" - python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage" + python_replicate_script "${ED}/usr/sbin/dnssec-checkds" + python_replicate_script "${ED}/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 + dosym "${ED}"/var/bind/pri /etc/bind/pri + dosym "${ED}"/var/bind/sec /etc/bind/sec + dosym "${ED}"/var/bind/dyn /etc/bind/dyn keepdir /var/bind/{pri,sec,dyn} dodir /var/log/named diff --git a/net-dns/bind/bind-9.14.5.ebuild b/net-dns/bind/bind-9.14.5.ebuild new file mode 100644 index 000000000000..6f05b895942c --- /dev/null +++ b/net-dns/bind/bind-9.14.5.ebuild @@ -0,0 +1,372 @@ +# Copyright 1999-2019 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=( python2_7 python3_{5,6,7} ) + +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}" + +# 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.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="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 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# -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 ) + python? ( ${PYTHON_REQUIRED_USE} )" +# sdb-ldap? ( dlz ) + +DEPEND="!libressl? ( dev-libs/openssl:0[-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}] + )" +# sdb-ldap? ( net-nds/openldap ) + +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-bind ) + || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )" + +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() { + default + + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" + + # 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 + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --sysconfdir=/etc/bind + --localstatedir=/var + --with-libtool + --enable-full-report + --without-readline + $(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 libjson) + $(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 python) + $(use_with xml libxml2) + $(use_with zlib) + ) + + use geoip && myeconfargs+=( --with-geoip ) + use geoip2 && myeconfargs+=( --with-geoip2 ) + + # 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 +} + +src_install() { + default + + dodoc CHANGES README + + if use doc; then + dodoc doc/arm/Bv9ARM.pdf + + 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}.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 + + if use python; then + install_python_tools() { + dosbin bin/python/dnssec-{checkds,coverage} + } + python_foreach_impl install_python_tools + + python_replicate_script "${ED}/usr/sbin/dnssec-checkds" + python_replicate_script "${ED}/usr/sbin/dnssec-coverage" + fi + + # bug 450406 + dosym named.cache /var/bind/root.cache + + dosym "${ED}"/var/bind/pri /etc/bind/pri + dosym "${ED}"/var/bind/sec /etc/bind/sec + dosym "${ED}"/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 + systemd_dotmpfilesd "${FILESDIR}"/named.conf + 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 || 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/bind-9.15.2.ebuild b/net-dns/bind/bind-9.15.2.ebuild index d1efa262a4a5..b26c1f1fbdb5 100644 --- a/net-dns/bind/bind-9.15.2.ebuild +++ b/net-dns/bind/bind-9.15.2.ebuild @@ -39,7 +39,7 @@ SLOT="0" KEYWORDS="" # -berkdb by default re bug 602682 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi -json ldap libressl lmdb mysql odbc postgres python selinux ssl static-libs +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 @@ -53,11 +53,8 @@ REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} )" # sdb-ldap? ( dlz ) -DEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0[-bindist] ) - libressl? ( dev-libs/libressl ) - ) +DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) + libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) @@ -78,7 +75,7 @@ DEPEND=" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-bind ) - || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )" + || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )" S="${WORKDIR}/${MY_P}" @@ -95,6 +92,8 @@ pkg_setup() { src_prepare() { default + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" + # Adjusting PATHs in manpages for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do sed -i \ @@ -152,7 +151,6 @@ src_configure() { $(use_with postgres dlz-postgres) $(use_with lmdb) $(use_with python) - $(use_with ssl openssl "${EPREFIX}"/usr) $(use_with xml libxml2) $(use_with zlib) ) diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml index 5c09dd2e7744..f9a219809fa9 100644 --- a/net-dns/bind/metadata.xml +++ b/net-dns/bind/metadata.xml @@ -15,6 +15,7 @@ Enable the DNS Response Policy Service (DNSRPS) API, a mechanism to allow an external response policy provider Enables dynamic loaded zones, 3rd party extension Enables fixed rrset-order option + Enable GeoIP2 API from MaxMind Enables gost OpenSSL engine support Enable gssapi support Enable JSON statistics channel -- cgit v1.2.3