diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index 7caaeef..ce048b9 100644 --- a/net-dns/bind/ChangeLog +++ b/net-dns/bind/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.310 2011/01/07 23:37:37 robbat2 Exp $ + 02 Feb 2011; Mario Fetka bind-9.8.0_beta1.ebuild, + -bind-ebuild-sdb-ldap.patch: + readd the sdb-ldap backend + *bind-9.7.2_p3-r3 (07 Jan 2011) 07 Jan 2011; Robin H. Johnson +bind-9.7.2_p3-r3.ebuild: diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index ac132b2..eb42821 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -19,6 +19,6 @@ 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 9479 RMD160 e612fd43c10f3ed889a37b1f8ced0d6bee686e73 SHA1 f4d119a9721f53d9a24804ef466c9341c8bad77c SHA256 9b7bf115dd7f767a8bdfc8f1559fe9b3ce25258a0cb34ee1128d4e43d216f970 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 -EBUILD bind-9.8.0_beta1.ebuild 11666 RMD160 39b3100c78260bf1c5a0fbb8ed89e1e40af18127 SHA1 cd7ab5eb91d51835d3cd20a9c5c474f5a299718b SHA256 6df4511a584fb3f24ef1aca987b3e50e648fbd5546e678cb98ef9dd644f7d58f -MISC ChangeLog 52977 RMD160 45d7d876663d2e1f51a7dbdfdfb9b0829bafabf4 SHA1 96f759fa5cf0abd647c669ed15b259ac79b31b5e SHA256 65602e78b8cbe32d36e7ab504e00c6aa09ba05bfb821bb0dbb96b4723b189614 +EBUILD bind-9.8.0_beta1.ebuild 11567 RMD160 f25fef0e2b99fc5298cd1c073f8693cadf40d90a SHA1 a21a99e6f3b90b7c8f2a067b80a1cbc3a778dc3d SHA256 31bc3a8f574c325b55c100bd6abc7b4c11c1222e31413be11b693128d0b8f546 +MISC ChangeLog 53114 RMD160 c47050422e8f028a8e579ac7d70a7c1570510bba SHA1 17cc2481fb17f4a98e0b50a8f78db758067b1e0e SHA256 ee788ad805bcb9f1bd47ac142bbe87006f8ae1f5b70954b51df30529e1100d72 MISC metadata.xml 687 RMD160 5fd264ad649f713cca1786a3bbeabf2f45acc05b SHA1 b0f68a06a898ef80202d3827f2ecb3f1df33b27a SHA256 3c72d140cb8dc2f418ab79b1a939c192a5fee691e97db425b489a0feb1f99263 diff --git a/net-dns/bind/bind-9.8.0_beta1.ebuild b/net-dns/bind/bind-9.8.0_beta1.ebuild index b74ef6a..9fa0008 100644 --- a/net-dns/bind/bind-9.8.0_beta1.ebuild +++ b/net-dns/bind/bind-9.8.0_beta1.ebuild @@ -1,6 +1,6 @@ # 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.2_p3-r3.ebuild,v 1.1 2011/01/07 23:37:37 robbat2 Exp $ +# $Header: $ EAPI="3" diff --git a/net-dns/bind/bind-ebuild-sdb-ldap.patch b/net-dns/bind/bind-ebuild-sdb-ldap.patch deleted file mode 100644 index abe038d..0000000 --- a/net-dns/bind/bind-ebuild-sdb-ldap.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- /usr/portage/net-dns/bind/bind-9.7.2_p3-r3.ebuild 2011-01-08 00:37:37.000000000 +0100 -+++ bind-9.8.0_beta1.ebuild 2011-02-02 07:07:36.000000000 +0100 -@@ -6,10 +6,10 @@ - - inherit eutils autotools toolchain-funcs flag-o-matic - --MY_PV="${PV/_p/-P}" -+MY_PV="${PV/_beta/b}" - MY_P="${PN}-${MY_PV}" - --SDB_LDAP_VER="1.1.0" -+SDB_LDAP_VER="1.1.0-fc14" - - GEOIP_PV=1.3 - #GEOIP_PV_AGAINST="${MY_PV}" -@@ -24,26 +24,26 @@ - 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? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.bz2 ) -+ ${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 -+ 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 ) -+ sdb-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 ) -@@ -89,13 +89,21 @@ - - # sdb-ldap patch as per bug #160567 - # Upstream URL: http://bind9-ldap.bayour.com/ -- # FIXME: bug 302735 --# use sdb-ldap && epatch "${WORKDIR}"/sdb-ldap/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch -+ if use sdb-ldap; then -+ # epatch "${FILESDIR}"/bind-9.8.0b1-sdb-ldap-1.patch -+ 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=3/' \ -- -e 's/+RELEASEVER=2-geoip-1.3/+RELEASEVER=3-geoip-1.3/' \ -+ sed -i -e 's/ MINORVER=7/ MINORVER=8/' \ -+ -e 's/ PATCHVER=2/ PATCHVER=0/' \ -+ -e 's/ RELEASETYPE=-P/ RELEASETYPE=b/' \ -+ -e 's/-RELEASEVER=2/-RELEASEVER=1/' \ -+ -e 's/+RELEASEVER=2-geoip-1.3/+RELEASEVER=1-geoip-1.3/' \ - ${GEOIP_PATCH_A} || die - epatch ${GEOIP_PATCH_A} - fi -@@ -169,6 +177,10 @@ - echo '#undef SO_BSDCOMPAT' >> config.h - } - -+src_compile() { -+ emake -j1 || die -+} -+ - src_install() { - emake DESTDIR="${D}" install || die -