- update to 9.7.0a3bind-9_7_0-0_3_a3_fc13

1 files changed, 38 insertions, 33 deletions

diff --git a/bind-9.5-sdb.patch b/bind-9.5-sdb.patch
index 5ce3d17..726a96f 100644
--- a/bind-9.5-sdb.patch
+++ b/bind-9.5-sdb.patch
@@ -1,6 +1,6 @@
-diff -up bind-9.7.0a2/bin/Makefile.in.sdb bind-9.7.0a2/bin/Makefile.in
---- bind-9.7.0a2/bin/Makefile.in.sdb	2009-06-10 02:27:21.000000000 +0200
-+++ bind-9.7.0a2/bin/Makefile.in	2009-09-15 14:43:48.966994484 +0200
+diff -up bind-9.7.0a3/bin/Makefile.in.sdb bind-9.7.0a3/bin/Makefile.in
+--- bind-9.7.0a3/bin/Makefile.in.sdb	2009-06-10 02:27:21.000000000 +0200
++++ bind-9.7.0a3/bin/Makefile.in	2009-09-16 12:55:29.034655166 +0200
 @@ -19,7 +19,8 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
@@ -11,28 +11,33 @@ diff -up bind-9.7.0a2/bin/Makefile.in.sdb bind-9.7.0a2/bin/Makefile.in
  TARGETS =
  
  @BIND9_MAKE_RULES@
-diff -up bind-9.7.0a2/bin/named/Makefile.in.sdb bind-9.7.0a2/bin/named/Makefile.in
---- bind-9.7.0a2/bin/named/Makefile.in.sdb	2009-09-15 14:41:03.827015348 +0200
-+++ bind-9.7.0a2/bin/named/Makefile.in	2009-09-15 14:41:03.886994927 +0200
+diff -up bind-9.7.0a3/bin/named/Makefile.in.sdb bind-9.7.0a3/bin/named/Makefile.in
+--- bind-9.7.0a3/bin/named/Makefile.in.sdb	2009-09-16 12:55:28.994644340 +0200
++++ bind-9.7.0a3/bin/named/Makefile.in	2009-09-16 12:56:40.424643332 +0200
 @@ -45,7 +45,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
  		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
  		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES}
  
--CDEFINES =      @USE_DLZ@
-+CDEFINES =
+-CDEFINES =      -DBIND9 @USE_DLZ@
++CDEFINES =      -DBIND9
  
  CWARNINGS =
  
-@@ -68,7 +68,7 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
+@@ -69,11 +69,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
  
  LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
  		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
 -		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
 +		@LIBS@
  
+ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
+ 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
+-		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
++		@LIBS@
+ 
  SUBDIRS =	unix
  
-@@ -81,8 +81,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O
+@@ -86,8 +86,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@ \
@@ -42,7 +47,7 @@ diff -up bind-9.7.0a2/bin/named/Makefile.in.sdb bind-9.7.0a2/bin/named/Makefile.
  
  UOBJS =		unix/os.@O@
  
-@@ -93,8 +92,7 @@ SRCS =		builtin.c client.c config.c cont
+@@ -100,8 +99,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 \
@@ -52,16 +57,16 @@ diff -up bind-9.7.0a2/bin/named/Makefile.in.sdb bind-9.7.0a2/bin/named/Makefile.
  
  MANPAGES =	named.8 lwresd.8 named.conf.5
  
-@@ -158,5 +156,3 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i
+@@ -166,5 +164,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 -up bind-9.7.0a2/bin/named-sdb/main.c.sdb bind-9.7.0a2/bin/named-sdb/main.c
---- bind-9.7.0a2/bin/named-sdb/main.c.sdb	2009-09-15 14:41:03.846995272 +0200
-+++ bind-9.7.0a2/bin/named-sdb/main.c	2009-09-15 14:41:03.886994927 +0200
-@@ -74,6 +74,9 @@
+diff -up bind-9.7.0a3/bin/named-sdb/main.c.sdb bind-9.7.0a3/bin/named-sdb/main.c
+--- bind-9.7.0a3/bin/named-sdb/main.c.sdb	2009-09-16 12:55:29.014643786 +0200
++++ bind-9.7.0a3/bin/named-sdb/main.c	2009-09-16 12:55:29.034655166 +0200
+@@ -75,6 +75,9 @@
   * Include header files for database drivers here.
   */
  /* #include "xxdb.h" */
