X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cyrus-sasl-db.patch;h=ce9f264937b78763bb60d47865ce863d4d2e5c20;hb=5810fa6ce25d4145b4ba76bcd01eb577bd6e5895;hp=13d48d15e51a93366f211385bfd0e80f06a1fe95;hpb=a127c0edb4c87d9645b096b8a39857d2109d81b8;p=packages%2Fcyrus-sasl.git

diff --git a/cyrus-sasl-db.patch b/cyrus-sasl-db.patch
index 13d48d1..ce9f264 100644
--- a/cyrus-sasl-db.patch
+++ b/cyrus-sasl-db.patch
@@ -1,33 +1,10 @@
---- cyrus-sasl-2.1.25/cmulocal/berkdb.m4.orig	2010-01-22 16:12:01.000000000 +0100
-+++ cyrus-sasl-2.1.25/cmulocal/berkdb.m4	2011-09-16 21:30:03.046111208 +0200
-@@ -213,7 +213,7 @@
- 	fi
+--- cyrus-sasl-2.1.26/cmulocal/berkdb.m4.orig	2012-11-23 18:30:01.142069119 +0100
++++ cyrus-sasl-2.1.26/cmulocal/berkdb.m4	2012-11-23 18:31:46.428733592 +0100
+@@ -214,6 +214,7 @@
  
  	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-5.3 db-5.2 db-5.1 db-5.0 db-4.8 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
-           do
- 	    LIBS="$saved_LIBS -l$dbname"
- 	    AC_TRY_LINK([#include <stdio.h>
---- cyrus-sasl-2.1.23/sasldb/db_berkeley.c.orig	2009-04-28 17:09:18.000000000 +0200
-+++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c	2010-05-18 21:02:20.418940098 +0200
-@@ -100,7 +100,7 @@
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
---- cyrus-sasl-2.1.23/utils/dbconverter-2.c.orig	2003-02-13 20:56:17.000000000 +0100
-+++ cyrus-sasl-2.1.23/utils/dbconverter-2.c	2010-05-18 21:11:09.982932556 +0200
-@@ -214,7 +214,7 @@
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
+ 	    for dbname in ${with_bdb} \
++		db-5.3 db5.3 db53 \
+ 	        db-5.2 db5.2 db52 \
+ 	        db-5.1 db5.2 db51 \
+ 	        db-5.0 db5.2 db50 \