From 2d3801b2a2aae04a2e03e572487fcfb0aaa1f6ea Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Sat, 24 Dec 2011 22:45:39 +0000 Subject: [PATCH] Cleanup. Package-Manager: portage-2.1.10.41/cvs/Linux i686 --- net-dns/bind/ChangeLog | 6 +- net-dns/bind/Manifest | 27 +-- net-dns/bind/bind-9.7.3_p3.ebuild | 363 ------------------------------ net-dns/bind/bind-9.7.4.ebuild | 363 ------------------------------ net-dns/bind/files/named.init-r10 | 235 ------------------- 5 files changed, 6 insertions(+), 988 deletions(-) delete mode 100644 net-dns/bind/bind-9.7.3_p3.ebuild delete mode 100644 net-dns/bind/bind-9.7.4.ebuild delete mode 100644 net-dns/bind/files/named.init-r10 diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index db94e7191b0d..baaff4402158 100644 --- a/net-dns/bind/ChangeLog +++ b/net-dns/bind/ChangeLog @@ -1,6 +1,10 @@ # 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.365 2011/12/22 22:33:28 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.366 2011/12/24 22:45:39 idl0r Exp $ + + 24 Dec 2011; Christian Ruppert -bind-9.7.3_p3.ebuild, + -bind-9.7.4.ebuild, -files/named.init-r10: + Cleanup. 22 Dec 2011; Mark Loeser bind-9.7.4_p1.ebuild: Stable for ppc/ppc64; bug #390753 diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index 259edcf14308..f7128a7cf946 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 10bind.env 27 RMD160 872245707b4f72a212cda162c59495744d77a6e3 SHA1 7b8c1abd5910bb7a07c6b7c820c2b34a534b2593 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650 AUX 127.zone-r1 533 RMD160 2795c6c27912a73ac45582f33de3182382db3a5d SHA1 87fcb2b96db4cef99d25fa87759dd32ea2ac5559 SHA256 0fa4c294640d4191710647d1b18a2099f22ff674b3a35e6e81ff929f921da626 AUX bind-9.7.3-odbc-dlz-detect.patch 517 RMD160 2103729c77088500c9640206b4aa0fd3888e0555 SHA1 28ab80dfe8f9d65d52fbf3f8b33a7522388d526a SHA256 69797543bf723e3e3e7405f0130d14754ad26830d45977efebdd35848b7b03aa @@ -10,11 +7,8 @@ AUX localhost.zone-r3 426 RMD160 b2dfe76923695e6eac49234b7e7f90fef4d1838e SHA1 b AUX named.cache 2941 RMD160 c29f47291496e67e72c129db488d07172fe244e6 SHA1 b1575428e8b5f513469a90a32cf163e8db46cab5 SHA256 35f7fcf2b177678cf362af7ac942f7f1a1c102c045dc3844991a411fc4c5d277 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 6134 RMD160 e006702b9c5bd7d63b32d4c8f2d2e53eaa5facde SHA1 95cef2357b7dedad435b267d3b47860cbf06c365 SHA256 8de85e03b2c1e8cc6e79a65e70a1c85a3d873d956425fef3291626c2db006884 -DIST bind-9.7.3-P3.tar.gz 7586748 RMD160 456aed6a9c6e87de43d38860eaef2ee5d67e1f8e SHA1 90c5340daa94517e3bc7be89feef5ea6918fc390 SHA256 464e9aeeaf8d6964205621ead02898e076ebcfcbeef8c651dc695891c5622c37 DIST bind-9.7.4-P1.tar.gz 8317704 RMD160 653b28820d81608f0e85d2321541902c8de2231f SHA1 bcc1dda52d1ba23f5b0e30ea3f7dd76c27f1c93f SHA256 e23ca1af22424d512094da2a175d8f9500e8b0b10cbd332714d211ea1abdd55d -DIST bind-9.7.4.tar.gz 8316839 RMD160 2da39514b7b79aa9a3c9ce10c239514dee610194 SHA1 a526bf9a7114988d895e7a9c5be175a8386c6904 SHA256 7cd5fbda1a7ea09914c8cdd04afbeb7d48617d02d9df0135cd9b0b7a1ca4a6bf DIST bind-9.8.0-P1-geoip-1.3.patch 54084 RMD160 d695b9aea249f308525d0938504ad61685e4d17c SHA1 4c4e40fc448e9effe7f1190728d3b623fae75b0e SHA256 988dadad30c54becc388c925ede32647419e34ee0fc689699e54d5c0843e233b DIST bind-9.8.1-P1.tar.gz 8451969 RMD160 3183167d73a5da81e7e286a6eb123fc8684f4421 SHA1 1cff6594aa185d84942edd2f3cc06dff9cebb04b SHA256 867fdd52d3436c6ab6d357108d7f9eaaf03f1422652e6e61c742816ff7f87929 DIST bind-9.8.1.tar.gz 8450567 RMD160 a1a49ce0b1b6a5c6dd339fe160920cd4f39e2372 SHA1 7e6ed6ebc896b1de33a9f440233066c60539de4c SHA256 02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395ee7c92c @@ -22,27 +16,8 @@ DIST bind-geoip-1.3-9.7.2-P2.patch 54084 RMD160 fcc2308bd2832df821f76aeb1ea1c574 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_p3.ebuild 11549 RMD160 d8773e17b340f6d73589ede19fd1ed04fb207167 SHA1 2be6e03e72edbff841b6c9817e27c8c14897ae50 SHA256 6ff108b0cae84af3c4c7023474de2dffb49d894f92ec20f0502d21d806722cbd -EBUILD bind-9.7.4.ebuild 11562 RMD160 1a943a31178572ddd376f52189c44e750827a963 SHA1 edfa3b98fcd29050a50f6c4c83cff7cce248cd4e SHA256 a90e6483a9cedde9487f1873535d1f263632ea7ba4573fc60b709266b86f7893 EBUILD bind-9.7.4_p1.ebuild 11513 RMD160 0af7e3e83715140bba315266f518ecefb888b5f3 SHA1 14028d20199a5f57f29a066dd214252cb11115d1 SHA256 50d14ace4eeac85c24b6d0444655d14717c75623cccd3ad321abe8b853cb0152 EBUILD bind-9.8.1.ebuild 11826 RMD160 a6ad80de98e1335da7bdeb580d3509145f169e3d SHA1 d9d0097b4ef8e728b8ead39ec408cd732b899890 SHA256 507f3d861dc0e72e8c57883af3f88524b8cd67b02a74c570f850391704af33b7 EBUILD bind-9.8.1_p1.ebuild 11861 RMD160 0eea330017d0aef8188a02846b2fb019cc9de288 SHA1 8f6cb39ef3a1dd4cc8eeba10c1352d20f4d8ae31 SHA256 6c8601ff3307e0e418a634ff6915d8f2e3397e648efa96667bf17c9e106cfebd -MISC ChangeLog 61799 RMD160 d9f227db072e86dabbc011e9b77a544a510dfa7b SHA1 dbe41f94eb0c919b2f0daffd856469c512e097f1 SHA256 6438ef13af5b3cb7c8e1600f912876ff263158afb84bfb80baed750a1897f766 +MISC ChangeLog 61929 RMD160 2d0c298ff4b60195edb2cfcca0d3d0a2ee8cf7df SHA1 571be0d22e95e1d07ffd6cf54b2fa1465048d9b2 SHA256 f6efe3dd1dd48ec742cd65cc39373ea9af0854440d1e115b2c826bb7879222e1 MISC metadata.xml 887 RMD160 3c0fdcaacc812fc3e558afbbdb91dd6efbf377f9 SHA1 73e55d5772ca66d165643bf389847234c32593d7 SHA256 c0a53163775c42b68ed319c68f18234d8e6d908b318066a0d533bf7bcd40ce7c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBAgAGBQJO87BDAAoJEPTTRK0uRVaNG8IP/i61z3YogW1ifOFs3qijv+Wr -Px8hs7kT+SxCzer52m+fM7SKCZc7EQAex1GJ4QolYHLp/CqSqykNshxyqBjQx8Bo -771YjZVYa+h5SWiR2CwRNXRX1TrxG2fKhqqk5DfxE6IQjfgjlCOTxP1Jnq0yUp87 -HABwyfzZPwN4yTzFJHNgPIC1jds0Ji8DfyuJn19EIRlQP+1uouwA9B/DN6SJJJl6 -f00v6wHP1toGddOCp7k5FpL3zw2HlsaBjhf8q4inSm03TdzBOY6pJlFx3vuknUCE -b03OjXlp7QC7+mK9/jzNK3XryXYMwD+oqkln+yotYZNWuXP52g+A66cQJ3cf0UhI -hrw7XF4Tcfq3zbodstHFCTiuzB6qc9i3djh0DbtJbu0Z7CGXHfcGLo99+OQaF7Vd -1wFDORYAtyXCnqW5323lQg19wiI1OLqpvFlvnUDBgH+8IW7dqEFPxrufnokjUERa -+md/Y61wUaWjRXx6q0wiN8HZYnPjEBM2QuOZ7YQ+rsx+SoX4hmeZ9pgv17hatjEF -nZ/8WOuwmGkHW7b7iYp3QJAuYB8JgKWxalTkJkyICzvJ5YjdZzTa2ldvos04Jkmb -iLrl/I+pHu1+tAgPHrDl8gIKlA1Gxosbt4xTnLL0zgbgL4uNtqTUYj/oeQuOFfag -ibvtAV8Nn8Hfi5dHb8YM -=Kq4r ------END PGP SIGNATURE----- diff --git a/net-dns/bind/bind-9.7.3_p3.ebuild b/net-dns/bind/bind-9.7.3_p3.ebuild deleted file mode 100644 index 54025bf7a07c..000000000000 --- a/net-dns/bind/bind-9.7.3_p3.ebuild +++ /dev/null @@ -1,363 +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.7.3_p3.ebuild,v 1.7 2011/11/29 16:27:10 chainsaw Exp $ - -EAPI="3" - -inherit eutils autotools toolchain-funcs flag-o-matic - -MY_PV="${PV/_p/-P}" -MY_P="${PN}-${MY_PV}" - -SDB_LDAP_VER="1.1.0-fc14" - -GEOIP_PV=1.3 -#GEOIP_PV_AGAINST="${MY_PV}" -GEOIP_PV_AGAINST="9.7.2-P2" -GEOIP_P="bind-geoip-${GEOIP_PV}" -GEOIP_PATCH_A="${GEOIP_P}-${GEOIP_PV_AGAINST}.patch" -GEOIP_DOC_A="${GEOIP_P}-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 environment, you'll 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}/bind-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:PATCHVER=2:PATCHVER=3:' \ - -e 's/RELEASEVER=2/RELEASEVER=3/' \ - ${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 - - 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}/bind-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=2: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 - - 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/null; do - if [ "${reported}" -eq 0 ]; then - einfo "Waiting until all named processes are stopped" - reported=1 - fi - sleep 1 - done - - [ "${CHROOT_GEOIP:-0}" -eq 1 ] && _umount ${CHROOT}/usr/share/GeoIP - _umount ${CHROOT}/etc/bind - _umount ${CHROOT}/var/log/named - _umount ${CHROOT}/var/bind - fi - - eend $? -} - -reload() { - local ret - - ebegin "Reloading named.conf and zone files" - - checkconfig || { eend 1; return 1; } - - _get_pidfile - if [ -n "${PIDFILE}" ]; then - # FIXME: Remove --stop and --oknodo as soon as baselayout-1 has been removed... finally... - start-stop-daemon --stop --oknodo --pidfile $PIDFILE --signal HUP --exec /usr/sbin/named - ret=$? - else - ewarn "Unable to determine the pidfile... this is" - ewarn "a fallback mode. Please check your installation!" - - $RC_SERVICE restart - ret=$? - fi - - eend $ret -} -- 2.26.2