diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2015-07-06 10:48:21 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2015-07-06 10:48:21 +0000 |
| commit | 56f8376fed9c51a2583f06ada5567f118227a946 (patch) | |
| tree | 1595bdce49df8d4549feeab314f78770086540e2 | |
| parent | bdcb44918779657314b114cb63efc7c9eeeb61fa (diff) | |
| download | ports-56f8376fed9c51a2583f06ada5567f118227a946.tar.gz ports-56f8376fed9c51a2583f06ada5567f118227a946.zip | |
Notes
| -rw-r--r-- | mail/cyrus-imapd24/Makefile | 4 | ||||
| -rw-r--r-- | mail/cyrus-imapd24/distinfo | 8 | ||||
| -rw-r--r-- | mail/cyrus-imapd24/files/patch-imap__statuscache_db.c | 31 |
3 files changed, 4 insertions, 39 deletions
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 97f359f4313a..48543bb07eac 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= cyrus-imapd -PORTVERSION= 2.4.17 -PORTREVISION= 11 +PORTVERSION= 2.4.18 +#PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \ http://cyrusimap.org/releases/ diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo index f656d70ee651..d8d696bb7fb9 100644 --- a/mail/cyrus-imapd24/distinfo +++ b/mail/cyrus-imapd24/distinfo @@ -1,6 +1,2 @@ -SHA256 (cyrus-imapd-2.4.17.tar.gz) = b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 -SIZE (cyrus-imapd-2.4.17.tar.gz) = 2486355 -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.12-autosieve-0.6.0.patch) = daafab6c1a824d1d16745ea25a0bb6e404655ef690961e1dc236805e5c923135 -SIZE (cyrus-imapd-2.4.12-autosieve-0.6.0.patch) = 7626 +SHA256 (cyrus-imapd-2.4.18.tar.gz) = 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c +SIZE (cyrus-imapd-2.4.18.tar.gz) = 2495098 diff --git a/mail/cyrus-imapd24/files/patch-imap__statuscache_db.c b/mail/cyrus-imapd24/files/patch-imap__statuscache_db.c deleted file mode 100644 index 270fc4b50814..000000000000 --- a/mail/cyrus-imapd24/files/patch-imap__statuscache_db.c +++ /dev/null @@ -1,31 +0,0 @@ -Index: imap/statuscache_db.c -diff -u -p imap/statuscache_db.c.orig imap/statuscache_db.c ---- imap/statuscache_db.c.orig 2012-12-02 04:57:54.000000000 +0900 -+++ imap/statuscache_db.c 2012-12-10 13:17:11.621360294 +0900 -@@ -150,9 +150,11 @@ static char *statuscache_buildkey(const - - /* Build statuscache key */ - len = strlcpy(key, mailboxname, sizeof(key)); -+ /* double % is a safe separator, it can't exist in a mailboxname */ - key[len++] = '%'; - key[len++] = '%'; -- len += strlcpy(key + len, userid, sizeof(key) - len); -+ if (userid) -+ len += strlcpy(key + len, userid, sizeof(key) - len); - - *keylen = len; - -@@ -410,11 +412,9 @@ int statuscache_invalidate(const char *m - drock.db = statuscachedb; - drock.tid = NULL; - -- key = statuscache_buildkey(mboxname, "", &keylen); -+ key = statuscache_buildkey(mboxname, /*userid*/NULL, &keylen); - -- /* strip off the second NULL that buildkey added, so we match -- * the entires for all users */ -- r = DB->foreach(drock.db, key, keylen - 1, NULL, delete_cb, -+ r = DB->foreach(drock.db, key, keylen, NULL, delete_cb, - &drock, &drock.tid); - if (r != CYRUSDB_OK) { - syslog(LOG_ERR, "DBERROR: error invalidating: %s (%s)", |