From b746061914a9103cf5a7f7f947ee12f19a580d3d Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
Date: Thu, 2 Oct 2014 14:14:01 +0200
Subject: Update to 9.9.6

- drop merged patches and rebase some of existing patches

Signed-off-by: Tomas Hozza <thozza@redhat.com>
---
 bind-9.5-dlz-64bit.patch | 64 ++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 35 deletions(-)

(limited to 'bind-9.5-dlz-64bit.patch')

diff --git a/bind-9.5-dlz-64bit.patch b/bind-9.5-dlz-64bit.patch
index 0e726d8..5994e68 100644
--- a/bind-9.5-dlz-64bit.patch
+++ b/bind-9.5-dlz-64bit.patch
@@ -1,6 +1,6 @@
-diff -up bind-9.9.0/contrib/dlz/config.dlz.in.64bit bind-9.9.0/contrib/dlz/config.dlz.in
---- bind-9.9.0/contrib/dlz/config.dlz.in.64bit	2011-11-05 06:14:28.000000000 +0100
-+++ bind-9.9.0/contrib/dlz/config.dlz.in	2012-04-24 14:52:08.398511143 +0200
+diff -up bind-9.10.1b1/contrib/dlz/config.dlz.in.64bit bind-9.10.1b1/contrib/dlz/config.dlz.in
+--- bind-9.10.1b1/contrib/dlz/config.dlz.in.64bit	2014-06-23 06:47:35.000000000 +0200
++++ bind-9.10.1b1/contrib/dlz/config.dlz.in	2014-07-29 15:29:06.956527598 +0200
 @@ -17,6 +17,13 @@
  #
  dlzdir='${DLZ_DRIVER_DIR}'
@@ -15,7 +15,7 @@ diff -up bind-9.9.0/contrib/dlz/config.dlz.in.64bit bind-9.9.0/contrib/dlz/confi
  #
  # Private autoconf macro to simplify configuring drivers:
  #
-@@ -135,9 +142,9 @@ then
+@@ -140,9 +147,9 @@ then
  		then
  			use_dlz_mysql=$d
  			mysql_include=$d/include/mysql
@@ -27,21 +27,19 @@ diff -up bind-9.9.0/contrib/dlz/config.dlz.in.64bit bind-9.9.0/contrib/dlz/confi
  			else
  				mysql_lib=$d/lib
  			fi
-@@ -274,11 +281,11 @@ case "$use_dlz_bdb" in
- 			bdb_libnames="db48 db-4.8 db47 db-4.7 db46 db-4.6 db45 db-4.5 db44 db-4.4 db43 db-4.3 db42 db-4.2 db41 db-4.1 db"
- 			for d in $bdb_libnames
- 			do
--				if test -f "$dd/lib/lib${d}.so"
-+				if test -f "$dd/${target_lib}/lib${d}.so"
- 				then
- 					if test "$dd" != "/usr"
+@@ -288,9 +295,9 @@ case "$use_dlz_bdb" in
  					then
--						dlz_bdb_libs="-L${dd}/lib "
-+						dlz_bdb_libs="-L${dd}/${target_lib} "
- 					else
- 						dlz_bdb_libs=""
+ 						break
  					fi
-@@ -383,7 +390,7 @@ case "$use_dlz_ldap" in
+-				elif test -f "$dd/lib/lib${d}.so"
++				elif test -f "$dd/${target_lib}/lib${d}.so"
+ 				then
+-					dlz_bdb_libs="-L${dd}/lib -l${d}"
++					dlz_bdb_libs="-L${dd}/${target_lib} -l${d}"
+ 					break
+ 				fi
+ 			done
+@@ -390,7 +397,7 @@ case "$use_dlz_ldap" in
  	*)
  		DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver,
  				[-I$use_dlz_ldap/include],
@@ -50,21 +48,17 @@ diff -up bind-9.9.0/contrib/dlz/config.dlz.in.64bit bind-9.9.0/contrib/dlz/confi
  
  		AC_MSG_RESULT(
  [using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include])
-@@ -407,7 +414,7 @@ then
- 	odbcdirs="/usr /usr/local /usr/pkg"
- 	for d in $odbcdirs
- 	do
--		if test -f $d/include/sql.h -a -f $d/lib/libodbc.a
-+		if test -f $d/include/sql.h -a -f $d/${target_lib}/libodbc.a
- 		then
- 			use_dlz_odbc=$d
- 			break
-@@ -427,7 +434,7 @@ case "$use_dlz_odbc" in
- 	*)
- 		DLZ_ADD_DRIVER(ODBC, dlz_odbc_driver,
- 				[-I$use_dlz_odbc/include],
--				[-L$use_dlz_odbc/lib -lodbc])
-+				[-L$use_dlz_odbc/${target_lib} -lodbc])
- 
- 		AC_MSG_RESULT([using ODBC from $use_dlz_odbc])
- 		;;
+@@ -425,11 +432,11 @@ then
+ 		odbcdirs="/usr /usr/local /usr/pkg"
+ 		for d in $odbcdirs
+ 		do
+-			if test -f $d/include/sql.h -a -f $d/lib/libodbc.a
++			if test -f $d/include/sql.h -a -f $d/${target_lib}/libodbc.a
+ 			then
+ 				use_dlz_odbc=$d
+ 				dlz_odbc_include="-I$use_dlz_odbc/include"
+-				dlz_odbc_libs="-L$use_dlz_odbc/lib -lodbc"
++				dlz_odbc_libs="-L$use_dlz_odbc/${target_lib} -lodbc"
+ 				break
+ 			fi
+ 		done
-- 
cgit