Update to 2.4.7.

This commit is contained in:
Hajimu UMEMOTO 2011-03-31 04:01:10 +00:00
parent 87f78ba5a9
commit 171ccac4d0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=272029
3 changed files with 3 additions and 56 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= cyrus-imapd
PORTVERSION= 2.4.6
PORTVERSION= 2.4.7
#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/

View file

@ -1,6 +1,2 @@
SHA256 (cyrus-imapd-2.4.6.tar.gz) = fc007649ad0a4358f5794a94dc2d50a9aee1d69a9f13e50fd06d66456bcd1aa9
SIZE (cyrus-imapd-2.4.6.tar.gz) = 2377895
SHA256 (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 1130e80b6604901ba8cf887c792fa8e4ef181b4cfc212720bcfc984163fe8a13
SIZE (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 74039
SHA256 (cyrus-imapd-2.4.4-autosieve-0.6.0.patch) = 4d09a328dac698ea09b9c7d0df577a4e8386c9a867fdc71180a43db2b39cbff6
SIZE (cyrus-imapd-2.4.4-autosieve-0.6.0.patch) = 7870
SHA256 (cyrus-imapd-2.4.7.tar.gz) = 090d0a27615f7ce6490e3b0ddc877225d54c4e32bfbc514c462e00ec28b27e7e
SIZE (cyrus-imapd-2.4.7.tar.gz) = 2444382

View file

@ -1,49 +0,0 @@
Index: lib/cyrusdb_berkeley.c
diff -u -p lib/cyrusdb_berkeley.c.orig lib/cyrusdb_berkeley.c
--- lib/cyrusdb_berkeley.c.orig 2009-03-10 11:56:22.000000000 +0900
+++ lib/cyrusdb_berkeley.c 2010-05-27 14:21:33.558155752 +0900
@@ -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);