[cyrus-sasl/f18] Revert "bring the cyrus-sasl-2.1.25-current-db.patch patch back"

[plautrba]

commit 80ef3c9e08d43b3dfc80a1d75450778befa4a622
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Mon Jan 21 14:16:47 2013 +0100

    Revert "bring the cyrus-sasl-2.1.25-current-db.patch patch back"
    
    This reverts commit e11b7828539374a90c8711e5f2c7dc7772d0d5e2.

 cyrus-sasl-2.1.22-current-db.patch |   28 ++++++++++++++++++++++++++++
 cyrus-sasl-2.1.25-current-db.patch |   12 ------------
 cyrus-sasl.spec                    |    2 --
 3 files changed, 28 insertions(+), 14 deletions(-)
---
diff --git a/cyrus-sasl-2.1.22-current-db.patch b/cyrus-sasl-2.1.22-current-db.patch
new file mode 100644
index 0000000..fcf1e2b
--- /dev/null
+++ b/cyrus-sasl-2.1.22-current-db.patch
@@ -0,0 +1,28 @@
+Always use current db when linking. (libdb.so is symlink to the current db4)
+diff -up cyrus-sasl-2.1.22/cmulocal/berkdb.m4.current-db cyrus-sasl-2.1.22/cmulocal/berkdb.m4
+--- cyrus-sasl-2.1.22/cmulocal/berkdb.m4.current-db	2005-04-26 21:14:07.000000000 +0200
++++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4	2008-09-26 11:49:34.000000000 +0200
+@@ -213,10 +213,11 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+ 	fi
+ 
+ 	saved_LIBS=$LIBS
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in db db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
+           do
+ 	    LIBS="$saved_LIBS -l$dbname"
+-	    AC_TRY_LINK([#include <db.h>],
++	    AC_TRY_LINK([#include <stdio.h>
++#include <db.h>],
+ 	    [db_create(NULL, NULL, 0);],
+ 	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
+             dblib="no")
+@@ -224,7 +225,8 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+           done
+         if test "$dblib" = "no"; then
+ 	    LIBS="$saved_LIBS -ldb"
+-	    AC_TRY_LINK([#include <db.h>],
++	    AC_TRY_LINK([#include <stdio.h>
++#include <db.h>],
+ 	    [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);],
+ 	    BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
+             dblib="no")
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index d28aa8a..d4eac04 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -32,7 +32,6 @@ Patch27: cyrus-sasl-2.1.22-automake-1.10.patch
 Patch28: cyrus-sasl-2.1.21-keytab.patch
 Patch31: cyrus-sasl-2.1.22-kerberos4.patch
 Patch32: cyrus-sasl-2.1.25-warnings.patch
-Patch33: cyrus-sasl-2.1.25-current-db.patch
 Patch34: cyrus-sasl-2.1.22-ldap-timeout.patch
 Patch37: cyrus-sasl-2.1.23-race.patch
 # removed due to #759334
@@ -182,7 +181,6 @@ chmod -x include/*.h
 %patch24 -p1 -b .sizes
 %patch31 -p1 -b .krb4
 %patch32 -p1 -b .warnings
-%patch33 -p1 -b .current-db
 %patch34 -p1 -b .ldap-timeout
 %patch37 -p1 -b .race
 %patch40 -p1 -b .rimap2