diff options
author | Adam Tkac <atkac@redhat.com> | 2012-04-24 14:59:30 +0200 |
---|---|---|
committer | Adam Tkac <atkac@redhat.com> | 2012-04-24 14:59:30 +0200 |
commit | 0e5b5af688d2465b917012d264340be7f5b8f5d6 (patch) | |
tree | be89ea63dc81bf6e2c2ffd6f446437a56d0561d2 /bind-9.5-dlz-64bit.patch | |
parent | 8d53d349947a6999daad2a57625c8a6332ed9dc8 (diff) | |
download | bind-0e5b5af688d2465b917012d264340be7f5b8f5d6.tar.gz bind-0e5b5af688d2465b917012d264340be7f5b8f5d6.tar.xz bind-0e5b5af688d2465b917012d264340be7f5b8f5d6.zip |
apply all non-SDB patches before SDB ones (#804475)
enable Berkeley DB DLZ backend (#804478)
Signed-off-by: Adam Tkac <atkac@redhat.com>
Diffstat (limited to 'bind-9.5-dlz-64bit.patch')
-rw-r--r-- | bind-9.5-dlz-64bit.patch | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/bind-9.5-dlz-64bit.patch b/bind-9.5-dlz-64bit.patch index 2b0014a..0e726d8 100644 --- a/bind-9.5-dlz-64bit.patch +++ b/bind-9.5-dlz-64bit.patch @@ -1,6 +1,6 @@ -diff -up bind-9.5.1b1/contrib/dlz/config.dlz.in.64bit bind-9.5.1b1/contrib/dlz/config.dlz.in ---- bind-9.5.1b1/contrib/dlz/config.dlz.in.64bit 2008-06-17 06:03:31.000000000 +0200 -+++ bind-9.5.1b1/contrib/dlz/config.dlz.in 2008-07-11 12:08:43.000000000 +0200 +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 @@ -17,6 +17,13 @@ # dlzdir='${DLZ_DRIVER_DIR}' @@ -27,6 +27,20 @@ diff -up bind-9.5.1b1/contrib/dlz/config.dlz.in.64bit bind-9.5.1b1/contrib/dlz/c 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" + then +- dlz_bdb_libs="-L${dd}/lib " ++ dlz_bdb_libs="-L${dd}/${target_lib} " + else + dlz_bdb_libs="" + fi @@ -383,7 +390,7 @@ case "$use_dlz_ldap" in *) DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver, |