diff options
| author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-19 12:44:24 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-19 12:44:24 -0500 |
| commit | 071445e6a2bb31ddf638e6f2e5362953b47e72dc (patch) | |
| tree | 9ec266d72aaa5971dee2d1abbe2de511d971de87 /testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch | |
| parent | c14218d562c03601d6d23666f77ed0c2f0025c1b (diff) | |
| parent | b8ea4461e461f0e1782e28b5810eb811423afa79 (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el into pre
Conflicts:
core/heimdal/PKGBUILD
extra/apache-ant/PKGBUILD
extra/aria2/PKGBUILD
extra/bs/PKGBUILD
extra/dosbox/PKGBUILD
extra/ettercap-gtk/PKGBUILD
extra/gqmpeg/PKGBUILD
extra/gtk-theme-switch2/PKGBUILD
extra/icecast/PKGBUILD
extra/kmldonkey/PKGBUILD
extra/kmplayer/PKGBUILD
extra/libbtctl/PKGBUILD
extra/libx86/PKGBUILD
extra/mc/PKGBUILD
extra/monotone/PKGBUILD
extra/nbsmtp/PKGBUILD
extra/nickle/PKGBUILD
extra/nppangband/PKGBUILD
extra/numlockx/PKGBUILD
extra/python-gtkglext/PKGBUILD
extra/speedcrunch/PKGBUILD
extra/vbetool/PKGBUILD
libre/xchat-gnome-libre/PKGBUILD
libre/xchat-gnome-libre/gtk2-2.20.patch
libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
libre/xchat-gnome-libre/xchat-gnome.install
Diffstat (limited to 'testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch')
| -rw-r--r-- | testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch b/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch deleted file mode 100644 index 2ccd6cdb3..000000000 --- a/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- sasldb/db_berkeley.c.orig 2010-10-04 21:11:15.044010468 -0400 -+++ sasldb/db_berkeley.c 2010-10-04 21:12:18.921998718 -0400 -@@ -100,7 +100,7 @@ - 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_MINOR >= 1) || DB_VERSION_MAJOR == 5 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); - ---- utils/dbconverter-2.c.orig 2010-10-04 21:23:39.778000256 -0400 -+++ utils/dbconverter-2.c 2010-10-04 21:24:50.384999893 -0400 -@@ -214,7 +214,7 @@ - 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_MINOR >= 1) || DB_VERSION_MAJOR == 5 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); |