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

- bind-9.3.2-prctl_set_dumpable.patch is obsoleted

5 files changed, 175 insertions, 173 deletions

diff --git a/bind-9.3.2-prctl_set_dumpable.patch b/bind-9.3.2-prctl_set_dumpable.patch
deleted file mode 100644
index 1ce6033..0000000
--- a/bind-9.3.2-prctl_set_dumpable.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- bind-9.3.2/bin/named/unix/os.c.prctl_set_dumpable	2005-05-19 21:37:19.000000000 -0400
-+++ bind-9.3.2/bin/named/unix/os.c	2006-04-04 16:43:11.000000000 -0400
-@@ -252,6 +252,10 @@
- 	caps |= (1 << CAP_SYS_RESOURCE);
- 
- 	linux_setcaps(caps);
-+
-+	/* allow us to continue to be able to generate coredumps after setuid:
-+	 */
-+	prctl(PR_SET_DUMPABLE,1,0,0,0);
- }
- 
- #ifdef HAVE_SYS_PRCTL_H
diff --git a/bind-9.4.0-sdb-sqlite-bld.patch b/bind-9.4.0-sdb-sqlite-bld.patch
index 4e8a71a..46c1648 100644
--- a/bind-9.4.0-sdb-sqlite-bld.patch
+++ b/bind-9.4.0-sdb-sqlite-bld.patch
@@ -1,5 +1,6 @@
---- bind-9.4.0/bin/named/main-sdb.c.sdb-sqlite-bld	2007-03-12 14:00:05.000000000 +0100
-+++ bind-9.4.0/bin/named/main-sdb.c	2007-03-12 14:02:34.000000000 +0100
+diff -up bind-9.5.0b2/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.0b2/bin/named-sdb/main.c
+--- bind-9.5.0b2/bin/named-sdb/main.c.sdb-sqlite-bld	2008-02-14 15:06:44.000000000 +0100
++++ bind-9.5.0b2/bin/named-sdb/main.c	2008-02-14 15:06:44.000000000 +0100
 @@ -74,6 +74,7 @@
  /* #include "xxdb.h" */
  #include "ldapdb.h"
