rpms/bind/devel bind-9.4.1-ldap-api.patch, NONE, 1.1 bind-chroot-admin.in, 1.21, 1.22 bind.spec, 1.182, 1.183 bind-9.4.1-ldap-new-api.patch, 1.2, NONE
Adam Tkac (atkac)
fedora-extras-commits at redhat.com
Thu May 24 14:32:24 UTC 2007
Author: atkac
Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1797
Modified Files:
bind-chroot-admin.in bind.spec
Added Files:
bind-9.4.1-ldap-api.patch
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)
bind-9.4.1-ldap-api.patch:
--- NEW FILE bind-9.4.1-ldap-api.patch ---
--- bind-9.3.4/bin/named_sdb/Makefile.in.ldap-api 2007-05-18 16:21:21.000000000 +0200
+++ bind-9.3.4/bin/named_sdb/Makefile.in 2007-05-18 16:22:16.000000000 +0200
@@ -96,7 +96,7 @@ HTMLPAGES = named.html lwresd.html named
MANOBJS = ${MANPAGES} ${HTMLPAGES}
-EXT_CFLAGS = -fPIE
+EXT_CFLAGS = -fPIE -DLDAP_DEPRECATED
@BIND9_MAKE_RULES@
Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/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:31:50 -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/devel/bind.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- bind.spec 22 May 2007 14:41:10 -0000 1.182
+++ bind.spec 24 May 2007 14:31:50 -0000 1.183
@@ -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)
@@ -83,7 +83,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
@@ -247,7 +247,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
@@ -268,6 +267,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
@@ -810,6 +810,10 @@
%changelog
+* Wed May 24 2007 Adam Tkac <atkac redhat com> 31:9.4.1-4.fc8
+- removed ldap-api patch and start using deprecated API
+- fixed minor problem in bind-chroot-admin script (#241103)
+
* Tue May 22 2007 Adam Tkac <atkac redhat com> 31:9.4.1-3.fc8
- fixed bind-chroot-admin dynamic DNS handling (#239149)
- updated zone-freeze patch to latest upstream
--- bind-9.4.1-ldap-new-api.patch DELETED ---
More information about the fedora-extras-commits
mailing list