[cyrus-sasl] bring the cyrus-sasl-2.1.25-current-db.patch patch back
plautrba
plautrba at fedoraproject.org
Mon Dec 10 21:01:19 UTC 2012
commit e11b7828539374a90c8711e5f2c7dc7772d0d5e2
Author: Petr Lautrbach <plautrba at redhat.com>
Date: Mon Dec 10 21:38:16 2012 +0100
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(-)
---
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 <stdio.h>
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
More information about the scm-commits
mailing list