@@ -8,7 +9,7 @@
  #include "dirdb.h"
  
  /*
-@@ -648,6 +649,7 @@
+@@ -646,6 +647,7 @@ setup(void) {
  
  	ldapdb_clear();
  	pgsqldb_clear();
@@ -16,7 +17,7 @@
  	dirdb_clear();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-@@ -737,6 +739,23 @@
+@@ -743,6 +745,23 @@ setup(void) {
                            ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
                           );
  
@@ -40,7 +41,7 @@
          result = dirdb_init();
          if (result != ISC_R_SUCCESS)
          {
-@@ -781,6 +800,7 @@
+@@ -787,6 +806,7 @@ cleanup(void) {
  
          ldapdb_clear();
          pgsqldb_clear();
@@ -48,25 +49,27 @@
          dirdb_clear();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
---- bind-9.4.0/bin/named/Makefile.in.sdb-sqlite-bld	2007-03-12 14:00:05.000000000 +0100
-+++ bind-9.4.0/bin/named/Makefile.in	2007-03-12 14:00:05.000000000 +0100
-@@ -26,10 +26,10 @@
+diff -up bind-9.5.0b2/bin/named-sdb/Makefile.in.sdb-sqlite-bld bind-9.5.0b2/bin/named-sdb/Makefile.in
+--- bind-9.5.0b2/bin/named-sdb/Makefile.in.sdb-sqlite-bld	2008-02-14 15:06:44.000000000 +0100
++++ bind-9.5.0b2/bin/named-sdb/Makefile.in	2008-02-14 15:10:56.000000000 +0100
+@@ -26,10 +26,10 @@ top_srcdir =	@top_srcdir@
  #
  # Add database drivers here.
  #
--DBDRIVER_OBJS =      ldapdb.o     pgsqldb.o    dirdb.o
--DBDRIVER_SRCS =      ldapdb.c     pgsqldb.c    dirdb.c
-+DBDRIVER_OBJS =      ldapdb.o     pgsqldb.o    sqlitedb.o	dirdb.o
-+DBDRIVER_SRCS =      ldapdb.c     pgsqldb.c    sqlitedb.c	dirdb.c
+-DBDRIVER_OBJS =	ldapdb.o pgsqldb.o dirdb.o
+-DBDRIVER_SRCS =	ldapdb.c pgsqldb.c dirdb.c
++DBDRIVER_OBJS =	ldapdb.o pgsqldb.o dirdb.o sqlitedb.o
++DBDRIVER_SRCS =	ldapdb.c pgsqldb.c dirdb.c sqlitedb.c
  DBDRIVER_INCLUDES =
--DBDRIVER_LIBS =      -lldap -llber  -lpq
-+DBDRIVER_LIBS =      -lldap -llber -lpq -lsqlite3
+-DBDRIVER_LIBS =	-lldap -llber -lpq
++DBDRIVER_LIBS =	-lldap -llber -lpq -lsqlite3
  
  DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
  
---- bind-9.4.0/bin/sdb_tools/Makefile.in.sdb-sqlite-bld	2007-03-12 14:00:05.000000000 +0100
-+++ bind-9.4.0/bin/sdb_tools/Makefile.in	2007-03-12 14:00:05.000000000 +0100
-@@ -30,11 +30,11 @@
+diff -up bind-9.5.0b2/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.5.0b2/bin/sdb_tools/Makefile.in
+--- bind-9.5.0b2/bin/sdb_tools/Makefile.in.sdb-sqlite-bld	2008-02-14 15:06:44.000000000 +0100
++++ bind-9.5.0b2/bin/sdb_tools/Makefile.in	2008-02-14 15:06:44.000000000 +0100
+@@ -30,11 +30,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
  LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
  		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
  
@@ -81,7 +84,7 @@
  
  MANPAGES =      zone2ldap.1
  
-@@ -54,6 +54,9 @@
+@@ -54,6 +54,9 @@ zone2ldap:	zone2ldap.o ${DEPLIBS}
  zonetodb:	zonetodb.o  ${DEPLIBS}
  	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.o -lpq ${LIBS}
  
@@ -91,7 +94,7 @@
  ldap2zone:	ldap2zone.o ${DEPLIBS}
  	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ldap2zone.o -lldap -llber ${LIBS}
  
-@@ -68,4 +71,5 @@
+@@ -68,4 +71,5 @@ install:: ${TARGETS} installdirs
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap ${DESTDIR}${sbindir}
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone ${DESTDIR}${sbindir}
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb  ${DESTDIR}${sbindir}
diff --git a/bind-9.4.1-ldap-api.patch b/bind-9.4.1-ldap-api.patch
index e040a84..279fcbb 100644
--- a/bind-9.4.1-ldap-api.patch
+++ b/bind-9.4.1-ldap-api.patch
@@ -1,5 +1,5 @@
---- bind-9.3.4/bin/named/Makefile.in.ldap-api	2007-05-18 16:21:21.000000000 +0200
-+++ bind-9.3.4/bin/named/Makefile.in	2007-05-18 16:22:16.000000000 +0200
+--- 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}
@@ -17,7 +17,7 @@ diff -up bind-9.5.0a5/bin/sdb_tools/Makefile.in.new-api bind-9.5.0a5/bin/sdb_too
  MANPAGES =      zone2ldap.1
  
 -EXT_CFLAGS =    -fPIE
-+EXT_CFLAGS =    -fPIE -DLDAP_DEPRECATED
++EXT_CFLAGS = -fPIE -DLDAP_DEPRECATED
  
  @BIND9_MAKE_RULES@
  
diff --git a/bind-9.5-sdb.patch b/bind-9.5-sdb.patch
index e879395..3b47c34 100644
--- a/bind-9.5-sdb.patch
+++ b/bind-9.5-sdb.patch
@@ -1,129 +1,6 @@
-diff -up bind-9.5.0a6/configure.in.sdb bind-9.5.0a6/configure.in
---- bind-9.5.0a6/configure.in.sdb	2007-06-19 01:47:16.000000000 +0200
-+++ bind-9.5.0a6/configure.in	2007-11-15 10:10:06.000000000 +0100
-@@ -2735,6 +2735,7 @@ AC_CONFIG_FILES([
- 	bin/tests/system/tkey/Makefile
- 	bin/tests/headerdep_test.sh
- 	bin/dnssec/Makefile
-+	bin/sdb_tools/Makefile
- 	doc/Makefile
- 	doc/arm/Makefile
- 	doc/misc/Makefile
-diff -up bind-9.5.0a6/bin/Makefile.in.sdb bind-9.5.0a6/bin/Makefile.in
---- bind-9.5.0a6/bin/Makefile.in.sdb	2007-06-20 01:46:59.000000000 +0200
-+++ bind-9.5.0a6/bin/Makefile.in	2007-11-15 10:10:06.000000000 +0100
-@@ -19,7 +19,7 @@ srcdir =	@srcdir@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests nsupdate check
-+SUBDIRS =	named rndc dig dnssec tests nsupdate check sdb_tools
- TARGETS =
- 
- @BIND9_MAKE_RULES@
-diff -up bind-9.5.0a6/bin/named/Makefile.in.sdb bind-9.5.0a6/bin/named/Makefile.in
---- bind-9.5.0a6/bin/named/Makefile.in.sdb	2007-11-15 10:10:06.000000000 +0100
-+++ bind-9.5.0a6/bin/named/Makefile.in	2007-11-15 10:11:56.000000000 +0100
-@@ -26,10 +26,10 @@ top_srcdir =	@top_srcdir@
- #
- # Add database drivers here.
- #
--DBDRIVER_OBJS =
--DBDRIVER_SRCS =
-+DBDRIVER_OBJS =      ldapdb.o     pgsqldb.o    dirdb.o
-+DBDRIVER_SRCS =      ldapdb.c     pgsqldb.c    dirdb.c
- DBDRIVER_INCLUDES =
--DBDRIVER_LIBS =
-+DBDRIVER_LIBS =      -lldap -llber  -lpq
- 
- DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
- 
-@@ -43,7 +43,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
- 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
- 		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES}
- 
--CDEFINES =      @USE_DLZ@
-+CDEFINES =
- 
- CWARNINGS =
- 
-@@ -66,21 +66,20 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
- 
- LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
--		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
-+		@LIBS@
- 
- SUBDIRS =	unix
- 
--TARGETS =	named@EXEEXT@ lwresd@EXEEXT@
-+TARGETS =	named@EXEEXT@ named-sdb@EXEEXT@ lwresd@EXEEXT@
- 
- OBJS =		builtin.o client.o config.o control.o \
- 		controlconf.o interfacemgr.o \
--		listenlist.o log.o logconf.o main.o notify.o \
-+		listenlist.o log.o logconf.o notify.o \
- 		query.o server.o sortlist.o statschannel.o \
- 		tkeyconf.o tsigconf.o update.o xfrout.o \
- 		zoneconf.o \
- 		lwaddr.o lwresd.o lwdclient.o lwderror.o lwdgabn.o \
- 		lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \
--		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
- 
- UOBJS =		unix/os.o
- 
-@@ -88,7 +87,7 @@ GENERATED =	bind9.xsl.h
- 
- SRCS =		builtin.c client.c config.c control.c \
- 		controlconf.c interfacemgr.c \
--		listenlist.c log.c logconf.c main.c notify.c \
-+		listenlist.c log.c logconf.c main.c main-sdb.c notify.c \
- 		query.c server.c sortlist.c statschannel.c \
- 		tkeyconf.c tsigconf.c update.c xfrout.c \
- 		zoneconf.c \
-@@ -116,15 +115,26 @@ main.o: main.c
- 		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
- 		-DNS_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main.c
- 
-+main-sdb.o : main-sdb.c
-+	${CC} ${ALL_CFLAGS} @USE_DLZ@ \
-+		-DVERSION=\"${VERSION}\" \
-+		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
-+		-DNS_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main-sdb.c
-+
- config.o: config.c
- 	${CC} ${ALL_CFLAGS} \
- 		-DVERSION=\"${VERSION}\" \
- 		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
- 		-c ${srcdir}/config.c
- 
--named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
-+named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS} main.o
-+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-+	${OBJS} main.o ${UOBJS} ${LIBS}
-+
-+named-sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS} main-sdb.o ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
--	${OBJS} ${UOBJS} ${LIBS}
-+	${OBJS} main-sdb.o ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS} ${UOBJS} ${LIBS} \
-+	${DLZDRIVER_LIBS} ${DBDRIVER_LIBS}
- 
- lwresd@EXEEXT@: named@EXEEXT@
- 	rm -f lwresd@EXEEXT@
-@@ -149,8 +159,9 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
--install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
-+install:: named@EXEEXT@ named-sdb@EXEEXT@ lwresd@EXEEXT@ installdirs
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
- 	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
- 	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
- 	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
-diff -up bind-9.5.0a6/bin/named/main-sdb.c.sdb bind-9.5.0a6/bin/named/main-sdb.c
---- bind-9.5.0a6/bin/named/main-sdb.c.sdb	2007-11-15 10:10:06.000000000 +0100
-+++ bind-9.5.0a6/bin/named/main-sdb.c	2007-11-15 10:10:06.000000000 +0100
+diff -up bind-9.5.0b2/bin/named-sdb/main.c.sdb bind-9.5.0b2/bin/named/main-sdb.c
+--- bind-9.5.0b2/bin/named-sdb/main.c.sdb	2008-02-11 17:32:43.000000000 +0100
++++ bind-9.5.0b2/bin/named-sdb/main.c	2008-02-11 17:32:43.000000000 +0100
 @@ -72,6 +72,9 @@
   * Include header files for database drivers here.
   */
