From: Christian Ruppert Date: Sat, 19 Jun 2010 11:16:05 +0000 (+0000) Subject: Version bump to 9.7.1. Remove bind-9.6.1-parallel.patch, bind-9.4.0-dlzbdb-close_curs... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=98054d668fcaf2e9ffd59cc1368120d15b8d97e6;p=gentoo.git Version bump to 9.7.1. Remove bind-9.6.1-parallel.patch, bind-9.4.0-dlzbdb-close_cursor.patch, bind-9.6.1-dlz-patch-ldap-url.patch and bind-9.6.1-dlz-patch-dollar2.patch since they're now applied by upstream. Fix init dependencies/after, see bug 295260. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index b72cdc1fbac4..557f46408239 100644 --- a/net-dns/bind/ChangeLog +++ b/net-dns/bind/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-dns/bind # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.279 2010/06/17 20:44:37 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.280 2010/06/19 11:16:05 idl0r Exp $ + +*bind-9.7.1 (19 Jun 2010) + + 19 Jun 2010; Christian Ruppert +bind-9.7.1.ebuild: + Version bump to 9.7.1. Remove bind-9.6.1-parallel.patch, + bind-9.4.0-dlzbdb-close_cursor.patch, bind-9.6.1-dlz-patch-ldap-url.patch + and bind-9.6.1-dlz-patch-dollar2.patch since they're now applied by + upstream. Fix init dependencies/after, see bug 295260. 17 Jun 2010; Patrick Lauer bind-9.6.2_p2.ebuild, bind-9.7.0_p2-r1.ebuild: diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index a5560c226f6c..19fe60237a3a 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -1,3 +1,6 @@ +-----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.4.0-dlzbdb-close_cursor.patch 338 RMD160 3c92206a6c77ac8e9ea854dfc22fda5753b653a9 SHA1 903383e2b142d76a73030c27f2cdab8d100df150 SHA256 4a004d72565d6db683b879851ae8dfaddcf1b39fd0f97a995d9c5d22d72c6395 @@ -16,6 +19,7 @@ AUX named.init-r7 3449 RMD160 e3200442c35dd4b94dc31083aa0bff3550f6e3d6 SHA1 777b DIST bind-9.4.3-P5.tar.gz 6447497 RMD160 680146e4120aaa89f2899d4205c17fee5e9e4aa9 SHA1 9b7f0bd84be0f91fe1085cedc91c7c14f1e0f97a SHA256 7ca93553d1f488af1b21ab26f0297be5c7b7b5920d29ad9743382bf3623b2939 DIST bind-9.6.2-P2.tar.gz 6543309 RMD160 0706aa4f4f6cd4927d2e8ff72d5fb8a91be94fa9 SHA1 fce8067d3ff03366d5ee305adf941b5c41e41d07 SHA256 233404ea08c4880eb867ee4e1084d96cff748a2bdd8857014203bef511f17e64 DIST bind-9.7.0-P2.tar.gz 7125822 RMD160 e77877f9ef7341071f4f458863ebe715e2f6506f SHA1 4b805d4a66075a88c93c5b852b928da96467aa2d SHA256 872906cf729511f725dfef21790b5d54b89dd257e586185135db9221568e3f54 +DIST bind-9.7.1.tar.gz 7547503 RMD160 eb57f77ed9afc3481e698668c3a54c254829d8a4 SHA1 e2540c02b8979b5c8a7303e5a0081c00f9cee7ae SHA256 0a720ea095f5d9fddf76571e3f39ec07f0300e1f0970330f74d340e2f8bea8c8 DIST bind-geoip-1.3-readme.txt 10040 RMD160 073956324ed4780e0e0cdbf40ae259f85ebef9d2 SHA1 e13ea2f458adfed3f1a20f9fe3eb2bfd484fc0b0 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845 DIST bind-geoip-1.3.patch 54070 RMD160 5d01a20104b572588507aea4b8f6cbf66f68a973 SHA1 8a465d04d5c2d9c7cb881c3331a64e61077e1e3a SHA256 126db2f6e603f0dbe102b3ddfda85e0243fae314b40bb16dce2fd7d4d4bb93b4 DIST bind-sdb-ldap-1.1.0.tar.bz2 5883 RMD160 ec2f684f278e5fa72158486a14dfce3005a62602 SHA1 fae539a29615fda56a2dcb55a1e01d335835b980 SHA256 afe9cc6a99c20f1dc1929b0a30ff815b0aac509a6c12f8df432853c856d35754 @@ -23,5 +27,13 @@ DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d S EBUILD bind-9.4.3_p5.ebuild 9208 RMD160 6e7ff13da934a07ba7973e886b0ac03aa7033fb0 SHA1 8320223ec6b82e8988ca23f994457175c25caef0 SHA256 ae0e300cc78a666ef49c7f84432c14f4238b7017e7b579054e54397c28946e3e EBUILD bind-9.6.2_p2.ebuild 9671 RMD160 728fcf92b7e8aad9dcbe165faaf9415e1289a5c7 SHA1 67a6692881c1de4107b5bc378d061d0e8024dd8f SHA256 b5776c6aa55606933dd7176d796276014819d9f68fb0b220936dafcd7518be86 EBUILD bind-9.7.0_p2-r1.ebuild 9696 RMD160 25a6c0e2c965637e336412deff6d9a99c49794ca SHA1 76ce48298d9eb4469976b017f20bd49597964eb1 SHA256 08f6f3521b41966bcef6f6ca4e13838e84472eac63b104c8ff8fedeaf2d1ab76 -MISC ChangeLog 46013 RMD160 a09f2b718031b9e987580263cf3093730b06aefe SHA1 6a10cfc42449aaabb1354c58937865eb120f283f SHA256 7eb6d05bb42bf251b4a459cc7e4a0090549e5469446cdd27d667c559a3aff938 +EBUILD bind-9.7.1.ebuild 9793 RMD160 5b4a58eb6941701bc0185247a99ab934974d21b0 SHA1 a2fc6fdd74a04d102189c03499b6904513119fe8 SHA256 8fa8ee9bba80dace14a37e01701d694c2a82589a552102023a25b8c9b04b833f +MISC ChangeLog 46373 RMD160 5e73330ac4f93589917909f2aae2967b1545fab6 SHA1 e3b5003483753798fa8e1075e1eacd286ea8b413 SHA256 2f2c72b45c2f50fb2689da4a71dfc9c1ad2fdcb5e6797bfab0fe12749abdc2c2 MISC metadata.xml 737 RMD160 0cbffb033579ba6f469d170bb62ba69f0563cae5 SHA1 6e94367e2ae674bf79564ea9cf2e1ed0a3a6bd5b SHA256 3ab38734eb17c86f947d58737ec5d85031ac5d2a18fc489dd1f925b128e4c738 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkwcpwAACgkQixe2jn+ufTj1CACfR0U7EvMXhuNgAgwciK7hGnJP +c8kAn2jwWkaXZIyVEkbQSwoZyo3r6Y4J +=ZkU1 +-----END PGP SIGNATURE----- diff --git a/net-dns/bind/bind-9.7.1.ebuild b/net-dns/bind/bind-9.7.1.ebuild new file mode 100644 index 000000000000..d631a85ea683 --- /dev/null +++ b/net-dns/bind/bind-9.7.1.ebuild @@ -0,0 +1,322 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.1.ebuild,v 1.1 2010/06/19 11:16:05 idl0r 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" + +GEOIP_PV=1.3 +GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/" +GEOIP_P="bind-geoip-${GEOIP_PV}" + +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 + sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.bz2 ) + doc? ( mirror://gentoo/dyndns-samples.tbz2 ) + geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_P}-readme.txt + ${GEOIP_SRC_URI_BASE}/files/${GEOIP_P}.patch )" + +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 sdb-ldap xml geoip" + +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 )" + +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-bind ) + resolvconf? ( net-dns/openresolv )" + +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/) + use mysql && has_version ">=dev-db/mysql-5" && epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch + 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/ + use sdb-ldap && epatch "${WORKDIR}"/sdb-ldap/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch + + if use geoip; then + cp "${DISTDIR}"/${GEOIP_P}.patch "${S}" || die + sed -i -e 's/RELEASETYPE=-P/RELEASETYPE=/' \ + -e 's/-RELEASEVER=3/-RELEASEVER=/' \ + -e 's/+RELEASEVER=3-geoip-1.3/+RELEASEVER=geoip-1.3/' \ + ${GEOIP_P}.patch || die + epatch ${GEOIP_P}.patch + 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) \ + ${myconf} + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_install() { + local init_deps= + + emake DESTDIR="${D}" install || die + + dodoc CHANGES FAQ README || die + + 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_P}-readme.txt + + insinto /etc/bind + newins "${FILESDIR}"/named.conf-r4 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-r7 named || die + # bug 295260 + use mysql && init_deps="${init_deps} mysql" + use ldap && init_deps="${init_deps} ldap" + use postgres && init_deps="${init_deps} postgresql pg_autovacuum" + if [[ -n $init_deps ]]; then + sed -i -e "s:after .*:after ${init_deps}:" "${D}/etc/init.d/named" || die + else + sed -i -e 's:after .*::' "${D}/etc/init.d/named" || die + fi + + newconfd "${FILESDIR}"/named.confd-r3 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 + keepdir /var/bind/sec + + dodir /var/{run,log}/named || die + + fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri} + 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} +} + +pkg_postinst() { + if [ ! -f '/etc/bind/rndc.key' ]; then + if [ -c /dev/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 "The default zone files are now installed as *.zone," + einfo "be careful merging config files if you have modified" + einfo "/var/bind/pri/127.zone or /var/bind/pri/localhost.zone" + einfo + einfo "You can edit /etc/conf.d/named to customize named settings" + 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} && -d ${CHROOT} ]]; then + ewarn "NOTE: as of 'bind-9.6.1' the chroot part of the init-script got some major changes." + fi +} + +pkg_config() { + CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) + + 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 'bind-9.6.1' the chroot part of the init-script got some major changes." + ewarn + ewarn "${CHROOT} already exists... some things might become overridden" + ewarn "press CTRL+C if you don't want to continue" + sleep 10 + fi + + echo; einfo "Setting up the chroot directory..." + + mkdir -m 0750 -p ${CHROOT} + mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/{run,log}} + mkdir -m 0750 -p ${CHROOT}/etc/bind + mkdir -m 0770 -p ${CHROOT}/var/{bind,{run,log}/named} + chown root:named ${CHROOT} ${CHROOT}/var/{bind,{run,log}/named} ${CHROOT}/etc/bind + + cp /etc/localtime ${CHROOT}/etc/localtime + + mknod ${CHROOT}/dev/null c 1 3 + chmod 0666 ${CHROOT}/dev/null + + mknod ${CHROOT}/dev/zero c 1 5 + chmod 0666 ${CHROOT}/dev/zero + + if use urandom; then + mknod ${CHROOT}/dev/urandom c 1 9 + chmod 0666 ${CHROOT}/dev/urandom + else + mknod ${CHROOT}/dev/random c 1 8 + chmod 0666 ${CHROOT}/dev/random + fi + + elog "You may need to add the following line to your syslog-ng.conf:" + elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" +}