- fixed building of named-sdb (#432497)bind-9_5_0-25_1_b2_fc8

- bind-9.3.2-prctl_set_dumpable.patch is obsoleted

1 files changed, 16 insertions, 12 deletions

diff --git a/bind.spec b/bind.spec
index b1da425..3dc253e 100644
--- a/bind.spec
+++ b/bind.spec
@@ -20,7 +20,7 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	25.%{RELEASEVER}%{?dist}
+Release: 	25.1.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,13 +56,13 @@ Patch6: 	bind-9.2.2-nsl.patch
 Patch10: 	bind-9.3.2b1-PIE.patch
 Patch13: 	bind-9.3.1rc1-fix_libbind_includedir.patch
 Patch16: 	bind-9.3.2-redhat_doc.patch
-Patch32:	bind-9.3.2-prctl_set_dumpable.patch
 Patch63:	bind-9.4.0-dnssec-directory.patch
 Patch69:	bind-9.5.0-generate-xml.patch
 Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
 Patch80:	bind-9.5-edns.patch
 Patch87:	bind-9.5-transfer-segv.patch
+Patch88:	bind-9.5-recv-race.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -194,19 +194,22 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 %patch6 -p1 -b .nsl
 %patch10 -p1 -b .PIE
 %patch69 -p1 -b .generate-xml
+%patch16 -p1 -b .redhat_doc
+%patch80 -p1 -b .edns
 %if %{SDB}
+mkdir bin/named-sdb
+cp -r bin/named/* bin/named-sdb
 %patch11 -p1 -b .sdbsrc
-cp -f bin/named/main.c bin/named/main-sdb.c
 # SDB ldap
-cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named
+cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named-sdb
 # SDB postgreSQL
-cp -fp contrib/sdb/pgsql/pgsqldb.[ch] bin/named
+cp -fp contrib/sdb/pgsql/pgsqldb.[ch] bin/named-sdb
 # SDB sqlite
-cp -fp contrib/sdb/sqlite/sqlitedb.[ch] bin/named
+cp -fp contrib/sdb/sqlite/sqlitedb.[ch] bin/named-sdb
 # SDB Berkeley DB - needs to be ported to DB4!
 #cp -fp contrib/sdb/bdb/bdb.[ch] bin/named_sdb
 # SDB dir
-cp -fp contrib/sdb/dir/dirdb.[ch] bin/named
+cp -fp contrib/sdb/dir/dirdb.[ch] bin/named-sdb
 # SDB tools
 mkdir -p bin/sdb_tools
 cp -fp %{SOURCE30} bin/sdb_tools/ldap2zone.c
@@ -221,7 +224,6 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
 %if %{LIBBIND}
 %patch13 -p1 -b .fix_libbind_includedir
 %endif
-%patch16 -p1 -b .redhat_doc
 %if %{WITH_DBUS}
 %patch15 -p1 -b .dbus
 %patch23 -p1 -b .dbus_archdep_libdir
@@ -238,7 +240,6 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
 cp -fp contrib/dbus/{dbus_mgr.c,dbus_service.c} bin/named
 cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %endif
-%patch32 -p1 -b .prctl_set_dumpable
 %if %{SDB}
 %patch62 -p1 -b .sdb-sqlite-bld
 %endif
@@ -248,10 +249,10 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %patch72 -p1 -b .64bit
 %endif
 %patch73 -p1 -b .libidn
-%patch80 -p1 -b .edns
 %patch83 -p1 -b .libidn2
 %patch85 -p1 -b .libidn3
 %patch87 -p1 -b .transfer-segv
+%patch88 -p1 -b .recv-race
 :;
 
 
@@ -408,7 +409,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int
   echo '@ in soa localhost. root 1 3H 15M 1W 1D
   ns localhost.' > sample/var/named/$f; 
 done
-/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.242 2008/02/12 12:58:35 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
+/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.243 2008/04/23 15:03:02 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
  *\
  * NOTE: you only need to create this file if it is to\
  * differ from the following default contents:
@@ -499,7 +500,6 @@ fi
 
 %postun libs -p /sbin/ldconfig
 
-
 %post chroot
 if [ "$1" -gt 0 ]; then
    /usr/sbin/bind-chroot-admin --enable > /dev/null 2>&1;
@@ -668,6 +668,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Apr 23 2008 Adam Tkac <atkac redhat com> 32:9.5.0-25.1.b2
+- fixed building of named-sdb (#432497)
+- bind-9.3.2-prctl_set_dumpable.patch is obsoleted
+
 * Tue Feb 12 2008 Adam Tkac <atkac redhat com> 32:9.5.0-25.b2
 - 9.5.0b2
   - dropped bind-9.5-gssapi-header.patch (upstream)