- removed unneeded bind-9.4.1-ldap-api.patch

This commit is contained in:
Adam Tkac 2008-10-30 13:50:06 +00:00
parent cc7f3e831a
commit b2c2f375e2
2 changed files with 4 additions and 26 deletions

View File

@ -1,23 +0,0 @@
--- 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@
diff -up bind-9.5.0a5/bin/sdb_tools/Makefile.in.new-api bind-9.5.0a5/bin/sdb_tools/Makefile.in
--- bind-9.5.0a5/bin/sdb_tools/Makefile.in.new-api 2007-07-18 11:07:07.000000000 +0200
+++ bind-9.5.0a5/bin/sdb_tools/Makefile.in 2007-07-18 11:07:18.000000000 +0200
@@ -38,7 +38,7 @@ SRCS = zone2ldap.c ldap2zone.c
MANPAGES = zone2ldap.1
-EXT_CFLAGS =
+EXT_CFLAGS = -DLDAP_DEPRECATED
@BIND9_MAKE_RULES@

View File

@ -19,7 +19,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: ISC License: ISC
Version: 9.5.1 Version: 9.5.1
Release: 0.8.1.%{PREVER}%{?dist} Release: 0.8.2.%{PREVER}%{?dist}
Epoch: 32 Epoch: 32
Url: http://www.isc.org/products/BIND/ Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -62,7 +62,6 @@ Patch95: bind-95-sdlz-include.patch
Patch11: bind-9.3.2b2-sdbsrc.patch Patch11: bind-9.3.2b2-sdbsrc.patch
Patch12: bind-9.5-sdb.patch Patch12: bind-9.5-sdb.patch
Patch62: bind-9.5-sdb-sqlite-bld.patch Patch62: bind-9.5-sdb-sqlite-bld.patch
Patch68: bind-9.4.1-ldap-api.patch
# needs inpection # needs inpection
Patch17: bind-9.3.2b1-fix_sdb_ldap.patch Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
@ -205,7 +204,6 @@ cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/sdb_tools
cp -fp contrib/sdb/pgsql/zonetodb.c bin/sdb_tools cp -fp contrib/sdb/pgsql/zonetodb.c bin/sdb_tools
cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
%patch12 -p1 -b .sdb %patch12 -p1 -b .sdb
%patch68 -p1 -b .new-api
%endif %endif
%if %{LIBBIND} %if %{LIBBIND}
%patch13 -p1 -b .fix_libbind_includedir %patch13 -p1 -b .fix_libbind_includedir
@ -636,6 +634,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sbindir}/bind-chroot-admin %{_sbindir}/bind-chroot-admin
%changelog %changelog
* Thu Oct 30 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.8.2.b2
- removed unneeded bind-9.4.1-ldap-api.patch
* Thu Oct 30 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.8.1.b2 * Thu Oct 30 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.8.1.b2
- ship dns/{s,}dlz.h and isc/radix.h in bind-devel - ship dns/{s,}dlz.h and isc/radix.h in bind-devel