1 files changed, 0 insertions, 49 deletions
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.16+db-5.0.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.16+db-5.0.patch
deleted file mode 100644
index 319abf1f6bb7..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.16+db-5.0.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: cyrus-imapd-2.3.16/lib/cyrusdb_berkeley.c
-===================================================================
---- cyrus-imapd-2.3.16.orig/lib/cyrusdb_berkeley.c
-+++ cyrus-imapd-2.3.16/lib/cyrusdb_berkeley.c
-@@ -108,7 +108,7 @@ static void db_panic(DB_ENV *dbenv __att
-     exit(EC_TEMPFAIL);
- }
- 
--#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)
-+#if ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)) || (DB_VERSION_MAJOR >= 5)
- static void db_err(const DB_ENV *dbenv __attribute__((unused)),
- 		   const char *db_prfx, const char *buffer)
- #else
-@@ -164,7 +164,7 @@ static int init(const char *dbdir, int m
- #endif
-     }
- 
--#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)
-+#if ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)) || (DB_VERSION_MAJOR >= 5)
-     dbenv->set_msgcall(dbenv, db_msg);
- #endif
-     dbenv->set_errcall(dbenv, db_err);
-@@ -282,7 +282,7 @@ static int mysync(void)
- 
-     assert(dbinit);
- 
--#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-+#if !((DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5)
-     do {
- #endif
- #if (DB_VERSION_MAJOR > 3) || ((DB_VERSION_MAJOR == 3) && (DB_VERSION_MINOR > 0))
-@@ -290,7 +290,7 @@ static int mysync(void)
- #else
- 	r = txn_checkpoint(dbenv, 0, 0);
- #endif
--#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-+#if !((DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5)
-     } while (r == DB_INCOMPLETE);  /* Never returned by BDB 4.1 */
- #endif
-     if (r) {
-@@ -413,7 +413,7 @@ static int myopen(const char *fname, DBT
-     /* xxx set comparator! */
-     if (flags & CYRUSDB_MBOXSORT) db->set_bt_compare(db, mbox_compar);
- 
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || (DB_VERSION_MAJOR >= 5)
-     r = (db->open)(db, NULL, fname, NULL, type, dbflags | DB_AUTO_COMMIT, 0664);
- #else
-     r = (db->open)(db, fname, NULL, type, dbflags, 0664);