aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2009-09-10 00:05:28 +0800
committerume <ume@FreeBSD.org>2009-09-10 00:05:28 +0800
commitdff58ab57782f74b906f938c5e54dd1ff37e40b5 (patch)
treedaa72d1bb798bc97a802d4788b3766014042a31e /mail
parentfc2db43f218a9f81074172ba3034fe0ae1872b7a (diff)
downloadfreebsd-ports-gnome-dff58ab57782f74b906f938c5e54dd1ff37e40b5.tar.gz
freebsd-ports-gnome-dff58ab57782f74b906f938c5e54dd1ff37e40b5.tar.zst
freebsd-ports-gnome-dff58ab57782f74b906f938c5e54dd1ff37e40b5.zip
Update to 2.2.13p1.
Security: Potential buffer overflow in Sieve
Diffstat (limited to 'mail')
-rw-r--r--mail/cyrus-imapd22/Makefile4
-rw-r--r--mail/cyrus-imapd22/distinfo6
-rw-r--r--mail/cyrus-imapd22/files/patch-sieve::script.c73
3 files changed, 5 insertions, 78 deletions
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 8afee87a66d7..859aa46dbcd1 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= cyrus-imapd
-PORTVERSION= 2.2.13
-PORTREVISION= 6
+PORTVERSION= 2.2.13p1
+#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
index a2faae3b29b7..a208f3088aa9 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-imapd-2.2.13.tar.gz) = 3ff679714836d1d7b1e1df0e026d4844
-SHA256 (cyrus-imapd-2.2.13.tar.gz) = 109e85b901bfcdbdd6a76d7cac83af866aa9c37a40919be7f58813319082d09c
-SIZE (cyrus-imapd-2.2.13.tar.gz) = 2109770
+MD5 (cyrus-imapd-2.2.13p1.tar.gz) = 197fb853182a65af8b21b722a0d7c372
+SHA256 (cyrus-imapd-2.2.13p1.tar.gz) = ddb8d7702e57be9df594b96d62ef49c9011f58c551e1ae9a1228d7f7ca36a80a
+SIZE (cyrus-imapd-2.2.13p1.tar.gz) = 2045823
diff --git a/mail/cyrus-imapd22/files/patch-sieve::script.c b/mail/cyrus-imapd22/files/patch-sieve::script.c
deleted file mode 100644
index 67522bf25505..000000000000
--- a/mail/cyrus-imapd22/files/patch-sieve::script.c
+++ /dev/null
@@ -1,73 +0,0 @@
-Index: sieve/script.c
-diff -u -p sieve/script.c.orig sieve/script.c
---- sieve/script.c.orig 2004-07-16 00:02:51.000000000 +0900
-+++ sieve/script.c 2009-09-03 11:18:46.616449964 +0900
-@@ -546,7 +546,7 @@ static int do_sieve_error(int ret,
- ret |= keep_ret;
- if (keep_ret == SIEVE_OK)
- snprintf(actions_string+strlen(actions_string),
-- sizeof(actions_string)-strlen(actions_string),
-+ ACTIONS_STRING_LEN-strlen(actions_string),
- "Kept\n");
- else {
- implicit_keep = 0; /* don't try an implicit keep again */
-@@ -599,7 +599,7 @@ static int do_action_list(sieve_interp_t
-
- if (ret == SIEVE_OK)
- snprintf(actions_string+strlen(actions_string),
-- sizeof(actions_string)-strlen(actions_string),
-+ ACTIONS_STRING_LEN-strlen(actions_string),
- "Rejected with: %s\n", a->u.rej.msg);
-
- break;
-@@ -615,7 +615,7 @@ static int do_action_list(sieve_interp_t
-
- if (ret == SIEVE_OK)
- snprintf(actions_string+strlen(actions_string),
-- sizeof(actions_string)-strlen(actions_string),
-+ ACTIONS_STRING_LEN-strlen(actions_string),
- "Filed into: %s\n",a->u.fil.mailbox);
- break;
- case ACTION_KEEP:
-@@ -629,7 +629,7 @@ static int do_action_list(sieve_interp_t
- &errmsg);
- if (ret == SIEVE_OK)
- snprintf(actions_string+strlen(actions_string),
-- sizeof(actions_string)-strlen(actions_string),
-+ ACTIONS_STRING_LEN-strlen(actions_string),
- "Kept\n");
- break;
- case ACTION_REDIRECT:
-@@ -643,7 +643,7 @@ static int do_action_list(sieve_interp_t
- &errmsg);
- if (ret == SIEVE_OK)
- snprintf(actions_string+strlen(actions_string),
-- sizeof(actions_string)-strlen(actions_string),
-+ ACTIONS_STRING_LEN-strlen(actions_string),
- "Redirected to %s\n", a->u.red.addr);
- break;
- case ACTION_DISCARD:
-@@ -655,7 +655,7 @@ static int do_action_list(sieve_interp_t
- &errmsg);
- if (ret == SIEVE_OK)
- snprintf(actions_string+strlen(actions_string),
-- sizeof(actions_string)-strlen(actions_string),
-+ ACTIONS_STRING_LEN-strlen(actions_string),
- "Discarded\n");
- break;
-
-@@ -689,12 +689,12 @@ static int do_action_list(sieve_interp_t
-
- if (ret == SIEVE_OK)
- snprintf(actions_string+strlen(actions_string),
-- sizeof(actions_string)-strlen(actions_string),
-+ ACTIONS_STRING_LEN-strlen(actions_string),
- "Sent vacation reply\n");
-
- } else if (ret == SIEVE_DONE) {
- snprintf(actions_string+strlen(actions_string),
-- sizeof(actions_string)-strlen(actions_string),
-+ ACTIONS_STRING_LEN-strlen(actions_string),
- "Vacation reply suppressed\n");
-
- ret = SIEVE_OK;