Version bump, fixes a serious security issue, CVE-2011-4313 / bug 390753.
authorChristian Ruppert <idl0r@gentoo.org>
Thu, 17 Nov 2011 17:20:34 +0000 (17:20 +0000)
committerChristian Ruppert <idl0r@gentoo.org>
Thu, 17 Nov 2011 17:20:34 +0000 (17:20 +0000)
Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

net-dns/bind/ChangeLog
net-dns/bind/Manifest
net-dns/bind/bind-9.7.4_p1.ebuild [new file with mode: 0644]
net-dns/bind/bind-9.8.1_p1.ebuild [new file with mode: 0644]

index 9163fdccef96c16b2e3d3ec86fbbbffeb61bf8ac..1bea7cca3b48fac84a9bd8fb60ee3e7125f17bc7 100644 (file)
@@ -1,6 +1,13 @@
 # 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.355 2011/09/25 18:26:13 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.356 2011/11/17 17:20:34 idl0r Exp $
+
+*bind-9.8.1_p1 (17 Nov 2011)
+*bind-9.7.4_p1 (17 Nov 2011)
+
+  17 Nov 2011; Christian Ruppert <idl0r@gentoo.org> +bind-9.7.4_p1.ebuild,
+  +bind-9.8.1_p1.ebuild:
+  Version bump, fixes a serious security issue, CVE-2011-4313 / bug 390753.
 
   25 Sep 2011; Christian Ruppert <idl0r@gentoo.org> bind-9.8.1.ebuild:
   Remove obsolete warning.
index a450f5dda58fa4ce5af26467cb354f6cc6cdaa77..2bab4ef7190063f1a204626f45fc6609bef20153 100644 (file)
@@ -13,8 +13,10 @@ AUX named.confd-r6 1368 RMD160 8ea5c67af53a0986a09f1077a5dd722dd52c8b51 SHA1 64d
 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
 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
@@ -22,17 +24,19 @@ DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 RMD160 eb7507dc4b1da0064516d9e75dbc
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
 EBUILD bind-9.7.3_p3.ebuild 11547 RMD160 6e1ab2efcb184db200a53190b016a7d763499898 SHA1 dc534b640bb4ca05d7e3b700bc1c8a75b0d58ed9 SHA256 2e64fbe000308956c75c1edd324073f9cd377af1ad7320343a581ef03a719e27
 EBUILD bind-9.7.4.ebuild 11558 RMD160 85cd5fd33caabba8f60616e852a02318bf379282 SHA1 befc8aff7a07142a09809d45dc36695b0b21f45d SHA256 ff2b2094e3007cfce211f50253ebac91d1e9c0c1bcdfa38537920312a69b3bff
+EBUILD bind-9.7.4_p1.ebuild 11521 RMD160 3ebf57b0be21ab21a3c1fce5ba2b9e847a7da176 SHA1 d78cba661d9b453a442e65858e9ea163f1c9bb6a SHA256 f1ac5137d61553db81e1c06d340feb7a42561b2e214acb10da23c45e4fdc8933
 EBUILD bind-9.8.1.ebuild 11826 RMD160 a6ad80de98e1335da7bdeb580d3509145f169e3d SHA1 d9d0097b4ef8e728b8ead39ec408cd732b899890 SHA256 507f3d861dc0e72e8c57883af3f88524b8cd67b02a74c570f850391704af33b7
-MISC ChangeLog 60410 RMD160 1dc264947c8acb12bfa3113c0cb1bb22dc754e98 SHA1 e848e10c189bc427afeb4a820e5e4b7c3bef06c5 SHA256 6dc27612d9c4f0c81dd9b38d4e9559108e1b1c6d103e2eb6fc23d846fb321d16
+EBUILD bind-9.8.1_p1.ebuild 11722 RMD160 e632f46957a91217b07ba569920452f0a915242e SHA1 511c81e293aba2890267fefb962867c4f1207397 SHA256 a57812044d1b00aa1e841ff28d77eee07cca4aebf696b641c983bfb41a67df86
+MISC ChangeLog 60646 RMD160 6807c9bd00631675ba0118ad9e296214968152c0 SHA1 9457d2e471ca8939e0e5dda38f157d5436459eed SHA256 3b521cbfeb2dbdd159cd6911b08fc08a552a5a9441d844fb5420bf45ba91bb19
 MISC metadata.xml 887 RMD160 3c0fdcaacc812fc3e558afbbdb91dd6efbf377f9 SHA1 73e55d5772ca66d165643bf389847234c32593d7 SHA256 c0a53163775c42b68ed319c68f18234d8e6d908b318066a0d533bf7bcd40ce7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJOf3JKAAoJEMOx0zmdw4Z1zUoIAJ6hKSuE6nXyTcGZ7z1iA8kE
