Update to 2.3.19.
This commit is contained in:
parent
56f8376fed
commit
c586875614
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=391397
3 changed files with 4 additions and 54 deletions
|
@ -1,8 +1,8 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= cyrus-imapd
|
||||
PORTVERSION= 2.3.18
|
||||
PORTREVISION= 10
|
||||
PORTVERSION= 2.3.19
|
||||
#PORTREVISION= 10
|
||||
CATEGORIES= mail ipv6
|
||||
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/
|
||||
PKGNAMESUFFIX= 23
|
||||
|
@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT
|
|||
|
||||
LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
|
||||
libpcre.so:${PORTSDIR}/devel/pcre
|
||||
BUILD_DEPENDS= p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
|
||||
|
||||
CONFLICTS= cyrus-1.* cyrus-imapd-2.[^3].* cyrus-imapd2[^3]-2.[^3].*
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
SHA256 (cyrus-imapd-2.3.18.tar.gz) = 7724959d49191b993ef387c31a0ea7d30f1df7d255e73dff0b7887eff679ce5a
|
||||
SIZE (cyrus-imapd-2.3.18.tar.gz) = 2311272
|
||||
SHA256 (cyrus-imapd-2.3.19.tar.gz) = 70e740ba08d5b65bb47f04a2160fbf6fe44d8a6c8c1bdaf097f63c192e67b053
|
||||
SIZE (cyrus-imapd-2.3.19.tar.gz) = 2311470
|
||||
SHA256 (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = a373c9d4e3b35c8ecbd4ad7806cf50196525c3c1a32c35bc18d7b6c449bd57e3
|
||||
SIZE (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = 86056
|
||||
SHA256 (cyrus-imapd-2.3.16-autosieve-0.6.0.diff) = b50acaf0595e320ac89fdd15b375b7e051009ebbe839c461bbb2b2a7006c23c5
|
||||
|
|
|
@ -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);
|
Loading…
Reference in a new issue