diff options
Diffstat (limited to 'dev-libs/cyrus-sasl/files')
4 files changed, 29 insertions, 28 deletions
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-db4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-db4.patch deleted file mode 100644 index ef0156770dd8..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-db4.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 ---- cyrus-sasl-2.1.14/cmulocal/berkdb.m4 2003-04-15 17:25:41.000000000 -0500 -+++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 2003-07-09 03:17:48.000000000 -0500 -@@ -211,12 +211,20 @@ - BDB_LIBADD="" - fi - -- for dbname in 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-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db - do -- AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; -- dblib="berkeley"; break, dblib="no") -+ AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname"; -+ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname"; -+ dblib="berkeley"; break, dblib="no")) - done - if test "$dblib" = "no"; then -+ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db -+ do -+ AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; -+ dblib="berkeley"; break, dblib="no") -+ done -+ fi -+ if test "$dblib" = "no"; then - AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb"; - dblib="berkeley"; dbname=db, - dblib="no") diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-db4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-db4.patch new file mode 100644 index 000000000000..17ea7e1db673 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-db4.patch @@ -0,0 +1,28 @@ +diff -urN cyrus-sasl-2.1.18/cmulocal/berkdb.m4 cyrus-sasl-2.1.18/cmulocal/berkdb.m4 +--- cyrus-sasl-2.1.18/cmulocal/berkdb.m4 2003-04-15 17:25:41.000000000 -0500 ++++ cyrus-sasl-2.1.18/cmulocal/berkdb.m4 2003-07-09 03:17:48.000000000 -0500 +@@ -211,12 +211,21 @@ + BDB_LIBADD="" + fi + +- for dbname in 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-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db + do +- AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; +- dblib="berkeley"; break, dblib="no") ++ AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4002, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, dblib="no"))) + done + if test "$dblib" = "no"; then ++ for dbname in 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 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ do ++ AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, dblib="no") ++ done ++ fi ++ if test "$dblib" = "no"; then + AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb"; + dblib="berkeley"; dbname=db, + dblib="no") diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17 deleted file mode 100644 index 954839a230d0..000000000000 --- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17 +++ /dev/null @@ -1 +0,0 @@ -MD5 4add6be2f194dc51aafc64193a1dd77b cyrus-sasl-2.1.17.tar.gz 1499725 diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18 new file mode 100644 index 000000000000..2993b6dbb3ed --- /dev/null +++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18 @@ -0,0 +1 @@ +MD5 1eafae95f0289c10f187d8b2bc4032cf cyrus-sasl-2.1.18.tar.gz 1522578 |