Rebase to 9.8.1rc1 and update patches.

bind97-cleanup.patch, bind97-rh674334.patch and bind98-includes.patch were
merged.

Signed-off-by: Adam Tkac <atkac@redhat.com>

1 files changed, 18 insertions, 18 deletions

diff --git a/bind-9.5-sdb-sqlite-bld.patch b/bind-9.5-sdb-sqlite-bld.patch
index 4f69a57..768af1c 100644
--- a/bind-9.5-sdb-sqlite-bld.patch
+++ b/bind-9.5-sdb-sqlite-bld.patch
@@ -1,15 +1,15 @@
-diff -up bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.1b1/bin/named-sdb/main.c
---- bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld	2008-07-21 12:19:50.000000000 +0200
-+++ bind-9.5.1b1/bin/named-sdb/main.c	2008-07-21 12:19:50.000000000 +0200
-@@ -74,6 +74,7 @@
+diff -up bind-9.8.1rc1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.8.1rc1/bin/named-sdb/main.c
+--- bind-9.8.1rc1/bin/named-sdb/main.c.sdb-sqlite-bld	2011-08-31 14:41:15.646020840 +0200
++++ bind-9.8.1rc1/bin/named-sdb/main.c	2011-08-31 14:41:35.132019452 +0200
+@@ -85,6 +85,7 @@
  /* #include "xxdb.h" */
  #include "ldapdb.h"
  #include "pgsqldb.h"
 +#include "sqlitedb.h"
  #include "dirdb.h"
  
- /*
-@@ -646,6 +647,7 @@ setup(void) {
+ #ifdef CONTRIB_DLZ
+@@ -792,6 +793,7 @@ setup(void) {
  
  	ldapdb_clear();
  	pgsqldb_clear();
@@ -17,7 +17,7 @@ diff -up bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.1b1/bin/named
  	dirdb_clear();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-@@ -743,6 +745,23 @@ setup(void) {
+@@ -921,6 +923,23 @@ setup(void) {
                            ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
                           );
  
@@ -41,7 +41,7 @@ diff -up bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.1b1/bin/named
          result = dirdb_init();
          if (result != ISC_R_SUCCESS)
          {
-@@ -787,6 +806,7 @@ cleanup(void) {
+@@ -971,6 +990,7 @@ cleanup(void) {
  
          ldapdb_clear();
          pgsqldb_clear();
@@ -49,10 +49,10 @@ diff -up bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.1b1/bin/named
          dirdb_clear();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-diff -up bind-9.5.1b1/bin/named-sdb/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/named-sdb/Makefile.in
---- bind-9.5.1b1/bin/named-sdb/Makefile.in.sdb-sqlite-bld	2008-07-21 12:19:50.000000000 +0200
-+++ bind-9.5.1b1/bin/named-sdb/Makefile.in	2008-07-21 12:19:50.000000000 +0200
-@@ -26,10 +26,10 @@ top_srcdir =	@top_srcdir@
+diff -up bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb-sqlite-bld bind-9.8.1rc1/bin/named-sdb/Makefile.in
+--- bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb-sqlite-bld	2011-08-31 14:41:15.646020840 +0200
++++ bind-9.8.1rc1/bin/named-sdb/Makefile.in	2011-08-31 14:41:15.658020839 +0200
+@@ -28,10 +28,10 @@ top_srcdir =	@top_srcdir@
  #
  # Add database drivers here.
  #
@@ -66,10 +66,10 @@ diff -up bind-9.5.1b1/bin/named-sdb/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/
  
  DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
  
-diff -up bind-9.5.1b1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/sdb_tools/Makefile.in
---- bind-9.5.1b1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld	2008-07-21 12:19:50.000000000 +0200
-+++ bind-9.5.1b1/bin/sdb_tools/Makefile.in	2008-07-21 12:22:13.000000000 +0200
-@@ -30,11 +30,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
+diff -up bind-9.8.1rc1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.8.1rc1/bin/sdb_tools/Makefile.in
+--- bind-9.8.1rc1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld	2011-08-31 14:41:15.651020840 +0200
++++ bind-9.8.1rc1/bin/sdb_tools/Makefile.in	2011-08-31 14:41:15.658020839 +0200
+@@ -32,11 +32,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
  LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
  		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
  
@@ -84,7 +84,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/
  
  MANPAGES =      zone2ldap.1
  
-@@ -48,6 +48,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLI
+@@ -50,6 +50,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLI
  zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
  	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
  
@@ -94,7 +94,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/
  ldap2zone@EXEEXT@: ldap2zone.@O@ ${DEPLIBS}
  	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ldap2zone.@O@ -lldap -llber ${LIBS}
  
-@@ -62,4 +65,5 @@ install:: ${TARGETS} installdirs
+@@ -64,4 +67,5 @@ install:: ${TARGETS} installdirs
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone@EXEEXT@ ${DESTDIR}${sbindir}
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}