Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 crypto/cyrus-sasl/DETAILS    |    4 ++--
 crypto/cyrus-sasl/HISTORY    |    5 +++++
 crypto/cyrus-sasl/PRE_BUILD  |    7 ++++---
 crypto/cyrus-sasl/db5.patch  |   24 ++++++++++++++++++++++++
 crypto/cyrus-sasl/gcc44.diff |   20 --------------------
 5 files changed, 35 insertions(+), 25 deletions(-)

New commits:
commit 67e9f75bf34dac0b056f3bdc85e537cb34f330e2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    cyrus-sasl: => 2.1.25

diff --git a/crypto/cyrus-sasl/DETAILS b/crypto/cyrus-sasl/DETAILS
index 7ec8500..d1d1c7a 100755
--- a/crypto/cyrus-sasl/DETAILS
+++ b/crypto/cyrus-sasl/DETAILS
@@ -1,9 +1,9 @@
            SPELL=cyrus-sasl
-         VERSION=2.1.23
+         VERSION=2.1.25
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$SOURCE
    
SOURCE_URL[1]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index e333934..138848b 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,8 @@
+2012-01-18 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.1.25; quoting paths
+       * gcc44.diff: removed, fixed by upstream
+       * db5.patch: added, for db >5.0 support
+
 2011-09-26 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: converted to upstream signature checking
        * 6581B5F1.gpg: added gpg keyring
diff --git a/crypto/cyrus-sasl/PRE_BUILD b/crypto/cyrus-sasl/PRE_BUILD
index ec632ca..ba9528d 100755
--- a/crypto/cyrus-sasl/PRE_BUILD
+++ b/crypto/cyrus-sasl/PRE_BUILD
@@ -1,3 +1,4 @@
-default_pre_build   &&
-cd $SOURCE_DIRECTORY &&
-patch  -p0 < $SPELL_DIRECTORY/gcc44.diff
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/db5.patch"
diff --git a/crypto/cyrus-sasl/db5.patch b/crypto/cyrus-sasl/db5.patch
new file mode 100644
index 0000000..5228240
--- /dev/null
+++ b/crypto/cyrus-sasl/db5.patch
@@ -0,0 +1,24 @@
+Author: Ondřej Surý <ondrej AT debian.org>
+Description: Support newer Berkeley DB versions
+--- a/sasldb/db_berkeley.c
++++ b/sasldb/db_berkeley.c
+@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
+     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);
+--- a/utils/dbconverter-2.c
++++ b/utils/dbconverter-2.c
+@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
+     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);
diff --git a/crypto/cyrus-sasl/gcc44.diff b/crypto/cyrus-sasl/gcc44.diff
deleted file mode 100644
index 9f3fb53..0000000
--- a/crypto/cyrus-sasl/gcc44.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/digestmd5.c        2006-05-17 18:46:17.000000000 +0200
-+++ plugins/digestmd5.c.cp     2009-04-07 16:20:31.000000000 +0200
-@@ -2715,7 +2715,7 @@
-       "DIGEST-MD5",                   /* mech_name */
- #ifdef WITH_RC4
-       128,                            /* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
-       112,
- #else 
-       1,
-@@ -4034,7 +4034,7 @@
-       "DIGEST-MD5",
- #ifdef WITH_RC4                               /* mech_name */
-       128,                            /* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
-       112,
- #else
-       1,