From 2181b06bdcd8f58ef5b7b55f35d65def8d19bc76 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Thu, 1 Sep 2011 15:20:13 +0000 Subject: Version bump to 9.8.1. Add "dnssec-validation auto" example to named.conf. Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- net-dns/bind/ChangeLog | 8 +- net-dns/bind/Manifest | 20 +- net-dns/bind/bind-9.8.0_p4.ebuild | 378 ------------------------------------- net-dns/bind/bind-9.8.1.ebuild | 379 ++++++++++++++++++++++++++++++++++++++ net-dns/bind/files/named.conf-r5 | 7 + 5 files changed, 405 insertions(+), 387 deletions(-) delete mode 100644 net-dns/bind/bind-9.8.0_p4.ebuild create mode 100644 net-dns/bind/bind-9.8.1.ebuild (limited to 'net-dns') diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index 0e12d2ca138a..7d75a16399b1 100644 --- a/net-dns/bind/ChangeLog +++ b/net-dns/bind/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dns/bind # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.348 2011/07/09 16:31:30 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.349 2011/09/01 15:20:13 idl0r Exp $ + +*bind-9.8.1 (01 Sep 2011) + + 01 Sep 2011; Christian Ruppert -bind-9.8.0_p4.ebuild, + +bind-9.8.1.ebuild, files/named.conf-r5: + Version bump to 9.8.1. Add "dnssec-validation auto" example to named.conf. 09 Jul 2011; Raúl Porcel bind-9.7.3_p3.ebuild: alpha/arm/ia64/s390/sh/sparc stable wrt #374201 diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index decb7b67efff..2ec1a9315c42 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX 10bind.env 27 RMD160 872245707b4f72a212cda162c59495744d77a6e3 SHA1 7b8c1abd5910bb7a07c6b7c820c2b34a534b2593 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650 AUX 127.zone-r1 533 RMD160 2795c6c27912a73ac45582f33de3182382db3a5d SHA1 87fcb2b96db4cef99d25fa87759dd32ea2ac5559 SHA256 0fa4c294640d4191710647d1b18a2099f22ff674b3a35e6e81ff929f921da626 @@ -7,27 +7,31 @@ AUX bind-9.7.3-odbc-dlz-detect.patch 517 RMD160 2103729c77088500c9640206b4aa0fd3 AUX bind-dlzmysql5-reconnect.patch 1842 RMD160 687f6128b6511dbeecdfc81b197520b1afd74005 SHA1 7b9b8e1b85f1344e4b5d8566ab868fcb1e87a049 SHA256 7376ac37c2d3fbcf5d8e886008639bdbe642f44c9021f435af370bddd3f03bd4 AUX localhost.zone-r3 426 RMD160 b2dfe76923695e6eac49234b7e7f90fef4d1838e SHA1 b84babc535466cacc7001e4c6eb21e22ae11b22d SHA256 3f39e9b5be72435e961cd6f5acdfe396b05640bf370969acf918a939575122bc AUX named.cache 2941 RMD160 c29f47291496e67e72c129db488d07172fe244e6 SHA1 b1575428e8b5f513469a90a32cf163e8db46cab5 SHA256 35f7fcf2b177678cf362af7ac942f7f1a1c102c045dc3844991a411fc4c5d277 -AUX named.conf-r5 3952 RMD160 e4554204786565b08eefb9d129c7b8e0b3a55454 SHA1 cd5c48aa966760343a807c107839c82ba5b575a0 SHA256 fd1e2cbb7d2b3d00ae658a431c747a2adb35227bf6bc6996db1fe705cf2da943 +AUX named.conf-r5 4119 RMD160 d5447d9d6b368d18b4f67fe72014ce5b9149c571 SHA1 68ec3dad63621f8d079f0ec3d3c14f9d58be0978 SHA256 a5bcfe16562672e46550c2d84bfff63405998f512b639cc27a53f0b0fdf7f24e AUX named.confd-r6 1368 RMD160 8ea5c67af53a0986a09f1077a5dd722dd52c8b51 SHA1 64d5d6ead7fb5ba0ff8016b5fee2518fbde6f90c SHA256 704ac6954b2bad5d0bab19281dc703e86d9b4fe94d63dd00be1e525a3e64c492 AUX named.init-r10 5925 RMD160 acd84047fe945bb146c676a673eca9782362f4ad SHA1 bf91dabc72f693222c935eada9a21f7dc7dc2c2a SHA256 e7604579ed45cafdf121a65c5847b56aecb42356a213f7bac17474823431b24d AUX named.init-r11 6250 RMD160 12de95defb4de776b4399640be5ae7b2c91388f8 SHA1 9e8ab623ce45cc362b156fed8ffdd67c3294f740 SHA256 5fec01c26a37a793a7c812b0e0c22bd0a0142d1ebfabd21b1bf4f11b73c5526b DIST bind-9.7.3-P1.tar.gz 7586464 RMD160 838d9089b4f761608c0358a2f897654a7383357b SHA1 4c61aa9ca83310c18e2260748e2f1a5296c83d78 SHA256 5ff684039fda0df27b75a771b66dbe77fd612fb4ade5f4c15960fbb8d62bbbf1 DIST bind-9.7.3-P3.tar.gz 7586748 RMD160 456aed6a9c6e87de43d38860eaef2ee5d67e1f8e SHA1 90c5340daa94517e3bc7be89feef5ea6918fc390 SHA256 464e9aeeaf8d6964205621ead02898e076ebcfcbeef8c651dc695891c5622c37 DIST bind-9.8.0-P1-geoip-1.3.patch 54084 RMD160 d695b9aea249f308525d0938504ad61685e4d17c SHA1 4c4e40fc448e9effe7f1190728d3b623fae75b0e SHA256 988dadad30c54becc388c925ede32647419e34ee0fc689699e54d5c0843e233b -DIST bind-9.8.0-P4.tar.gz 7703981 RMD160 cd44fe00d5f052ab441c16b2e735ad5771b4230a SHA1 969864200c1516a8bea54266de60f316d79182b4 SHA256 ea2d9c30f41e680afc8b85eabd7c58865ce31d72009f2812d03078428869f415 +DIST bind-9.8.1.tar.gz 8450567 RMD160 a1a49ce0b1b6a5c6dd339fe160920cd4f39e2372 SHA1 7e6ed6ebc896b1de33a9f440233066c60539de4c SHA256 02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395ee7c92c DIST bind-geoip-1.3-9.7.2-P2.patch 54084 RMD160 fcc2308bd2832df821f76aeb1ea1c5740fadb6f3 SHA1 786c2fd8dde40f235e292f5bd883094863976580 SHA256 c12c03fc25a679d8d4296142597c698ab934e18cc761113553062a66be2875dd DIST bind-geoip-1.3-readme.txt 10040 RMD160 073956324ed4780e0e0cdbf40ae259f85ebef9d2 SHA1 e13ea2f458adfed3f1a20f9fe3eb2bfd484fc0b0 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845 DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 RMD160 eb7507dc4b1da0064516d9e75dbc435553b1c9ce SHA1 8c269cd172c6d90df38dab201cdd105eff03cbe3 SHA256 fe043a573ba187dcc8b0f7313d4408236e6916ec246b0443b7e71b33c8303ae9 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 EBUILD bind-9.7.3_p1.ebuild 11613 RMD160 bad58a3f45a5d909b4df04803d959e2c9affe0b4 SHA1 646d7a1fb10980e704fb8ed39f1acb3d70c2b55e SHA256 9aa8a6e64f914d8beeeb44dd1453ebe9dcbe2a7e7c7a913e651df7e2d3613e95 EBUILD bind-9.7.3_p3.ebuild 11547 RMD160 6e1ab2efcb184db200a53190b016a7d763499898 SHA1 dc534b640bb4ca05d7e3b700bc1c8a75b0d58ed9 SHA256 2e64fbe000308956c75c1edd324073f9cd377af1ad7320343a581ef03a719e27 -EBUILD bind-9.8.0_p4.ebuild 12181 RMD160 4e37e34af3009b173f9baf3d38d7fd7bb4083c45 SHA1 618e758e96a44c2c90eddc4140c573119d5345ba SHA256 1e68896f581712093742244ff957e1adb56c1d04894256d03c65a4c7092dbdb5 -MISC ChangeLog 59220 RMD160 dad2921ac109838c1889346e77257fc6f75be5d3 SHA1 3fd33706170fb6c084bcce947fca74b9f8102da9 SHA256 97883b6e570e9d9907d254d0a8ad28c34303ec6116d3762b3dfdb59ed82d4d4c +EBUILD bind-9.8.1.ebuild 12220 RMD160 c9d250770467d4ac5f99d0512d62cf177129ef0d SHA1 e5f53be022c2a8fde22db8e197e139006014d9a6 SHA256 be02a5f97c224154e3d71360b45010c41597f49f276630f02ad2926c545c7576 +MISC ChangeLog 59441 RMD160 8be92f46f57f877e361b49157545e458906ff45e SHA1 405d159faef3cef4a203a20554b5d0c66a17fd47 SHA256 6c15b4a8e922f32ca4c0fab7ad18700356d23e3e9d09cec5a6f4dcb648d47de8 MISC metadata.xml 686 RMD160 04372d2e822125106bfbec86f7f754b2f8381250 SHA1 efe392ad948d348fb8c1a9a38558fb3cc3e892c8 SHA256 ac17c78fd6d997049a1b1e49be8142e78514bec66e85099c8e946b300fde7c4a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4YgmgACgkQuQc30/atMkAGhACdEvKIAqtQr5qvW5ReXw/dvFYn -0LwAnimDWn5+eXnfYUFUq/V09nQYSYYw -=WyH1 +iQEcBAEBCAAGBQJOX6KzAAoJEMOx0zmdw4Z1lvQH/32W/k70KrohaXD3s00V+WhE +s7V54upL8TrulvWCppqrR4vRC7h/SNm0u169+x8yw3jQz5KXskYqT1WanTyDsX6Y +9ZVq/qfxza6fX/pXucXygqeiTrx8dZOCuH7GWjBGZNLyurqsDSszqi2fB404r3b+ +aajxxWFqFJmDgYGICCXdeMEx4VnWReOpBEXWN9VNBvppagxoZTAA7DjQOGVr7v5P +IrP+SAMCtAmryylZWH9Kc1MPeFB67iNSiFCFQo2iLm+vgx0kGE3kMGZ3arC9dE1t +CPD4y/P2hNgs6QCDy99OiqBNzWYHJ8GXD7GxeyMjQQsC5ePkzuZ+aUXew0v5iSM= +=p2kA -----END PGP SIGNATURE----- diff --git a/net-dns/bind/bind-9.8.0_p4.ebuild b/net-dns/bind/bind-9.8.0_p4.ebuild deleted file mode 100644 index 85cdb5e37b5e..000000000000 --- a/net-dns/bind/bind-9.8.0_p4.ebuild +++ /dev/null @@ -1,378 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.0_p4.ebuild,v 1.4 2011/07/09 14:44:43 jer Exp $ - -EAPI="3" - -inherit eutils autotools toolchain-funcs flag-o-matic multilib - -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.8.0-P1" -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/" - -DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server" -HOMEPAGE="http://www.isc.org/software/bind" -SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz - doc? ( mirror://gentoo/dyndns-samples.tbz2 ) - geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A} - ${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} ) - sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 )" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads - resolvconf urandom xml geoip gssapi sdb-ldap" - -DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g ) - mysql? ( >=virtual/mysql-4.0 ) - odbc? ( >=dev-db/unixODBC-2.2.6 ) - ldap? ( net-nds/openldap ) - idn? ( net-dns/idnkit ) - postgres? ( dev-db/postgresql-base ) - threads? ( >=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 )" - -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-bind ) - resolvconf? ( net-dns/openresolv ) - sys-process/psmisc" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - use threads && { - ewarn - ewarn "If you're in vserver enviroment, you're probably want to" - ewarn "disable threads support because of linux capabilities dependency" - ewarn - } - - 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 - # 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 - fi - - # should be installed by bind-tools - sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die - - # 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 - - if use geoip; then - cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die - sed -i -e 's:RELEASEVER=1:RELEASEVER=4:' ${GEOIP_PATCH_A} || die - epatch ${GEOIP_PATCH_A} - fi - - # bug #220361 - rm {aclocal,libtool}.m4 - WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf - - # remove useless c++ checks - epunt_cxx -} - -src_configure() { - local myconf="" - - use dlz && { - myconf="${myconf} --with-dlz-filesystem --with-dlz-stub" - use postgres && myconf="${myconf} --with-dlz-postgres" - use mysql && myconf="${myconf} --with-dlz-mysql" - use berkdb && myconf="${myconf} --with-dlz-bdb" - use ldap && myconf="${myconf} --with-dlz-ldap" - use odbc && myconf="${myconf} --with-dlz-odbc" - } - - if use threads; then - if use dlz && use mysql; then - ewarn - ewarn "MySQL uses thread local storage in its C api. Thus MySQL" - ewarn "requires that each thread of an application execute a MySQL" - ewarn "\"thread initialization\" to setup the thread local storage." - ewarn "This is impossible to do safely while staying within the DLZ" - ewarn "driver API. This is a limitation caused by MySQL, and not" - ewarn "the DLZ API." - ewarn "Because of this BIND MUST only run with a single thread when" - ewarn "using the MySQL driver." - ewarn - myconf="${myconf} --disable-linux-caps --disable-threads" - ewarn "Threading support disabled" - else - myconf="${myconf} --enable-linux-caps --enable-threads" - einfo "Threading support enabled" - fi - else - myconf="${myconf} --disable-linux-caps --disable-threads" - fi - - 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 - - export BUILD_CC=$(tc-getBUILD_CC) - econf \ - --sysconfdir=/etc/bind \ - --localstatedir=/var \ - --with-libtool \ - $(use_with ssl openssl) \ - $(use_with idn) \ - $(use_enable ipv6) \ - $(use_with xml libxml2) \ - $(use_with gssapi) \ - ${myconf} - - # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc CHANGES FAQ README - - if use idn; then - dodoc contrib/idn/README.idnkit || die - fi - - if use doc; then - dodoc doc/arm/Bv9ARM.pdf || die - - docinto misc - dodoc doc/misc/* || die - - # might a 'html' useflag make sense? - docinto html - dohtml -r doc/arm/* || die - - docinto draft - dodoc doc/draft/* || die - - docinto rfc - dodoc doc/rfc/* || die - - docinto contrib - dodoc contrib/named-bootconf/named-bootconf.sh \ - contrib/nanny/nanny.pl || die - - # some handy-dandy dynamic dns examples - cd "${D}"/usr/share/doc/${PF} - tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die - fi - - use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A} - - insinto /etc/bind - newins "${FILESDIR}"/named.conf-r5 named.conf || die - - # ftp://ftp.rs.internic.net/domain/named.cache: - insinto /var/bind - doins "${FILESDIR}"/named.cache || die - - insinto /var/bind/pri - newins "${FILESDIR}"/127.zone-r1 127.zone || die - newins "${FILESDIR}"/localhost.zone-r3 localhost.zone || die - - newinitd "${FILESDIR}"/named.init-r11 named || die - newconfd "${FILESDIR}"/named.confd-r6 named || die - - if use ssl && [ -e /usr/lib/engines/libgost.so ]; 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 || die - - # 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} - - dosym /var/bind/named.cache /var/bind/root.cache || die - dosym /var/bind/pri /etc/bind/pri || die - dosym /var/bind/sec /etc/bind/sec || die - dosym /var/bind/dyn /etc/bind/dyn || die - keepdir /var/bind/{pri,sec,dyn} - - dodir /var/{run,log}/named || die - - fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn} - fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf} - fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf} - fperms 0750 /etc/bind /var/bind/pri - fperms 0770 /var/{run,log}/named /var/bind/{,sec,dyn} -} - -pkg_postinst() { - if [ ! -f '/etc/bind/rndc.key' ]; then - if use urandom; then - einfo "Using /dev/urandom for generating rndc.key" - /usr/sbin/rndc-confgen -r /dev/urandom -a - echo - else - einfo "Using /dev/random for generating rndc.key" - /usr/sbin/rndc-confgen -a - echo - fi - chown root:named /etc/bind/rndc.key - chmod 0640 /etc/bind/rndc.key - fi - - einfo - einfo "You can edit /etc/conf.d/named to customize named settings" - einfo - use mysql || use postgres || use ldap && { - elog "If your named depends on MySQL/PostgreSQL or LDAP," - elog "uncomment the specified rc_named_* lines in your" - elog "/etc/conf.d/named config to ensure they'll start before bind" - einfo - } - einfo "If you'd like to run bind in a chroot AND this is a new" - einfo "install OR your bind doesn't already run in a chroot:" - einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named." - einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`" - einfo - - CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) - if [[ -n ${CHROOT} ]]; then - elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" - elog "To enable the old behaviour (without using mount) uncomment the" - elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config." - elog "If you decide to use the new/default method, ensure to make backup" - elog "first and merge your existing configs/zones to /etc/bind and" - elog "/var/bind because bind will now mount the needed directories into" - elog "the chroot dir." - fi - - ewarn - ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache" - ewarn "you may need to fix your named.conf!" - ewarn - ewarn "NOTE: If you upgrade from =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 + fi + + # should be installed by bind-tools + sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die + + # 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 + + if use geoip; then + cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die + sed -i -e 's:RELEASETYPE=-P:RELEASETYPE=:' \ + -e 's:RELEASEVER=1:RELEASEVER=:' ${GEOIP_PATCH_A} || die + epatch ${GEOIP_PATCH_A} + fi + + # bug #220361 + rm {aclocal,libtool}.m4 + WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf + + # remove useless c++ checks + epunt_cxx +} + +src_configure() { + local myconf="" + + use dlz && { + myconf="${myconf} --with-dlz-filesystem --with-dlz-stub" + use postgres && myconf="${myconf} --with-dlz-postgres" + use mysql && myconf="${myconf} --with-dlz-mysql" + use berkdb && myconf="${myconf} --with-dlz-bdb" + use ldap && myconf="${myconf} --with-dlz-ldap" + use odbc && myconf="${myconf} --with-dlz-odbc" + } + + if use threads; then + if use dlz && use mysql; then + ewarn + ewarn "MySQL uses thread local storage in its C api. Thus MySQL" + ewarn "requires that each thread of an application execute a MySQL" + ewarn "\"thread initialization\" to setup the thread local storage." + ewarn "This is impossible to do safely while staying within the DLZ" + ewarn "driver API. This is a limitation caused by MySQL, and not" + ewarn "the DLZ API." + ewarn "Because of this BIND MUST only run with a single thread when" + ewarn "using the MySQL driver." + ewarn + myconf="${myconf} --disable-linux-caps --disable-threads" + ewarn "Threading support disabled" + else + myconf="${myconf} --enable-linux-caps --enable-threads" + einfo "Threading support enabled" + fi + else + myconf="${myconf} --disable-linux-caps --disable-threads" + fi + + 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 + + export BUILD_CC=$(tc-getBUILD_CC) + econf \ + --sysconfdir=/etc/bind \ + --localstatedir=/var \ + --with-libtool \ + $(use_with ssl openssl) \ + $(use_with idn) \ + $(use_enable ipv6) \ + $(use_with xml libxml2) \ + $(use_with gssapi) \ + ${myconf} + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_install() { + emake DESTDIR="${D}" install || die + + dodoc CHANGES FAQ README + + if use idn; then + dodoc contrib/idn/README.idnkit || die + fi + + if use doc; then + dodoc doc/arm/Bv9ARM.pdf || die + + docinto misc + dodoc doc/misc/* || die + + # might a 'html' useflag make sense? + docinto html + dohtml -r doc/arm/* || die + + docinto draft + dodoc doc/draft/* || die + + docinto rfc + dodoc doc/rfc/* || die + + docinto contrib + dodoc contrib/named-bootconf/named-bootconf.sh \ + contrib/nanny/nanny.pl || die + + # some handy-dandy dynamic dns examples + cd "${D}"/usr/share/doc/${PF} + tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die + fi + + use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A} + + insinto /etc/bind + newins "${FILESDIR}"/named.conf-r5 named.conf || die + + # ftp://ftp.rs.internic.net/domain/named.cache: + insinto /var/bind + doins "${FILESDIR}"/named.cache || die + + insinto /var/bind/pri + newins "${FILESDIR}"/127.zone-r1 127.zone || die + newins "${FILESDIR}"/localhost.zone-r3 localhost.zone || die + + newinitd "${FILESDIR}"/named.init-r11 named || die + newconfd "${FILESDIR}"/named.confd-r6 named || die + + if use ssl && [ -e /usr/lib/engines/libgost.so ]; 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 || die + + # 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} + + dosym /var/bind/named.cache /var/bind/root.cache || die + dosym /var/bind/pri /etc/bind/pri || die + dosym /var/bind/sec /etc/bind/sec || die + dosym /var/bind/dyn /etc/bind/dyn || die + keepdir /var/bind/{pri,sec,dyn} + + dodir /var/{run,log}/named || die + + fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn} + fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf} + fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf} + fperms 0750 /etc/bind /var/bind/pri + fperms 0770 /var/{run,log}/named /var/bind/{,sec,dyn} +} + +pkg_postinst() { + if [ ! -f '/etc/bind/rndc.key' ]; then + if use urandom; then + einfo "Using /dev/urandom for generating rndc.key" + /usr/sbin/rndc-confgen -r /dev/urandom -a + echo + else + einfo "Using /dev/random for generating rndc.key" + /usr/sbin/rndc-confgen -a + echo + fi + chown root:named /etc/bind/rndc.key + chmod 0640 /etc/bind/rndc.key + fi + + einfo + einfo "You can edit /etc/conf.d/named to customize named settings" + einfo + use mysql || use postgres || use ldap && { + elog "If your named depends on MySQL/PostgreSQL or LDAP," + elog "uncomment the specified rc_named_* lines in your" + elog "/etc/conf.d/named config to ensure they'll start before bind" + einfo + } + einfo "If you'd like to run bind in a chroot AND this is a new" + einfo "install OR your bind doesn't already run in a chroot:" + einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named." + einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`" + einfo + + CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) + if [[ -n ${CHROOT} ]]; then + elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + elog "To enable the old behaviour (without using mount) uncomment the" + elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + elog "If you decide to use the new/default method, ensure to make backup" + elog "first and merge your existing configs/zones to /etc/bind and" + elog "/var/bind because bind will now mount the needed directories into" + elog "the chroot dir." + fi + + ewarn + ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache" + ewarn "you may need to fix your named.conf!" + ewarn + ewarn "NOTE: If you upgrade from