-OrW2P+3bVH6UGN86mcGSbIgLj8EVO9i/5ZVPo1ctQCXRJqhc4XWj9ny1u1kjxPwZ
-wlB2vAIwzfR+5Pcn1ogWNWvRMXUzdOnz2vhSTTub1ejBqKWIYuGJI17JkF+wzcYF
-WNQmFcu3qS7XwXf9I8fr8n1d5QC+R9VtGG5N/FGtq9V3UPRzwXghLlovJIF30E6e
-7X7dHK5l6kn2FC/M3kyO0bMDZ8QSKpxCfTxuOY8/E51Oz9OZHJ++o9vy2ozUL7Rd
-kNaKnHncITGgyNc+kWuMs6ZWxFEqdp1i+jy0d/Dl7jMhx+O2zHCxy27OGZTtp8g=
-=hVaD
+iQEcBAEBCAAGBQJOxUJsAAoJEMOx0zmdw4Z1veYH/RLrKuUpJ8qrgjfs1Tm/7KJP
+5lcvwIbpP/WWkPnu7E/TtWgfNlNQoD2gayIu1IXtkakZzbnMyMzrZA6Ga+RQwnpp
+a+PjQpwV8bDhMNRJ24p2k1CuAaiGUnm8EyYFvvhJ+E/NR12sn+FVhAEaqz4fStaK
+C6KDFGirLl7OsGpXP+k+BA9BZepTbH6aDdnJ+YxcTkBsmxDwjBM9mJj2eqMB0OCT
+JTHc2hRrN4YNydUf1xMxxhJKbeirdcPKD24J+CN93e7xljUXDBMHdADotfI8J75z
+0plN91TKJ+M1aL8RjlrDPE47uaBw47fkdYxqKvk5VKxL2t3lLqwcCGZ0F9NPG7s=
+=PESC
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.7.4_p1.ebuild b/net-dns/bind/bind-9.7.4_p1.ebuild
new file mode 100644 (file)
index 0000000..c943c2f
--- /dev/null
@@ -0,0 +1,362 @@
+# 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.4_p1.ebuild,v 1.1 2011/11/17 17:20:34 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-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 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}/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:RELEASEVER=2:RELEASEVER=1:' \
+                       ${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 <net-dns/bind-9.4.3_p5-r1, you may encounter permission problems"
+       ewarn "To fix the permissions do:"
+       ewarn "chown root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}"
+       ewarn "chown root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
+       ewarn "chmod 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
+       ewarn "chmod 0750 /etc/bind /var/bind/pri"
+       ewarn "chmod 0770 /var/{run,log}/named /var/bind/{,sec,dyn}"
+       ewarn
+}
+
+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}
+       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
+
+       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
+
+       if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+               cp -a /etc/bind ${CHROOT}/etc/
+               cp -a /var/bind ${CHROOT}/var/
+       fi
+
+       if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+               mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
+       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.8.1_p1.ebuild b/net-dns/bind/bind-9.8.1_p1.ebuild
new file mode 100644 (file)
index 0000000..fb13ea0
--- /dev/null
@@ -0,0 +1,370 @@
+# 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.1_p1.ebuild,v 1.1 2011/11/17 17:20:34 idl0r Exp $
+
+# 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="4"
+
+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="berkdb caps dlz doc geoip gost gssapi idn ipv6 ldap mysql odbc pkcs11 postgres rpz sdb-ldap
+selinux ssl threads urandom xml"
+
+REQUIRED_USE="postgres? ( dlz )
+       berkdb? ( dlz )
+       mysql? ( dlz !threads )
+       odbc? ( dlz )
+       ldap? ( dlz )
+       sdb-ldap? ( dlz )
+       gost? ( ssl )"
+
+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 )
+       caps? ( >=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 )
+       gost? ( >=dev-libs/openssl-1.0.0 )"
+
+RDEPEND="${DEPEND}
+       selinux? ( sec-policy/selinux-bind )
+       sys-process/psmisc"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+       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
+               # bug 382269
+               epatch "${FILESDIR}/${P}-sdlz_helper.patch"
+
+               # 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
+
+               # 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) ::g" bin/Makefile.in || die
+
+       if use geoip; then
+               cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
+               epatch ${GEOIP_PATCH_A}
+       fi
+
+       # bug #220361
+       rm {aclocal,libtool}.m4
+       eautoreconf
+}
+
+src_configure() {
+       local myconf=""
+
+       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_enable threads) \
+               $(use_with dlz dlopen) \
+               $(use_with dlz dlz-filesystem) \
+               $(use_with dlz dlz-stub) \
+               $(use_with postgres dlz-postgres) \
+               $(use_with mysql dlz-mysql) \
+               $(use_with berkdb dlz-bdb) \
+               $(use_with ldap dlz-ldap) \
+               $(use_with odbc dlz-odbc) \
+               $(use_with ssl openssl) \
+               $(use_with idn) \
+               $(use_enable ipv6) \
+               $(use_with xml libxml2) \
+               $(use_with gssapi) \
+               $(use_enable rpz rpz-nsip) \
+               $(use_enable rpz rpz-nsdname) \
+               $(use_with pkcs11) \
+               $(use_enable caps linux-caps) \
+               $(use_with gost) \
+               ${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 gost; 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 <net-dns/bind-9.4.3_p5-r1, you may encounter permission problems"
+       ewarn "To fix the permissions do:"
+       ewarn "chown root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}"
+       ewarn "chown root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
+       ewarn "chmod 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
+       ewarn "chmod 0750 /etc/bind /var/bind/pri"
+       ewarn "chmod 0770 /var/{run,log}/named /var/bind/{,sec,dyn}"
+       ewarn
+}
+
+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}
+       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}
+       # As of bind 9.8.0
+       if has_version net-dns/bind[gost]; then
+               if [ "$(get_libdir)" = "lib64" ]; then
+                       mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
+                       ln -s lib64 ${CHROOT}/usr/lib
+               else
+                       mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
+               fi
+       fi
+       chown root:named ${CHROOT} ${CHROOT}/var/{bind,{run,log}/named} ${CHROOT}/etc/bind
+
+       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
+
+       if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+               cp -a /etc/bind ${CHROOT}/etc/
+               cp -a /var/bind ${CHROOT}/var/
+       fi
+
+       if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+               mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
+       fi
+
+       elog "You may need to add the following line to your syslog-ng.conf:"
+       elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}