Bug #231242: GeoIP patch support for BIND.
authorRobin H. Johnson <robbat2@gentoo.org>
Wed, 28 Apr 2010 21:59:38 +0000 (21:59 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Wed, 28 Apr 2010 21:59:38 +0000 (21:59 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

net-dns/bind/ChangeLog
net-dns/bind/Manifest
net-dns/bind/bind-9.6.1_p3-r1.ebuild [new file with mode: 0644]

index 0d3a092ecf0cff2925d2e572a18ccb80e64c8959..a98dd05681fb36a5300c93be5a91ce7b92d57f38 100644 (file)
@@ -1,6 +1,12 @@
 # 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.264 2010/03/30 13:25:32 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.265 2010/04/28 21:59:37 robbat2 Exp $
+
+*bind-9.6.1_p3-r1 (28 Apr 2010)
+
+  28 Apr 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +bind-9.6.1_p3-r1.ebuild:
+  Bug #231242: GeoIP patch support for BIND.
 
   30 Mar 2010; Christian Ruppert <idl0r@gentoo.org> -bind-9.4.3_p4.ebuild:
   Remove bind-9.4.3_p4.ebuild, bug 308035 and bug 301548
index 31e0f5d4ccd856539a0cf93430d2c5990f1779b0..6714670ced5795e9d56dbbff6957d28c761feabd 100644 (file)
@@ -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.4.0-dlzbdb-close_cursor.patch 338 RMD160 3c92206a6c77ac8e9ea854dfc22fda5753b653a9 SHA1 903383e2b142d76a73030c27f2cdab8d100df150 SHA256 4a004d72565d6db683b879851ae8dfaddcf1b39fd0f97a995d9c5d22d72c6395
@@ -15,16 +12,12 @@ AUX named.init-r5 1620 RMD160 37279362e437241188a07e5f274730e68645827e SHA1 00a1
 AUX named.init-r7 2731 RMD160 3c6c7ea44bcf355862fdd1afb3bdbd03a9c95c71 SHA1 3745627a36e0c0cabdc9f632a8a39d7694c1d210 SHA256 3ac9f6f8fef5e29e77eb9520f34472775683dfa0f809ff01b03a50d03fad38d9
 DIST bind-9.4.3-P5.tar.gz 6447497 RMD160 680146e4120aaa89f2899d4205c17fee5e9e4aa9 SHA1 9b7f0bd84be0f91fe1085cedc91c7c14f1e0f97a SHA256 7ca93553d1f488af1b21ab26f0297be5c7b7b5920d29ad9743382bf3623b2939
 DIST bind-9.6.1-P3.tar.gz 6508797 RMD160 ff444f39d7cf9673497e43c18c40dd77af121851 SHA1 9cb2bfb933083ab4e85aa884ca0dff7b0ae5cfb2 SHA256 869f5079a900b280c051d4c9cf7eefea000a0e70ccec9e6fcddd79e3caa10198
+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
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
 EBUILD bind-9.4.3_p5.ebuild 9200 RMD160 6387caffb9109befdff4d93154dd879b754b7c7d SHA1 177e832184c5b9fc7ccb8ccc93c7d848eb4303b6 SHA256 23597a41b891e8f124a49043aaed9ce7f499dfbc3302f38dae495967b8f0aeab
+EBUILD bind-9.6.1_p3-r1.ebuild 9609 RMD160 506826043cdd9eef17f0c13a151c8cbd3d10f131 SHA1 6f760d34c73b0b60f29eaa798f62873963ebf3c6 SHA256 3304fe1c7d2fca945f5cd400eeb671c3a89220ce28e5e2ecc056d4bb027ff2c7
 EBUILD bind-9.6.1_p3.ebuild 9242 RMD160 06e6f37b48b1c91c5cad5ba186e61509475dd0be SHA1 3f48d1d4b31f994ce28c3f863085d7150a26a533 SHA256 17a4e497af24dc65025e4323e3138ed2cb2f0f2466b2cae4e860cb0af9896853
-MISC ChangeLog 42631 RMD160 388f31979caec7c38bdd3048ae80e7b5d9744c50 SHA1 2e730ba9702307c7a239908ff010f323906cf3d1 SHA256 eb74e5496a21020818c01924c155f0b4b0ed58a16ebd260e5a56e5d99d088635
+MISC ChangeLog 42793 RMD160 1bd6218e90dcf10cd5378a850fba2c1e161755ae SHA1 f595030119b13c84a90ed4ca283defc17482d3b4 SHA256 293f49496774928ce9277a734a6cc42f91bf38af1ff07885756c5bf9bbbd5835
 MISC metadata.xml 647 RMD160 63aeb182631d45c774bdc08f11901147028f6d7c SHA1 9aff80992005daa758d373c4e3311ff8c3ae3ef9 SHA256 9417c62e0e5817e26d36ab5efd87f126781dbf445d9a1beb3abb899b8cb4806a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkux+9YACgkQixe2jn+ufTjegQCghGzTCO7H7+BfWgi/oL3oOcoa
-7mAAniNMmDybqQ+gSRrfXc9zUOYk9Fjj
-=wx6B
------END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.6.1_p3-r1.ebuild b/net-dns/bind/bind-9.6.1_p3-r1.ebuild
new file mode 100644 (file)
index 0000000..73337e2
--- /dev/null
@@ -0,0 +1,311 @@
+# 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.6.1_p3-r1.ebuild,v 1.1 2010/04/28 21:59:38 robbat2 Exp $
+
+EAPI="2"
+
+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? ( virtual/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() {
+       # bug 278364 (workaround)
+       epatch "${FILESDIR}/${PN}-9.6.1-parallel.patch"
+
+       # 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
+
+       use dlz && epatch "${FILESDIR}"/${PN}-9.4.0-dlzbdb-close_cursor.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/)
+       use dlz && use mysql && has_version ">=dev-db/mysql-5" && epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
+
+       # should be installed by bind-tools
+       sed -i -e "s:nsupdate ::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
+
+       use geoip && epatch "${DISTDIR}"/${GEOIP_P}.patch
+
+       # bug #220361
+       rm {aclocal,libtool}.m4
+       WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf
+
+       # bug #151839
+       sed -i -e \
+               's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
+               lib/isc/unix/socket.c || die
+
+       # 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"
+                       epause 10
+               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
+
+       # bug #158664
+       gcc-specs-ssp && replace-flags -O[23s] -O
+       export BUILD_CC="${CBUILD}-gcc"
+       econf \
+               --sysconfdir=/etc/bind \
+               --localstatedir=/var \
+               --with-libtool \
+               $(use_with ssl openssl) \
+               $(use_with idn) \
+               $(use_enable ipv6) \
+               $(use_with xml libxml2) \
+               ${myconf}
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+
+       dodoc CHANGES FAQ KNOWN-DEFECTS README || die
+
+       if use idn; then
+               dodoc 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
+
+       newenvd "${FILESDIR}"/10bind.env 10bind || die
+
+       keepdir /var/bind/sec
+
+       insinto /etc/bind
+       newins "${FILESDIR}"/named.conf-r3 named.conf || die
+
+       # ftp://ftp.rs.internic.net/domain/named.ca:
+       insinto /var/bind
+       doins "${FILESDIR}"/named.ca || 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
+       newconfd "${FILESDIR}"/named.confd-r3 named || die
+
+       dosym /var/bind/named.ca /var/bind/root.cache
+       dosym /var/bind/pri /etc/bind/pri
+       dosym /var/bind/sec /etc/bind/sec
+
+       # 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}
+}
+
+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 -u named
+                       echo
+               else
+                       einfo "Using /dev/random for generating rndc.key"
+                       /usr/sbin/rndc-confgen -a -u named
+                       echo
+               fi
+       fi
+
+       install -d -o named -g named "${ROOT}"/var/run/named \
+               "${ROOT}"/var/bind/{pri,sec} "${ROOT}"/var/log/named
+       chown -R named:named "${ROOT}"/var/bind
+
+       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 or /var/bind/pri/localhost"
+       einfo
+       einfo "You can edit /etc/conf.d/named to customize named settings"
+       einfo
+       einfo "The BIND ebuild now includes chroot support."
+       einfo "If you like to run bind in chroot AND this is a new install OR"
+       einfo "your bind doesn't already run in chroot, simply run:"
+       einfo "\`emerge --config '=${CATEGORY}/${PF}'\`"
+       einfo "Before running the above command you might want to change the chroot"
+       einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
+       einfo
+       einfo "Recently verisign added a wildcard A record to the .COM and .NET TLD"
+       einfo "zones making all .com and .net domains appear to be registered"
+       einfo "This causes many problems such as breaking important anti-spam checks"
+       einfo "which verify source domains exist. ISC released a patch for BIND which"
+       einfo "adds 'delegation-only' zones to allow admins to return the .com and .net"
+       einfo "domain resolution to their normal function."
+       einfo
+       einfo "There is no need to create a com or net data file. Just the"
+       einfo "entries to the named.conf file is enough."
+       einfo
+       einfo " zone "com" IN { type delegation-only; };"
+       einfo " zone "net" IN { type delegation-only; };"
+
+       ewarn "NOTE: as of 'bind-9.6.1' the chroot part of the init-script got some major changes."
+}
+
+pkg_config() {
+       CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
+       EXISTS="no"
+
+       if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
+               CHROOT="/chroot/dns"
+       elif [ -d ${CHROOT} ]; then
+               eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
+       fi
+
+       if [ ! "$EXISTS" = yes ]; then
+               einfo ; einfon "Setting up the chroot directory..."
+
+               mkdir -m 750 -p ${CHROOT}
+               mkdir -p ${CHROOT}/{dev,proc,etc/bind,var/{run,log}/named,var/bind}
+               chown -R named:named ${CHROOT}
+               chown root:named ${CHROOT}
+
+               cp /etc/localtime ${CHROOT}/etc/localtime
+
+               mknod ${CHROOT}/dev/zero c 1 5
+               chmod 666 ${CHROOT}/dev/zero
+
+               if use urandom; then
+                       mknod ${CHROOT}/dev/urandom c 1 9
+                       chmod 666 ${CHROOT}/dev/urandom
+               else
+                       mknod ${CHROOT}/dev/random c 1 8
+                       chmod 666 ${CHROOT}/dev/random
+               fi
+
+               if [ -f '/etc/syslog-ng/syslog-ng.conf' ]; then
+                       echo "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" >>/etc/syslog-ng/syslog-ng.conf
+               fi
+
+               grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
+               if [ $RETVAL = 0 ]; then
+                       sed -i 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named 2>/dev/null
+               fi
+       else
+               ewarn "NOTE: as of 'bind-9.6.1' the chroot part of the init-script got some major changes."
+       fi
+}