rpms/bind/F-7 bind-chroot-admin.in, 1.21, 1.22 bind.spec, 1.181, 1.182 bind-9.4.1-ldap-new-api.patch, 1.1, NONE

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31819

Modified Files:
	bind-chroot-admin.in bind.spec 
Removed Files:
	bind-9.4.1-ldap-new-api.patch 
Log Message:
- start using deprecated ldap API because new-api patch didn't work (lack of documentation)
- fix minor bug in bind-chroot-admin script (#241103)



Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-7/bind-chroot-admin.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bind-chroot-admin.in	15 May 2007 12:17:17 -0000	1.21
+++ bind-chroot-admin.in	24 May 2007 14:16:40 -0000	1.22
@@ -221,7 +221,7 @@
     fi;
 
     . /etc/sysconfig/named
-    if [ "$ENABLE_ZONE_WRITE" =  [yY1]* ]; then
+    if `echo "$ENABLE_ZONE_WRITE" | grep -q '[yY1].*'`; then
 	return 0;
     fi;
 


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-7/bind.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- bind.spec	22 May 2007 15:02:00 -0000	1.181
+++ bind.spec	24 May 2007 14:16:40 -0000	1.182
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.1
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,7 +81,7 @@
 %endif
 Patch66:	bind-9.4.0-zone-freeze.patch
 Patch67:	bind-9.4.0-dbus-race-condition.patch
-Patch68:	bind-9.4.1-ldap-new-api.patch
+Patch68:	bind-9.4.1-ldap-api.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -245,7 +245,6 @@
 %if %{SDB}
 %patch11 -p1 -b .sdbsrc
 %patch61 -p1 -b .sdb-sqlite-src
-%patch68 -p1 -b .new-api
 # BUILD 'Simplified Database Backend' (SDB) version of named: named_sdb
 cp -rfp bin/named bin/named_sdb
 # SDB ldap
@@ -266,6 +265,7 @@
 cp -fp contrib/sdb/pgsql/zonetodb.c bin/sdb_tools
 cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
 %patch12 -p1 -b .sdb
+%patch68 -p1 -b .new-api
 %endif
 %if %{LIBBIND}
 %patch13 -p1 -b .fix_libbind_includedir
@@ -806,6 +806,10 @@
 
 
 %changelog
+* Thu May 24 2007 Adam Tkac <atkac redhat com> 31:9.4.1-4.fc7
+- start using deprecated ldap API
+- fix minor bug in bind-chroot-admin (#241103)
+
 * Tue May 15 2007 Adam Tkac <atkac redhat com> 31:9.4.1-3.fc7
 - fixed bind-chroot-admin dynamic DNS handling (#239149)
 - rewrited ldap backend to latest API (#239802)


--- bind-9.4.1-ldap-new-api.patch DELETED ---