@@ -214,3 +91,134 @@ diff -up bind-9.5.0a6/bin/named/main-sdb.c.sdb bind-9.5.0a6/bin/named/main-sdb.c
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
  		      ISC_LOG_NOTICE, "exiting");
  	ns_log_shutdown();
+diff -up bind-9.5.0b2/configure.in.sdb bind-9.5.0b2/configure.in
+--- bind-9.5.0b2/configure.in.sdb	2008-02-14 14:14:55.000000000 +0100
++++ bind-9.5.0b2/configure.in	2008-02-14 14:15:34.000000000 +0100
+@@ -2761,6 +2761,8 @@ AC_CONFIG_FILES([
+ 	bin/check/Makefile
+ 	bin/named/Makefile
+ 	bin/named/unix/Makefile
++	bin/named-sdb/Makefile
++	bin/named-sdb/unix/Makefile
+ 	bin/rndc/Makefile
+ 	bin/rndc/unix/Makefile
+ 	bin/dig/Makefile
+@@ -2782,6 +2784,7 @@ AC_CONFIG_FILES([
+ 	bin/tests/system/tkey/Makefile
+ 	bin/tests/headerdep_test.sh
+ 	bin/dnssec/Makefile
++	bin/sdb_tools/Makefile
+ 	doc/Makefile
+ 	doc/arm/Makefile
+ 	doc/misc/Makefile
+diff -up bind-9.5.0b2/bin/named-sdb/Makefile.in.sdb bind-9.5.0b2/bin/named-sdb/Makefile.in
+--- bind-9.5.0b2/bin/named-sdb/Makefile.in.sdb	2008-02-14 14:16:10.000000000 +0100
++++ bind-9.5.0b2/bin/named-sdb/Makefile.in	2008-02-14 14:18:45.000000000 +0100
+@@ -26,10 +26,10 @@ top_srcdir =	@top_srcdir@
+ #
+ # Add database drivers here.
+ #
+-DBDRIVER_OBJS =
+-DBDRIVER_SRCS =
++DBDRIVER_OBJS =	ldapdb.o pgsqldb.o dirdb.o
++DBDRIVER_SRCS =	ldapdb.c pgsqldb.c dirdb.c
+ DBDRIVER_INCLUDES =
+-DBDRIVER_LIBS =
++DBDRIVER_LIBS =	-lldap -llber -lpq
+ 
+ DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
+ 
+@@ -70,7 +70,7 @@ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9L
+ 
+ SUBDIRS =	unix
+ 
+-TARGETS =	named@EXEEXT@ lwresd@EXEEXT@
++TARGETS =	named-sdb@EXEEXT@
+ 
+ OBJS =		builtin.o client.o config.o control.o \
+ 		controlconf.o interfacemgr.o \
+@@ -118,7 +118,7 @@ config.o: config.c
+ 		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
+ 		-c ${srcdir}/config.c
+ 
+-named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
++named-sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
+ 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
+ 	${OBJS} ${UOBJS} ${LIBS}
+ 
+@@ -142,14 +142,8 @@ server.o: bind9.xsl.h
+ 
+ installdirs:
+ 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
+-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
+-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
+ 
+-install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
+-	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
+-	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
++install:: named-sdb@EXEEXT@ installdirs
++	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
+ 
+ @DLZ_DRIVER_RULES@
+diff -up bind-9.5.0b2/bin/Makefile.in.sdb bind-9.5.0b2/bin/Makefile.in
+--- bind-9.5.0b2/bin/Makefile.in.sdb	2008-02-14 14:15:42.000000000 +0100
++++ bind-9.5.0b2/bin/Makefile.in	2008-02-14 14:15:55.000000000 +0100
+@@ -19,7 +19,7 @@ srcdir =	@srcdir@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig dnssec tests nsupdate check
++SUBDIRS =	named named-sdb rndc dig dnssec tests nsupdate check sdb_tools
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
+diff -up bind-9.5.0b2/bin/named/Makefile.in.sdb bind-9.5.0b2/bin/named/Makefile.in
+--- bind-9.5.0b2/bin/named/Makefile.in.sdb	2008-02-14 14:19:39.000000000 +0100
++++ bind-9.5.0b2/bin/named/Makefile.in	2008-02-14 14:20:18.000000000 +0100
+@@ -43,7 +43,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
+ 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
+ 		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES}
+ 
+-CDEFINES =      @USE_DLZ@
++CDEFINES =
+ 
+ CWARNINGS =
+ 
+@@ -66,7 +66,7 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
+ 
+ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
+ 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
+-		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
++		@LIBS@
+ 
+ SUBDIRS =	unix
+ 
+@@ -79,8 +79,7 @@ OBJS =		builtin.o client.o config.o
+ 		tkeyconf.o tsigconf.o update.o xfrout.o \
+ 		zoneconf.o \
+ 		lwaddr.o lwresd.o lwdclient.o lwderror.o lwdgabn.o \
+-		lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \
+-		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
++		lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o
+ 
+ UOBJS =		unix/os.o
+ 
+@@ -91,8 +90,7 @@ SRCS =		builtin.c client.c config.c cont
+ 		tkeyconf.c tsigconf.c update.c xfrout.c \
+ 		zoneconf.c \
+ 		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
+-		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
+-		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
++		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
+ 
+ MANPAGES =	named.8 lwresd.8 named.conf.5
+ 
+@@ -151,5 +149,3 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i
+ 	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
+ 	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
+ 	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
+-
+-@DLZ_DRIVER_RULES@
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)