diff options
| author | piernov <piernov@piernov.org> | 2012-03-04 13:20:42 +0000 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2012-03-04 13:20:42 +0000 |
| commit | 75d255709cdb48d1316403a3a62ce22a1b24236e (patch) | |
| tree | 27a86145b806f1615cfb8dce795e1ad597e4cb71 /cyrus-sasl | |
| parent | e8bf636e285304e1c07eec41d96af4f7773e36b1 (diff) | |
| download | nutyx-extra-75d255709cdb48d1316403a3a62ce22a1b24236e.tar.gz nutyx-extra-75d255709cdb48d1316403a3a62ce22a1b24236e.tar.bz2 nutyx-extra-75d255709cdb48d1316403a3a62ce22a1b24236e.tar.xz nutyx-extra-75d255709cdb48d1316403a3a62ce22a1b24236e.zip | |
cyrus-sasl 2.1.25-2 ajout patch db5
Diffstat (limited to 'cyrus-sasl')
| -rw-r--r-- | cyrus-sasl/.md5sum.i686 | 1 | ||||
| -rw-r--r-- | cyrus-sasl/.md5sum.x86_64 | 1 | ||||
| -rw-r--r-- | cyrus-sasl/Pkgfile | 7 | ||||
| -rw-r--r-- | cyrus-sasl/db5_support.patch | 24 |
4 files changed, 31 insertions, 2 deletions
diff --git a/cyrus-sasl/.md5sum.i686 b/cyrus-sasl/.md5sum.i686 index f5b8ed6ff..cbf158bdf 100644 --- a/cyrus-sasl/.md5sum.i686 +++ b/cyrus-sasl/.md5sum.i686 @@ -1 +1,2 @@ 341cffe829a4d71f2a6503d669d5a946 cyrus-sasl-2.1.25.tar.gz +92a113a3e7eb95316ec09b1c150c72c1 db5_support.patch diff --git a/cyrus-sasl/.md5sum.x86_64 b/cyrus-sasl/.md5sum.x86_64 index f5b8ed6ff..cbf158bdf 100644 --- a/cyrus-sasl/.md5sum.x86_64 +++ b/cyrus-sasl/.md5sum.x86_64 @@ -1 +1,2 @@ 341cffe829a4d71f2a6503d669d5a946 cyrus-sasl-2.1.25.tar.gz +92a113a3e7eb95316ec09b1c150c72c1 db5_support.patch diff --git a/cyrus-sasl/Pkgfile b/cyrus-sasl/Pkgfile index 646116176..6fb59477d 100644 --- a/cyrus-sasl/Pkgfile +++ b/cyrus-sasl/Pkgfile @@ -5,12 +5,15 @@ name=cyrus-sasl version=2.1.25 -release=1 -source=(http://ftp.andrew.cmu.edu/pub/cyrus-mail/$name-$version.tar.gz) +release=2 +source=(http://ftp.andrew.cmu.edu/pub/cyrus-mail/$name-$version.tar.gz + db5_support.patch) build() { cd $name-$version + patch -p1 < ../db5_support.patch + # sed -i.bak 's/#elif WITH_DES/#elif defined(WITH_DES)/' \ # plugins/digestmd5.c && diff --git a/cyrus-sasl/db5_support.patch b/cyrus-sasl/db5_support.patch new file mode 100644 index 000000000..04d70ce85 --- /dev/null +++ b/cyrus-sasl/db5_support.patch @@ -0,0 +1,24 @@ +Author: Ondrej Sur� <ondrej@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); |