diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-22 11:02:40 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-22 11:02:40 +0200 |
| commit | 55a7d75889507a9882c91f8c0a44ea9460a5d095 (patch) | |
| tree | e4d40e8bdb76614317edbd6d07f1d226eb80bb39 /testing/cyrus-sasl/0027_db5_support.patch | |
| parent | f23b8ed12499118d66340154fe8369623da3da34 (diff) | |
| parent | 297a042ac9a7bbd2b18a9551f5fa4fe43faf53b2 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/rfkill/PKGBUILD
extra/libkgapi/PKGBUILD
extra/transmission/PKGBUILD
testing/grep/PKGBUILD
testing/grep/grep.install
Diffstat (limited to 'testing/cyrus-sasl/0027_db5_support.patch')
| -rw-r--r-- | testing/cyrus-sasl/0027_db5_support.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/testing/cyrus-sasl/0027_db5_support.patch b/testing/cyrus-sasl/0027_db5_support.patch deleted file mode 100644 index 522824074..000000000 --- a/testing/cyrus-sasl/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); |