@@ -71,7 +76,7 @@ diff -up bind-9.7.0a2/bin/named-sdb/main.c.sdb bind-9.7.0a2/bin/named-sdb/main.c
  
  /*
   * Include DLZ drivers if appropriate.
-@@ -685,6 +688,10 @@ setup(void) {
+@@ -757,6 +760,10 @@ setup(void) {
  		ns_main_earlyfatal("isc_app_start() failed: %s",
  				   isc_result_totext(result));
  
@@ -82,7 +87,7 @@ diff -up bind-9.7.0a2/bin/named-sdb/main.c.sdb bind-9.7.0a2/bin/named-sdb/main.c
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
  		      ISC_LOG_NOTICE, "starting BIND %s%s", ns_g_version,
  		      saved_command_line);
-@@ -766,6 +773,57 @@ setup(void) {
+@@ -840,6 +847,57 @@ setup(void) {
  				   isc_result_totext(result));
  #endif
  
@@ -140,7 +145,7 @@ diff -up bind-9.7.0a2/bin/named-sdb/main.c.sdb bind-9.7.0a2/bin/named-sdb/main.c
  	ns_server_create(ns_g_mctx, &ns_g_server);
  }
  
-@@ -793,6 +851,10 @@ cleanup(void) {
+@@ -867,6 +925,10 @@ cleanup(void) {
  
  	dns_name_destroy();
  
@@ -151,9 +156,9 @@ diff -up bind-9.7.0a2/bin/named-sdb/main.c.sdb bind-9.7.0a2/bin/named-sdb/main.c
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
  		      ISC_LOG_NOTICE, "exiting");
  	ns_log_shutdown();
-diff -up bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb bind-9.7.0a2/bin/named-sdb/Makefile.in
---- bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb	2009-09-15 14:41:03.846995272 +0200
-+++ bind-9.7.0a2/bin/named-sdb/Makefile.in	2009-09-15 14:43:19.486994430 +0200
+diff -up bind-9.7.0a3/bin/named-sdb/Makefile.in.sdb bind-9.7.0a3/bin/named-sdb/Makefile.in
+--- bind-9.7.0a3/bin/named-sdb/Makefile.in.sdb	2009-09-16 12:55:29.014643786 +0200
++++ bind-9.7.0a3/bin/named-sdb/Makefile.in	2009-09-16 12:57:05.617143628 +0200
 @@ -28,10 +28,10 @@ top_srcdir =	@top_srcdir@
  #
  # Add database drivers here.
@@ -168,7 +173,7 @@ diff -up bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb bind-9.7.0a2/bin/named-sdb/M
  
  DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
  
-@@ -72,7 +72,7 @@ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9L
+@@ -77,7 +77,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BI
  
  SUBDIRS =	unix
  
@@ -177,16 +182,16 @@ diff -up bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb bind-9.7.0a2/bin/named-sdb/M
  
  OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
  		controlconf.@O@ interfacemgr.@O@ \
-@@ -125,7 +125,7 @@ config.@O@: config.c bind.keys.h
+@@ -132,7 +132,7 @@ config.@O@: config.c bind.keys.h
  		-DNS_SYSCONFDIR=\"${sysconfdir}\" \
  		-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}
- 
-@@ -149,14 +149,8 @@ statschannel.@O@: bind9.xsl.h
+ 	export MAKE_SYMTABLE="yes"; \
+ 	export BASEOBJS="${OBJS} ${UOBJS}"; \
+ 	${FINALBUILDCMD}
+@@ -157,14 +157,8 @@ statschannel.@O@: bind9.xsl.h
  
  installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@@ -203,10 +208,10 @@ diff -up bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb bind-9.7.0a2/bin/named-sdb/M
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
  
  @DLZ_DRIVER_RULES@
-diff -up bind-9.7.0a2/configure.in.sdb bind-9.7.0a2/configure.in
---- bind-9.7.0a2/configure.in.sdb	2009-07-15 00:38:37.000000000 +0200
-+++ bind-9.7.0a2/configure.in	2009-09-15 14:43:00.036994464 +0200
-@@ -2958,6 +2958,8 @@ AC_CONFIG_FILES([
+diff -up bind-9.7.0a3/configure.in.sdb bind-9.7.0a3/configure.in
+--- bind-9.7.0a3/configure.in.sdb	2009-09-04 02:44:54.000000000 +0200
++++ bind-9.7.0a3/configure.in	2009-09-16 12:55:29.044644803 +0200
+@@ -3144,6 +3144,8 @@ AC_CONFIG_FILES([
  	bin/confgen/unix/Makefile
  	bin/named/Makefile
  	bin/named/unix/Makefile
@@ -215,7 +220,7 @@ diff -up bind-9.7.0a2/configure.in.sdb bind-9.7.0a2/configure.in
  	bin/rndc/Makefile
  	bin/dig/Makefile
  	bin/nsupdate/Makefile
-@@ -2979,6 +2981,7 @@ AC_CONFIG_FILES([
+@@ -3165,6 +3167,7 @@ AC_CONFIG_FILES([
  	bin/tests/headerdep_test.sh
  	bin/tools/Makefile
  	bin/dnssec/Makefile