diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-29 21:01:44 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-29 21:01:44 -0300 |
commit | 6d4537b67f90b1decadcf8434e1a5bdcb6694f7f (patch) | |
tree | 0dfcf0ebb742c6e359f0502d9207b3a600aa3462 /testing/libsasl/0027_db5_support.patch | |
parent | 7a501772e3cb37f438506df7c22a34ed9bba9d88 (diff) | |
parent | db0dace84403023c8d89b8801f12a5ab278dc440 (diff) |
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Conflicts:
core/glibc/PKGBUILD
Diffstat (limited to 'testing/libsasl/0027_db5_support.patch')
-rw-r--r-- | testing/libsasl/0027_db5_support.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/testing/libsasl/0027_db5_support.patch b/testing/libsasl/0027_db5_support.patch deleted file mode 100644 index 522824074..000000000 --- a/testing/libsasl/0027_db5_support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Ondřej 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); |