[gentoo-commits] gentoo-x86 commit in net-dns/bind: ChangeLog bind-9.6.3-r1.ebuild

[gentoo-commits] gentoo-x86 commit in net-dns/bind: ChangeLog bind-9.6.3-r1.ebuild

[Christian Ruppert (idl0r)]

idl0r       11/03/10 17:38:23

  Modified:             ChangeLog bind-9.6.3-r1.ebuild
  Log:
  Add sdb-ldap back to 9.6.x, bug 302735, thanks to Mario Fetka (geos_one) <mario.fetka@gmail.com>.
  
  (Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

Revision  Changes    Path
1.328                net-dns/bind/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/ChangeLog?rev=1.328&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/ChangeLog?rev=1.328&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/ChangeLog?r1=1.327&r2=1.328

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- ChangeLog	10 Mar 2011 17:09:45 -0000	1.327
+++ ChangeLog	10 Mar 2011 17:38:23 -0000	1.328
@@ -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.327 2011/03/10 17:09:45 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.328 2011/03/10 17:38:23 idl0r Exp $
+
+  10 Mar 2011; Christian Ruppert <idl0r@gentoo.org> bind-9.6.3-r1.ebuild:
+  Add sdb-ldap back to 9.6.x, bug 302735, thanks to Mario Fetka (geos_one)
+  <mario.fetka@gmail.com>.
 
   10 Mar 2011; Christian Ruppert <idl0r@gentoo.org> -bind-9.6.2_p3-r2.ebuild,
   -bind-9.6.3.ebuild:



1.3                  net-dns/bind/bind-9.6.3-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.6.3-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.6.3-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.6.3-r1.ebuild?r1=1.2&r2=1.3

Index: bind-9.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.3-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bind-9.6.3-r1.ebuild	27 Feb 2011 22:27:49 -0000	1.2
+++ bind-9.6.3-r1.ebuild	10 Mar 2011 17:38:23 -0000	1.3
@@ -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.6.3-r1.ebuild,v 1.2 2011/02/27 22:27:49 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.3-r1.ebuild,v 1.3 2011/03/10 17:38:23 idl0r Exp $
 
 EAPI="3"
 
@@ -9,7 +9,7 @@
 MY_PV="${PV/_p/-P}"
 MY_P="${PN}-${MY_PV}"
 
-SDB_LDAP_VER="1.1.0-fc14"
+SDB_LDAP_VER="1.1.0-fc11"
 
 GEOIP_PV=1.3
 #GEOIP_PV_AGAINST="${MY_PV}"
@@ -24,14 +24,14 @@
 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 )"
+			 ${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 )
@@ -42,8 +42,8 @@
 	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 )
+	gssapi? ( virtual/krb5 )
+	sdb-ldap? ( net-nds/openldap )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
@@ -94,12 +94,12 @@
 	# 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 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