From e11b7828539374a90c8711e5f2c7dc7772d0d5e2 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Mon, 10 Dec 2012 21:38:16 +0100 Subject: [PATCH] bring the cyrus-sasl-2.1.25-current-db.patch patch back --- 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, 14 insertions(+), 28 deletions(-) delete mode 100644 cyrus-sasl-2.1.22-current-db.patch create mode 100644 cyrus-sasl-2.1.25-current-db.patch diff --git a/cyrus-sasl-2.1.22-current-db.patch b/cyrus-sasl-2.1.22-current-db.patch deleted file mode 100644 index fcf1e2b..0000000 --- a/cyrus-sasl-2.1.22-current-db.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 ], -+ AC_TRY_LINK([#include -+#include ], - [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 ], -+ AC_TRY_LINK([#include -+#include ], - [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-2.1.25-current-db.patch b/cyrus-sasl-2.1.25-current-db.patch new file mode 100644 index 0000000..9a5ba18 --- /dev/null +++ b/cyrus-sasl-2.1.25-current-db.patch @@ -0,0 +1,12 @@ +diff -up cyrus-sasl-2.1.25/cmulocal/berkdb.m4.current-db cyrus-sasl-2.1.25/cmulocal/berkdb.m4 +--- cyrus-sasl-2.1.25/cmulocal/berkdb.m4.current-db 2010-01-22 16:12:01.000000000 +0100 ++++ cyrus-sasl-2.1.25/cmulocal/berkdb.m4 2012-12-10 21:30:20.982219356 +0100 +@@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB], + fi + + saved_LIBS=$LIBS +- for dbname in ${with_bdb} db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 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 ${with_bdb} db db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 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 diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index d4eac04..d28aa8a 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -32,6 +32,7 @@ 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 @@ -181,6 +182,7 @@ 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